lqdvi/app2-api
2
0
Fork 0
Code Issues 24 Pull Requests Actions Packages Projects Releases Wiki Activity

.

Browse Source
This commit is contained in:
David Arranz 2019-07-09 15:18:25 +02:00
parent 755c5c6fa8
commit c6a14eab41
4 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
config/environments/development.js
View File

@ -9,7 +9,7 @@ module.exports = {
session: { session: {
secret_token: process.env.SECRET_TOKEN || "B57J=7B`NQ$y98|~5;hc715bo09^5oz8NR+]n9r~215B91Nd9P%25_N6r!GHcOKp|18y5-73Dr5^@9k7n]5l<-41D1o", secret_token: process.env.SECRET_TOKEN || "B57J=7B`NQ$y98|~5;hc715bo09^5oz8NR+]n9r~215B91Nd9P%25_N6r!GHcOKp|18y5-73Dr5^@9k7n]5l<-41D1o",
token_expires_in: '12h' token_expires_in: '365d'
}, },
server: { server: {

2
config/environments/production.js
View File

@ -9,7 +9,7 @@ module.exports = {
session: { session: {
secret_token: process.env.SECRET_TOKEN || "B57J=7B`NQ$y98|~5;hc715bo09^5oz8NR+]n9r~215B91Nd9P%25_N6r!GHcOKp|18y5-73Dr5^@9k7n]5l<-41D1o", secret_token: process.env.SECRET_TOKEN || "B57J=7B`NQ$y98|~5;hc715bo09^5oz8NR+]n9r~215B91Nd9P%25_N6r!GHcOKp|18y5-73Dr5^@9k7n]5l<-41D1o",
token_expires_in: '12h' token_expires_in: '365d'
}, },
server: { server: {

22
modules/auth/auth.controller.js
View File

@ -41,7 +41,6 @@ async function login(req, res, next) {
async function register(req, res, next) { async function register(req, res, next) {
function cleanAdminData(user) { function cleanAdminData(user) {
let cUser = user; let cUser = user;
delete cUser.token;
delete cUser.lastLogin; delete cUser.lastLogin;
delete cUser.state; delete cUser.state;
delete cUser.createdAt; delete cUser.createdAt;
@ -50,35 +49,30 @@ async function register(req, res, next) {
} }
try { try {
console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>regsitro');
const values = { const values = {
phone: req.body.phone, phone: req.body.phone,
platform: req.body.fbuid platform: req.body.fbuid
}; };
const tokens = securityHelper.generateToken(values); const tokens = securityHelper.generateToken(values);
console.log(tokens)
const data = { const data = {
token: tokens.refreshToken, refresh_token: tokens.refreshToken,
phone: req.body.phone, phone: req.body.phone,
fbuid: req.body.fbuid, fbuid: req.body.fbuid,
email: req.body.email, email: req.body.email,
name: req.body.name, name: req.body.name,
surname: req.body.surname, surname: req.body.surname,
entityid: req.body.entityid, entityid: req.body.entityid,
accessibility: req.body.accesssibility accessibility: req.body.accesssibility
}; };
console.log(data); console.log(data);
const newUser = await authService.extraMethods.createUser(data); let newUser = await authService.extraMethods.createUser(data);
const result = { newUser = cleanAdminData(newUser.toJSON());
token: tokens.token, newUser.token = tokens.token;
refreshToken: tokens.token,
user: cleanAdminData(newUser.toJSON()), console.log(newUser);
}; return controllerHelper.handleResultResponse(newUser, null, req.params, res, httpStatus.OK);
console.log(result);
return controllerHelper.handleResultResponse(result, null, req.params, res, httpStatus.OK);
} catch (error) { } catch (error) {
console.log(error); console.log(error);
controllerHelper.handleErrorResponse(MODULE_NAME, register.name, error, res); controllerHelper.handleErrorResponse(MODULE_NAME, register.name, error, res);

2
modules/auth/user.model.js
View File

@ -41,7 +41,7 @@ module.exports = function (sequelize, DataTypes) {
type: DataTypes.BOOLEAN, type: DataTypes.BOOLEAN,
defaultValue: true, defaultValue: true,
}, },
token: { refresh_token: {
type: DataTypes.STRING(512), type: DataTypes.STRING(512),
}, },
state: { state: {