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 2022-02-17 14:20:42 +01:00
parent 49e43cb27a
commit 2675762f69
2 changed files with 465 additions and 319 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,23 +1,23 @@
'use strict'; "use strict";
const _ = require('lodash'); const _ = require("lodash");
const moment = require('moment'); const moment = require("moment");
const httpStatus = require('http-status'); const httpStatus = require("http-status");
const controllerHelper = require('../../helpers/controller.helper'); const controllerHelper = require("../../helpers/controller.helper");
const crypto = require('crypto'); const crypto = require("crypto");
const securityHelper = require('../../helpers/security.helper'); const securityHelper = require("../../helpers/security.helper");
const authService = require('./auth.service'); const authService = require("./auth.service");
const userService = require('./user.service'); const userService = require("./user.service");
const eventInscriptionService = require('../events/events_inscriptions.service'); const eventInscriptionService = require("../events/events_inscriptions.service");
const { RequestContactImportNewList } = require('sib-api-v3-sdk'); const { RequestContactImportNewList } = require("sib-api-v3-sdk");
moment.locale('es'); moment.locale("es");
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// CONSTANTS // CONSTANTS
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// Module Name // Module Name
const MODULE_NAME = '[auth.controller]'; const MODULE_NAME = "[auth.controller]";
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
// PUBLIC METHODS // PUBLIC METHODS
@ -29,7 +29,7 @@ async function login(req, res, next) {
id: req.user.id, id: req.user.id,
email: req.user.email, email: req.user.email,
phone: req.user.phoneNumber, phone: req.user.phoneNumber,
fbuid: req.user.uid fbuid: req.user.uid,
}; };
const tokens = securityHelper.generateToken(data); const tokens = securityHelper.generateToken(data);
@ -40,36 +40,54 @@ async function login(req, res, next) {
user: req.user, user: req.user,
}; };
return controllerHelper.handleResultResponse(response, null, req.params, res, httpStatus.OK); return controllerHelper.handleResultResponse(
response,
null,
req.params,
res,
httpStatus.OK
);
} catch (error) { } catch (error) {
return controllerHelper.handleErrorResponse(MODULE_NAME, login.name, error, res) return controllerHelper.handleErrorResponse(
MODULE_NAME,
login.name,
error,
res
);
} }
} }
async function loginWithPhone(req, res, next) { async function loginWithPhone(req, res, next) {
try { try {
const appVersion = ((req && req.headers && req.headers['accept-version']) ? req.headers['accept-version'] : null); const appVersion =
console.log('loginWithPhone - appVersion: ', appVersion); req && req.headers && req.headers["accept-version"]
? req.headers["accept-version"]
: null;
console.log("loginWithPhone - appVersion: ", appVersion);
console.log(req.user); console.log(req.user);
const findOptions = { const findOptions = {
phone: req.user.phoneNumber, phone: req.user.phoneNumber,
fbuid: req.user.uid fbuid: req.user.uid,
}; };
//Comprobamos si el usuario ya existe en nuestro sistema //Comprobamos si el usuario ya existe en nuestro sistema
let _user = await authService.extraMethods.findUserByPhone(req.user.phoneNumber); let _user = await authService.extraMethods.findUserByPhone(
req.user.phoneNumber
);
if (_user) { if (_user) {
_user = _user.toJSON(); _user = _user.toJSON();
if (appVersion) { if (appVersion) {
if (_user.app_version != appVersion) { if (_user.app_version != appVersion) {
const result = userService._updateLastLoginAndVersionUser(_user.id, appVersion); const result = userService._updateLastLoginAndVersionUser(
console.log('PRUEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEBA>>>> ', result); _user.id,
appVersion
);
console.log("PRUEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEBA>>>> ", result);
_user.app_version = appVersion; _user.app_version = appVersion;
} }
} }
const tokenData = { const tokenData = {
id: _user.id, id: _user.id,
email: _user.email, email: _user.email,
@ -82,26 +100,50 @@ async function loginWithPhone(req, res, next) {
//Recuperamos el número de tickets para los proximos eventos //Recuperamos el número de tickets para los proximos eventos
try { try {
const result = await eventInscriptionService._getInscriptionsOfNextEventsUser(_user.id); const result =
console.log('Entradas del usuario', result); await eventInscriptionService._getInscriptionsOfNextEventsUser(
_user.id
);
console.log("Entradas del usuario", result);
_user.nextTicketsCount = result; _user.nextTicketsCount = result;
} catch (error) { } catch (error) {
console.error(error); console.error(error);
return handleErrorResponse(MODULE_NAME, 'getInscriptionsOfNextEventsCount', error, res) return handleErrorResponse(
MODULE_NAME,
"getInscriptionsOfNextEventsCount",
error,
res
);
} }
return controllerHelper.handleResultResponse(_user, null, req.params, res, httpStatus.OK); return controllerHelper.handleResultResponse(
_user,
null,
req.params,
res,
httpStatus.OK
);
} else { } else {
return controllerHelper.handleResultResponse(null, null, req.params, res, httpStatus.NOT_FOUND); return controllerHelper.handleResultResponse(
null,
null,
req.params,
res,
httpStatus.NOT_FOUND
);
} }
} catch (error) { } catch (error) {
console.error(error); console.error(error);
return controllerHelper.handleErrorResponse(MODULE_NAME, login.name, error, res) return controllerHelper.handleErrorResponse(
MODULE_NAME,
login.name,
error,
res
);
} }
} }
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.lastLogin; delete cUser.lastLogin;
@ -113,18 +155,19 @@ async function register(req, res, next) {
const values = { const values = {
phone: req.body.phone, phone: req.body.phone,
fbuid: req.body.fbuid fbuid: req.body.fbuid,
}; };
const appVersion = ((req && req.headers && req.headers['accept-version']) ? req.headers['accept-version'] : null); const appVersion =
console.log('register - appVersion: ', appVersion); req && req.headers && req.headers["accept-version"]
? req.headers["accept-version"]
: null;
console.log("register - appVersion: ", appVersion);
//Comprobamos si el usuario ya existe en nuestro sistema //Comprobamos si el usuario ya existe en nuestro sistema
let newUser = await authService.extraMethods.findUserByPhone(values.phone); let newUser = await authService.extraMethods.findUserByPhone(values.phone);
console.log('COMPROBAMOS IS EXISTE EN NUESTRO SISTEMA', newUser); console.log("COMPROBAMOS IS EXISTE EN NUESTRO SISTEMA", newUser);
if (!newUser) { if (!newUser) {
try { try {
const data = { const data = {
//refresh_token: tokens.refreshToken, //refresh_token: tokens.refreshToken,
@ -141,25 +184,32 @@ console.log('COMPROBAMOS IS EXISTE EN NUESTRO SISTEMA', newUser);
}; };
newUser = await authService.extraMethods.createUser(data); newUser = await authService.extraMethods.createUser(data);
console.log('CREAMOS EL USUARIO EN NUESTRO SISTEMA', newUser); console.log("CREAMOS EL USUARIO EN NUESTRO SISTEMA", newUser);
} catch (error) { } catch (error) {
console.error(error); console.error(error);
return controllerHelper.handleErrorResponse(MODULE_NAME, register.name, error, res); return controllerHelper.handleErrorResponse(
MODULE_NAME,
register.name,
error,
res
);
}
} }
};
if (newUser) { if (newUser) {
newUser = newUser.toJSON(); newUser = newUser.toJSON();
newUser = cleanAdminData(newUser); newUser = cleanAdminData(newUser);
if (appVersion) { if (appVersion) {
if (newUser.app_version != appVersion) { if (newUser.app_version != appVersion) {
const result = userService._updateLastLoginAndVersionUser(newUser.id, appVersion); const result = userService._updateLastLoginAndVersionUser(
console.log('PRUEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEBA>>>> ', result); newUser.id,
appVersion
);
console.log("PRUEEEEEEEEEEEEEEEEEEEEEEEEEEEEEEBA>>>> ", result);
newUser.app_version = appVersion; newUser.app_version = appVersion;
} }
} }
const tokenData = { const tokenData = {
phone: values.phone, phone: values.phone,
fbuid: values.fbuid, fbuid: values.fbuid,
@ -169,17 +219,25 @@ console.log('CREAMOS EL USUARIO EN NUESTRO SISTEMA', newUser);
const tokens = securityHelper.generateToken(tokenData); const tokens = securityHelper.generateToken(tokenData);
newUser.token = tokens.token; newUser.token = tokens.token;
console.log('COMO YA EXISTE CREAMOS EL TOKEN Y LO ASIGNAMOS', newUser); console.log("COMO YA EXISTE CREAMOS EL TOKEN Y LO ASIGNAMOS", newUser);
} }
return controllerHelper.handleResultResponse(newUser, null, req.params, res, httpStatus.OK); return controllerHelper.handleResultResponse(
newUser,
null,
req.params,
res,
httpStatus.OK
);
} }
async function regenerateToken(req, res, next) { async function regenerateToken(req, res, next) {
const refreshToken = req.body.token; const refreshToken = req.body.token;
const phone = req.body.phone; const phone = req.body.phone;
const email = req.body.email; const email = req.body.email;
const user = await authService.extraMethods.findUserByRefreshToken(refreshToken); const user = await authService.extraMethods.findUserByRefreshToken(
refreshToken
);
console.debug(user, req.body); console.debug(user, req.body);
@ -193,30 +251,69 @@ async function regenerateToken(req, res, next) {
try { try {
const tokens = securityHelper.generateToken(tokenData); const tokens = securityHelper.generateToken(tokenData);
await authService.extraMethods.updateUserRefreshToken(user.id, tokens.refreshToken); await authService.extraMethods.updateUserRefreshToken(
user.id,
tokens.refreshToken
);
const result = { token: tokens.token }; const result = { token: tokens.token };
return controllerHelper.handleResultResponse(result, null, req.params, res, httpStatus.OK); return controllerHelper.handleResultResponse(
result,
null,
req.params,
res,
httpStatus.OK
);
} catch (error) { } catch (error) {
return controllerHelper.handleErrorResponse(MODULE_NAME, regenerateToken.name, error, res); return controllerHelper.handleErrorResponse(
MODULE_NAME,
regenerateToken.name,
error,
res
);
} }
} else { } else {
return controllerHelper.handleResultResponse(null, null, req.params, res, httpStatus.UNAUTHORIZED); return controllerHelper.handleResultResponse(
null,
null,
req.params,
res,
httpStatus.UNAUTHORIZED
);
} }
} }
async function rejectToken(req, res, next) { async function rejectToken(req, res, next) {
const refreshToken = req.body.refreshToken; const refreshToken = req.body.refreshToken;
const user = await authService.extraMethods.findUserByRefreshToken(refreshToken); const user = await authService.extraMethods.findUserByRefreshToken(
refreshToken
);
if (user && user.token === refreshToken) { if (user && user.token === refreshToken) {
try { try {
await authService.extraMethods.deleteRefreshToken(refreshToken); await authService.extraMethods.deleteRefreshToken(refreshToken);
return controllerHelper.handleResultResponse(result, null, req.params, res, httpStatus.OK); return controllerHelper.handleResultResponse(
result,
null,
req.params,
res,
httpStatus.OK
);
} catch (error) { } catch (error) {
return controllerHelper.handleErrorResponse(MODULE_NAME, rejectToken.name, error, res); return controllerHelper.handleErrorResponse(
MODULE_NAME,
rejectToken.name,
error,
res
);
} }
} else { } else {
return controllerHelper.handleResultResponse(null, null, req.params, res, httpStatus.NOT_FOUND); return controllerHelper.handleResultResponse(
null,
null,
req.params,
res,
httpStatus.NOT_FOUND
);
} }
} }
@ -230,14 +327,21 @@ async function singup(req, res, next) {
name: req.body.name, name: req.body.name,
surname: req.body.surname, surname: req.body.surname,
level: 8, level: 8,
password: crypto.createHash('sha512').update(req.body.password).digest('hex') password: crypto
.createHash("sha512")
.update(req.body.password)
.digest("hex"),
}; };
newUser = await authService.extraMethods.createUser(data); newUser = await authService.extraMethods.createUser(data);
} catch (error) { } catch (error) {
console.error(error); console.error(error);
return controllerHelper.handleErrorResponse(MODULE_NAME, register.name, error, res); return controllerHelper.handleErrorResponse(
MODULE_NAME,
register.name,
error,
res
);
} }
if (newUser) { if (newUser) {
@ -254,7 +358,13 @@ async function singup(req, res, next) {
newUser.token = tokens.token; newUser.token = tokens.token;
} }
return controllerHelper.handleResultResponse(newUser, null, req.params, res, httpStatus.OK); return controllerHelper.handleResultResponse(
newUser,
null,
req.params,
res,
httpStatus.OK
);
} }
function verify(req, res, next) { function verify(req, res, next) {
@ -264,58 +374,96 @@ function verify(req, res, next) {
const fbuid = params.query.fbuid; const fbuid = params.query.fbuid;
const user = req.user; const user = req.user;
if (user && user.phone === phone && user.email === email && user.fbuid === fbuid) { if (
return controllerHelper.handleResultResponse(user, null, req.params, res, httpStatus.OK); user &&
user.phone === phone &&
user.email === email &&
user.fbuid === fbuid
) {
return controllerHelper.handleResultResponse(
user,
null,
req.params,
res,
httpStatus.OK
);
} else { } else {
return controllerHelper.handleResultResponse(null, null, req.params, res, httpStatus.UNAUTHORIZED); return controllerHelper.handleResultResponse(
null,
null,
req.params,
res,
httpStatus.UNAUTHORIZED
);
} }
} }
async function getOrCreateUser(req, res, next) { async function getOrCreateUser(req, res, next) {
console.log('>>>>>>>>>>>>>>>>>>>> getOrCreateUser'); console.log(">>>>>>>>>>>>>>>>>>>> getOrCreateUser");
const params = controllerHelper.extractParamsFromRequest(req, res, {}); const params = controllerHelper.extractParamsFromRequest(req, res, {});
let dataInscription = res.locals.dataInscription; let dataInscription = res.locals.dataInscription;
if (!dataInscription) if (!dataInscription)
return handleResultResponse("Error getOrCreateUser, prepareInscription, recuperateEvent, recuperateReservation requerida", null, params, res, httpStatus.NOT_FOUND); return handleResultResponse(
"Error getOrCreateUser, prepareInscription, recuperateEvent, recuperateReservation requerida",
null,
params,
res,
httpStatus.NOT_FOUND
);
//Iniciamos el usuario relacionadas con la inscripción. //Iniciamos el usuario relacionadas con la inscripción.
let dataUser = { let dataUser = {
id: (req.user) ? req.user.id : null, id: req.user ? req.user.id : null,
phone: (req.user) ? req.user.phone : null, //((req.body.phone != '+34') ? req.body.phone : null), lo quitamos de momento por la de movistar phone: req.user ? req.user.phone : null, //((req.body.phone != '+34') ? req.body.phone : null), lo quitamos de momento por la de movistar
name: (req.user) ? req.user.name : req.body.name, name: req.user ? req.user.name : req.body.name,
surname: (req.user) ? req.user.surname : req.body.surname, surname: req.user ? req.user.surname : req.body.surname,
email: (req.user) ? req.user.email : req.body.email, email: req.user ? req.user.email : req.body.email,
entityId: null, entityId: null,
entityName: null, entityName: null,
entityLevel: null, entityLevel: null,
userResult: (req.user) ? req.user : null, userResult: req.user ? req.user : null,
}; };
//Asignamos a los datos del usuario a crear, el id de la entidad a la que pertenece, este caso solo es necesario cuando viene la inscripción por web ya que hay que crear un usuario nuevo //Asignamos a los datos del usuario a crear, el id de la entidad a la que pertenece, este caso solo es necesario cuando viene la inscripción por web ya que hay que crear un usuario nuevo
if (dataInscription.reservation) { if (dataInscription.reservation) {
dataUser.entityId = dataInscription.reservation.entityId; dataUser.entityId = dataInscription.reservation.entityId;
}; }
//creamos o recuperamos el usuario teniendo en cuenta que pude venir por APP o WEB //creamos o recuperamos el usuario teniendo en cuenta que pude venir por APP o WEB
//si viene por web se tendra en cuenta el email y si viene por APP el phone para buscar //si viene por web se tendra en cuenta el email y si viene por APP el phone para buscar
try { try {
//CHAPUZA PARA PODER DAR DE ALTA USUARIOS CON EL MISMO CORREO ELECTRONICO, PERO DISTINTO NOMBRE Y APELLIDO. //CHAPUZA PARA PODER DAR DE ALTA USUARIOS CON EL MISMO CORREO ELECTRONICO, PERO DISTINTO NOMBRE Y APELLIDO.
if (req.user) //? 'app' : 'web', //En el caso de tener ya usuario viene por APP sino viene por web if (req.user)
dataUser.userResult = await userService._getOrCreateUser(dataUser) //? 'app' : 'web', //En el caso de tener ya usuario viene por APP sino viene por web
else dataUser.userResult = await userService._getOrCreateUser(dataUser);
dataUser.userResult = await userService._getOrCreateUserWEB(dataUser); else dataUser.userResult = await userService._getOrCreateUserWEB(dataUser);
if (!dataUser.userResult) { if (!dataUser.userResult) {
// No se ha encontrado // No se ha encontrado
return handleResultResponse("No se ha podido crear o encontrar el usuario dado", null, params, res, httpStatus.NOT_FOUND); return handleResultResponse(
}; "No se ha podido crear o encontrar el usuario dado",
null,
params,
res,
httpStatus.NOT_FOUND
);
}
} catch (error) { } catch (error) {
return handleErrorResponse(MODULE_NAME, 'createInscription', error, res); return handleErrorResponse(MODULE_NAME, "createInscription", error, res);
}; }
console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>', dataUser.userResult.user.Entity); console.log(
dataUser.entityId = (dataUser.userResult.user.Entity) ? dataUser.userResult.user.Entity.id : null; ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>",
dataUser.entityName = (dataUser.userResult.user.Entity) ? dataUser.userResult.user.Entity.name : 'DEFAULT'; dataUser.userResult.user.Entity
dataUser.entityLevel = (dataUser.userResult.user.Entity) ? dataUser.userResult.user.Entity.level : null; );
dataUser.entityId = dataUser.userResult.user.Entity
? dataUser.userResult.user.Entity.id
: null;
dataUser.entityName = dataUser.userResult.user.Entity
? dataUser.userResult.user.Entity.name
: "DEFAULT";
dataUser.entityLevel = dataUser.userResult.user.Entity
? dataUser.userResult.user.Entity.level
: null;
res.locals.dataUser = dataUser; res.locals.dataUser = dataUser;
next(); next();
} }
@ -329,5 +477,5 @@ module.exports = {
singup, singup,
verify, verify,
getOrCreateUser, getOrCreateUser,
MODULE_NAME MODULE_NAME,
} };

