Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-10 16:05:49 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix: response hook logic

Browse Source 
After some more thought, a response hook should be checking for
whether headers are sent, and executing (or not executing) the
default logic in that case.

Before, we were relying on hooks to call data.next() to continue
execution, but it makes more sense to have the listener either
send a response or not, and handle the behaviour afterwards.
This commit is contained in:
Julian Lam
2020-04-24 11:49:56 -04:00
parent ccc6118d30
commit 5a1c6ee7ed
1 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/middleware/user.js
View File

@@ -16,19 +16,18 @@ const controllers = {
};
module.exports = function (middleware) {
function authenticate(req, res, next, callback) {
async function authenticate(req, res, next, callback) {
if (req.loggedIn) {
return next();
}
if (plugins.hasListeners('response:middleware.authenticate')) {
return plugins.fireHook('response:middleware.authenticate', {
await plugins.fireHook('response:middleware.authenticate', {
req: req,
res: res,
next: function (err) {
if (err) {
return next(err);
}
next: function () {}, // no-op for backwards compatibility
});
if (!res.headersSent) {
auth.setAuthVars(req, res, function () {
if (req.loggedIn && req.user && req.user.uid) {
return next();
@@ -36,11 +35,7 @@ module.exports = function (middleware) {
callback();
});
},
});
}
callback();
}
middleware.authenticate = function middlewareAuthenticate(req, res, next) {