Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Vus 97/ Middelware de validacion #20

Merged
merged 4 commits into from
Jan 28, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/constants/Constants.js
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ const {
ENVIRONMENT,
NAME,
VERSION,
DIDI_SERVER,
MONGO_URI,
REDIS_URI,
VUS_URL,
Expand All @@ -20,11 +21,13 @@ const {
// assert.ok(ENVIRONMENT, 'No esta definida la varibale ENVIRONMENT');
// assert.ok(NAME, 'No esta definida la varibale NAME');
// assert.ok(VERSION, 'No esta definida la varibale VERSION');
// assert.ok(DB_URI, 'No esta definida la variable DB_URI');
assert.ok(VUS_URL, 'No esta definida la variable VUS_URL');
// assert.ok(VUS_APP_VERS, 'No esta definida la variable VUS_APP_VERS');
assert.ok(VUS_API_KEY, 'No esta definida la variable API_KEY');
assert.ok(VUS_API, 'No esta definida la variable VUS_API');
// assert.ok(DIDI_SERVER, 'No esta definida la variable DIDI_SERVER');
// assert.ok(MONGO_URI, 'No esta definida la variable MONGO_URI');
// assert.ok(REDIS_URI, 'No esta definida la variable REDIS_URI');
// assert.ok(IP_ADDRESS, 'No esta definida la variable IP_ADDRESS');
// assert.ok(VERSION_APP, 'No esta definida la variable VERSION_APP');

Expand All @@ -33,6 +36,7 @@ module.exports = {
ENVIRONMENT,
NAME,
VERSION,
DIDI_SERVER,
MONGO_URI,
REDIS_URI,
VUS_URLS: {
Expand Down
86 changes: 1 addition & 85 deletions src/constants/Messages.js
Original file line number Diff line number Diff line change
Expand Up @@ -125,94 +125,10 @@ module.exports = {
},

USER: {
SUCCESS: {
LOGGED_IN: {},
REGISTERED: {},
CHANGED_PASS: {},
CHANGED_PHONE(cert) {
return { certificate: cert };
},
CHANGED_EMAIL(cert) {
return { certificate: cert };
},
},
ERR: {
INVALID_LOGIN: {
code: 'INVALID_LOGIN',
message:
'No se encontró ese usuario: email o contraseña incorrecta. (si no recuerda su contraseña, vaya atrás y haga click en recuperar cuenta > No recuerdo la contraseña)',
},
VALIDATE_DID_ERROR: {
code: 'VALIDATE_DID_ERROR',
message: 'Ese did no se encuentra autorizado a realizar esa operacion.',
},
USER_ALREADY_EXIST: {
code: 'USER_ALREADY_EXIST',
message:
"Ese did ya se encuentra asociado a un usuario, si desea utilizar una cuenta ya existente, por favor dirigirse a 'Recuperar Cuenta'.",
},
INVALID_USER: {
code: 'INVALID_USER',
message:
'El usuario y contraseña no coinciden, por favor, verifique los valores antes de intentarlo nuevamente.',
},
INVALID_USER_DID: {
code: 'INVALID_USER_DID',
message:
'El usuario fue generado desde otro teléfono, es necesario recuperar la cuenta para loguearse.',
},
INVALID_USER_EMAIL: {
code: 'INVALID_USER_EMAIL',
message:
'El mail ingresado no corresponde a ese usuario, por favor verifique que sea correcto antes de volver a intentarlo.',
},
NOMATCH_USER_DID: {
code: 'NOMATCH_USER_DID',
message:
'No se encontró ningún usuario con ese did, por favor verifique que sea correcto antes de volver a intentarlo.',
},
NOMATCH_USER_EMAIL: {
code: 'NOMATCH_USER_EMAIL',
message:
'No se encontró ningún usuario con ese mail y contraseña, por favor, verifique los valores antes de intentarlo nuevamente.',
},
MAIL_NOT_VALIDATED: {
code: 'MAIL_NOT_VALIDATED',
message:
'Ese mail no fue validado, en caso de no haber terminado el proceso, por favor verifique su direccion de correo, un mail con el codigo de validacion deberia encontrarse alli.',
},
PHONE_NOT_VALIDATED: {
code: 'PHONE_NOT_VALIDATED',
message:
'Ese teléfono no fue validado, en caso de no haber terminado el proceso, por favor verifique sus mensajes, un sms con el codigo de validacion deberia encontrarse alli.',
},
VALIDATE: {
code: 'VALIDATE',
message:
'Error al validar informacion de usuario, por favor inténtelo de nuevo más tarde.',
},
EMAIL_TAKEN: {
code: 'EMAIL_TAKEN',
message: 'Ese mail ya se encuentra en uso, por favor elija otro.',
},
TEL_TAKEN: {
code: 'TEL_TAKEN',
message: 'Ese teléfono ya se encuentra en uso, por favor elija otro.',
},
CREATE: {
code: 'USER_CREATE',
message:
'Hubo un error al durante la creación del usuario, por favor inténtelo de nuevo más tarde.',
},
GET: {
code: 'USER_GET',
message:
'No se pudo obtener el usuario, por favor inténtelo de nuevo más tarde.',
},
UPDATE: {
code: 'USER_UPDATE',
message:
'No se pudo actualizar el usuario, por favor inténtelo de nuevo más tarde.',
message: 'Error al validar informacion de usuario.',
},
},
},
Expand Down
19 changes: 0 additions & 19 deletions src/controllers/user/createUser.js

This file was deleted.

5 changes: 0 additions & 5 deletions src/controllers/user/index.js

This file was deleted.

7 changes: 1 addition & 6 deletions src/controllers/vus/createVerification.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
const vusService = require('../../services/vusService');
const UserService = require('../../services/userService');
const AuthRequestService = require('../../services/AuthRequestService');
const Constants = require('../../constants/Constants');

const createVerification = async (req, res) => {
let operationId;
let user;
let authRequest;

try {
Expand All @@ -32,12 +30,9 @@ const createVerification = async (req, res) => {
deviceName,
);

// Obtener usuario a partir de un did
user = await UserService.getByDID(did);

// Guardar estado como "en progreso y retornar"
// eslint-disable-next-line no-unused-vars
authRequest = await AuthRequestService.create(operationId, user);
authRequest = await AuthRequestService.create(operationId, did);
return res.status(200).json({ userName, operationId });
} catch (err) {
return err;
Expand Down
33 changes: 33 additions & 0 deletions src/middelwares/ValidateUser.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
const fetch = require('node-fetch');

const { USER } = require('../constants/Messages');
const { DIDI_SERVER } = require('../constants/Constants');
const { sendErrWithStatus } = require('../utils/ResponseHandler');

const url = `${DIDI_SERVER}/user/verifyToken`;

const validateUser = async (req, res, next) => {
try {
const jwt = req.header('Authorization');

const user = await fetch(url, {
method: 'POST',
headers: {
'Content-Type': 'application/json',
},
body: JSON.stringify({ jwt }),
});
const userResp = await user.json();

if (!userResp) throw USER.ERR.VALIDATE;
next();
} catch (e) {
// eslint-disable-next-line no-console
console.log(e);
sendErrWithStatus(res, e, 401);
}
};

module.exports = {
validateUser,
};
51 changes: 0 additions & 51 deletions src/models/User.js

This file was deleted.

2 changes: 0 additions & 2 deletions src/routes/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,9 @@
const express = require('express');

const vusRoutes = require('./vusRoutes');
const userRoutes = require('./userRoutes');

const router = new express.Router();

router.use('/vuSecurity', vusRoutes);
router.use('/vuSecurity', userRoutes);

module.exports = router;
39 changes: 0 additions & 39 deletions src/routes/userRoutes.js

This file was deleted.

3 changes: 3 additions & 0 deletions src/routes/vusRoutes.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
const router = require('express').Router();

const { validateUser } = require('../middelwares/ValidateUser');
const Constants = require('../constants/Constants');
const vus = require('../controllers/vus');
const Validator = require('../utils/Validator');
Expand Down Expand Up @@ -56,6 +57,7 @@ const { IS_STRING, IS_BOOLEAN } = Constants.VALIDATION_TYPES;
*/
router.post(
'/createVerification',
validateUser,
Validator.validateBody([
{ name: 'did', validate: [IS_STRING] },
{ name: 'userName', validate: [IS_STRING] },
Expand Down Expand Up @@ -99,6 +101,7 @@ router.post(
*/
router.post(
'/cancelVerification',
validateUser,
Validator.validateBody([
{ name: 'userName', validate: [IS_STRING] },
{ name: 'operationId', validate: [IS_STRING] },
Expand Down
43 changes: 0 additions & 43 deletions src/services/userService.js

This file was deleted.