This commit is contained in:
David Arranz 2019-08-17 21:41:22 +02:00
parent 517c661337
commit dce06ea5e9
4 changed files with 13 additions and 8 deletions

View File

@ -114,6 +114,7 @@ passport.use('jwt', new CustomStrategy(async (req, done) => {
if (user) {
user = user.toJSON();
delete user.password;
console.log('Usuario encontrado', user);
return done(null, user, { message: 'Logged in Successfully' });
}
else {

View File

@ -13,7 +13,7 @@ const isAdministratorUser = compose([isLoggedUser,
if (user.level >= 8) {
next();
} else {
return res.status(httpStatus.UNAUTHORIZED).send('Unauthorized');
return res.status(httpStatus.UNAUTHORIZED).send('Unauthorized. User is not administrator.');
}
}
]);

View File

@ -23,18 +23,22 @@ async function login(req, res, next) {
try {
const data = {
id: req.user.id,
email: req.user.email
email: req.user.email,
phone: req.user.phoneNumber,
fbuid: req.user.uid
};
const tokens = securityHelper.generateToken(data);
res.status(httpStatus.OK).json({
const response = {
token: tokens.token,
refreshToken: tokens.refreshToken,
user: data,
});
user: req.user,
};
return controllerHelper.handleResultResponse(response, null, req.params, res, httpStatus.OK);
} catch (error) {
controllerHelper.handleErrorResponse(MODULE_NAME, login.name, error, res)
return controllerHelper.handleErrorResponse(MODULE_NAME, login.name, error, res)
}
}
@ -46,7 +50,7 @@ async function login2(req, res, next) {
// user: data,
})
} catch (error) {
controllerHelper.handleErrorResponse(MODULE_NAME, login.name, error, res)
return controllerHelper.handleErrorResponse(MODULE_NAME, login.name, error, res)
}
}

View File

@ -25,7 +25,7 @@ routes.get('/auth',
);
routes.get('/auth/verify',
AccessValidator.isRegisteredUserEmail,
AccessValidator.isAdministratorUser,
);
// Registro de usuario a partir del usuario de Firebase y