.
This commit is contained in:
parent
2250a8092a
commit
92e4ccbb3c
@ -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: '5'
|
token_expires_in: '300'
|
||||||
},
|
},
|
||||||
|
|
||||||
server: {
|
server: {
|
||||||
|
|||||||
@ -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: '5'
|
token_expires_in: '300'
|
||||||
},
|
},
|
||||||
|
|
||||||
server: {
|
server: {
|
||||||
|
|||||||
@ -39,6 +39,16 @@ async function login(req, res, next) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async function register(req, res, next) {
|
async function register(req, res, next) {
|
||||||
|
function cleanAdminData(user) {
|
||||||
|
let cUser = user;
|
||||||
|
delete cUser.token;
|
||||||
|
delete cUser.lastLogin;
|
||||||
|
delete cUser.state;
|
||||||
|
delete cUser.createdAt;
|
||||||
|
delete cUser.updatedAt;
|
||||||
|
return cUser;
|
||||||
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>regsitro');
|
console.log('>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>regsitro');
|
||||||
|
|
||||||
@ -63,8 +73,9 @@ async function register(req, res, next) {
|
|||||||
|
|
||||||
const newUser = await authService.extraMethods.createUser(data);
|
const newUser = await authService.extraMethods.createUser(data);
|
||||||
const result = {
|
const result = {
|
||||||
token: 'JWT ' + tokens.token,
|
token: tokens.token,
|
||||||
user: newUser,
|
refreshToken: tokens.token,
|
||||||
|
user: cleanAdminData(newUser.toJSON()),
|
||||||
};
|
};
|
||||||
console.log(result);
|
console.log(result);
|
||||||
return controllerHelper.handleResultResponse(result, null, req.params, res, httpStatus.OK);
|
return controllerHelper.handleResultResponse(result, null, req.params, res, httpStatus.OK);
|
||||||
@ -88,7 +99,7 @@ async function regenerateToken(req, res, next) {
|
|||||||
try {
|
try {
|
||||||
const tokens = securityHelper.generateToken(values);
|
const tokens = securityHelper.generateToken(values);
|
||||||
await authService.extraMethods.updateUserRefreshToken(user.id, tokens.refreshToken);
|
await authService.extraMethods.updateUserRefreshToken(user.id, tokens.refreshToken);
|
||||||
const result = { token: 'JWT ' + 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) {
|
||||||
controllerHelper.handleErrorResponse(MODULE_NAME, regenerateToken.name, error, res);
|
controllerHelper.handleErrorResponse(MODULE_NAME, regenerateToken.name, error, res);
|
||||||
|
|||||||
@ -20,8 +20,6 @@ routes.post('/auth',
|
|||||||
routes.post('/register',
|
routes.post('/register',
|
||||||
SchemaValidator(authValidation.RegisterInputType, true),
|
SchemaValidator(authValidation.RegisterInputType, true),
|
||||||
AccessValidator.isRegisteredUserPhone,
|
AccessValidator.isRegisteredUserPhone,
|
||||||
|
|
||||||
|
|
||||||
authController.register,
|
authController.register,
|
||||||
);
|
);
|
||||||
|
|
||||||
@ -31,6 +29,12 @@ routes.get('/pepepe', AccessValidator.isLoggedUser,
|
|||||||
}
|
}
|
||||||
);
|
);
|
||||||
|
|
||||||
|
routes.get('/test_jwt', AccessValidator.isLoggedUser,
|
||||||
|
function (req, res) {
|
||||||
|
res.json({ success: 'You are authenticated with JWT!', user: req.user })
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
routes.post('/token',
|
routes.post('/token',
|
||||||
authController.regenerateToken,
|
authController.regenerateToken,
|
||||||
);
|
);
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user