30
modules/auth/auth.service.js
View File

@ -1,18 +1,18 @@
'use strict'; "use strict";
//const JwtHelper = require('../../helpers/jwt.helper'); //const JwtHelper = require('../../helpers/jwt.helper');
const models = require('../../core/models'); const models = require("../../core/models");
const extraMethods = { const extraMethods = {
findUser: async (params, context) => { findUser: async (params, context) => {
return await models.User.findOne({ return await models.User.findOne({
where: params, where: params,
include: [{ include: [
{
required: false, required: false,
model: models.Entity, model: models.Entity,
as: 'Entity', as: "Entity",
}] },
],
}); });
}, },
@ -34,9 +34,9 @@ const extraMethods = {
return await models.User.findOne({ return await models.User.findOne({
where: { where: {
refresh_token: refreshToken, refresh_token: refreshToken,
state: 'active' state: "active",
} },
}) });
}, },
updateUserRefreshToken: async (userId, newRefreshToken) => { updateUserRefreshToken: async (userId, newRefreshToken) => {
@ -51,11 +51,9 @@ const extraMethods = {
{ refresh_token: null }, { refresh_token: null },
{ where: { id: userId } } { where: { id: userId } }
); );
} },
}
module.exports = {
extraMethods
}; };
module.exports = {
extraMethods,
};