Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 02:55:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: add missing await on filter:user.logout

Browse Source 
if there is an error in logout hooks don't crash send error back instead of building 500 page
This commit is contained in:
Barış Soner Uşaklı
2025-02-21 11:27:52 -05:00
parent ec11b0c252
commit c6b8256fff
2 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
public/src/modules/logout.js
View File

@@ -1,6 +1,6 @@
'use strict';
define('logout', ['hooks'], function (hooks) {
define('logout', ['hooks', 'alerts'], function (hooks, alerts) {
return function logout(redirect) {
redirect = redirect === undefined ? true : redirect;
hooks.fire('action:app.logout');
@@ -23,6 +23,9 @@ define('logout', ['hooks'], function (hooks) {
}
}
},
error: function (jqXHR) {
alerts.error(String(jqXHR.responseText || '[[error:logout-error]]'));
},
});
};
});

9
src/controllers/authentication.js
View File

@@ -459,7 +459,7 @@ authenticationController.localLogin = async function (req, username, password, n
}
};
authenticationController.logout = async function (req, res, next) {
authenticationController.logout = async function (req, res) {
if (!req.loggedIn || !req.sessionID) {
res.clearCookie(nconf.get('sessionKey'), meta.configs.cookie.get());
return res.status(200).send('not-logged-in');
@@ -475,21 +475,22 @@ authenticationController.logout = async function (req, res, next) {
await user.setUserField(uid, 'lastonline', Date.now() - (meta.config.onlineCutoff * 60000));
await db.sortedSetAdd('users:online', Date.now() - (meta.config.onlineCutoff * 60000), uid);
await plugins.hooks.fire('static:user.loggedOut', { req: req, res: res, uid: uid, sessionID: sessionID });
await plugins.hooks.fire('static:user.loggedOut', { req, res, uid, sessionID });
// Force session check for all connected socket.io clients with the same session id
sockets.in(`sess_${sessionID}`).emit('checkSession', 0);
const payload = {
next: `${nconf.get('relative_path')}/`,
};
plugins.hooks.fire('filter:user.logout', payload);
await plugins.hooks.fire('filter:user.logout', payload);
if (req.body.noscript === 'true') {
return res.redirect(payload.next);
}
res.status(200).send(payload);
} catch (err) {
next(err);
winston.error(`${req.method} ${req.originalUrl}\n${err.stack}`);
res.status(500).send(err.message);
}
};