From 28170c13588f2a1ac77d6c41d62ca78944d31a2e Mon Sep 17 00:00:00 2001 From: STEINNI Date: Mon, 22 Sep 2025 19:52:24 +0000 Subject: [PATCH] debugged login --- p42ApiEndpoints.js | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/p42ApiEndpoints.js b/p42ApiEndpoints.js index 09232d3..7b0efec 100644 --- a/p42ApiEndpoints.js +++ b/p42ApiEndpoints.js @@ -64,17 +64,17 @@ export class P42ApiEndpoints{ } async checkauth(req, res) { - if(req.session.userInfos && req.session.authenticated && req.session.userInfos.username) { + if(req.session.userInfos && req.session.authenticated && req.session.userInfos && req.session.userInfos.identity && req.session.userInfos.identity.username) { this.ok(req, res, { authenticated: true, - userInfos: this.userInfos, + userInfos: req.session.userInfos, trials: 3, locked: false, }) } else { let trials = 3 let locked = false - if(req.session.userInfos && req.session.userInfos.username) { + if(req.session.userInfos && req.session.userInfos.identity && req.session.userInfos.identity.username) { const results = await this.db.execute('SELECT usr_trials, usr_locked FROM users WHERE usr_name = ?', [req.session.userInfos.username]) if(results.length==1){ trials = results[0].usr_trials @@ -127,10 +127,13 @@ export class P42ApiEndpoints{ } } - pwdCheck = await verifyPassword(payload.passwd, results[0].usr_pwd) + if(results.length>0) pwdCheck = await verifyPassword(payload.passwd, results[0].usr_pwd) if(pwdCheck){ req.session.userInfos = { - username: payload.username, + identity:{ + username: payload.username, + uuid: results[0].usr_uuid, + }, roles: ['admin'], } req.session.authenticated = true