diff --git a/.env.dev.riso b/.env.dev.riso index 90e93b8..7013049 100644 --- a/.env.dev.riso +++ b/.env.dev.riso @@ -29,7 +29,7 @@ GCM_API_KEY="" PROD=0 PROJECT_DESCR_MAIN='__PROJECTS' SECRK=Askb38v23jjDFaoskBOWj92axXCQ -TOKEN_LIFE=2h +TOKEN_LIFE=1m REFRESH_TOKEN_LIFE=14d FTPSERVER_HOST=139.162.166.31 FTPSERVER_PORT=21 diff --git a/src/server/middleware/authenticate.js b/src/server/middleware/authenticate.js index 5b7a82a..07ca10a 100755 --- a/src/server/middleware/authenticate.js +++ b/src/server/middleware/authenticate.js @@ -22,7 +22,7 @@ const authenticateMiddleware = async (req, res, next, withUser = false, lean = f req.token = null; req.code = server_constants.RIS_CODE_HTTP_INVALID_TOKEN; console.log(` ## ${logPrefix}_TOKEN INVALIDO ❌ ...`); - return noError ? next() : res.status(server_constants.RIS_CODE_HTTP_INVALID_TOKEN).send(); + return noError ? next() : res.status(req.code).send(); } const user = await User.findByToken(token, 'auth', false, withUser, lean); @@ -54,7 +54,7 @@ const authenticateMiddleware = async (req, res, next, withUser = false, lean = f req.user = null; req.token = null; req.code = server_constants.RIS_CODE_HTTP_INVALID_TOKEN; - noError ? next() : res.status(server_constants.RIS_CODE_HTTP_INVALID_TOKEN).send(); + noError ? next() : res.status(req.code).send(); } }; diff --git a/src/server/models/user.js b/src/server/models/user.js index a5cca29..1266bd4 100755 --- a/src/server/models/user.js +++ b/src/server/models/user.js @@ -753,7 +753,10 @@ UserSchema.statics.findByToken = async function (token, typeaccess, con_auth, wi const start = process.hrtime.bigint(); const start_jwt = process.hrtime.bigint(); - if (!token) return { user, code }; + if (!token) { + console.warn('TOKEN VUOTO ! '); + return { user, code }; + } try { diff --git a/src/server/router/index_router.js b/src/server/router/index_router.js index 7d05d9e..f4cd55d 100755 --- a/src/server/router/index_router.js +++ b/src/server/router/index_router.js @@ -714,7 +714,7 @@ router.post('/gettable', authenticate_noerror, (req, res) => { params.table = sanitizeHtml(params.table); if (!shared_consts.TABLES_ENABLE_GETTABLE_FOR_NOT_LOGGED.includes(params.table) && !req.user) { - return res.status(403).send({}); + return res.status(req.code).send({}); } let idapp = req.user ? req.user.idapp : sanitizeHtml(params.idapp); diff --git a/src/server/version.txt b/src/server/version.txt index e54077f..4582474 100644 --- a/src/server/version.txt +++ b/src/server/version.txt @@ -1 +1 @@ -1.2.21 \ No newline at end of file +1.2.25 \ No newline at end of file