mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-10-26 16:46:12 +01:00
fix(writeapi): authenticate middleware logic to work better with await
This commit is contained in:
@@ -16,14 +16,25 @@ const controllers = {
|
||||
authentication: require('../controllers/authentication'),
|
||||
};
|
||||
|
||||
const passportAuthenticateAsync = function (req, res) {
|
||||
return new Promise((resolve, reject) => {
|
||||
passport.authenticate('bearer', { session: false }, (err, user) => {
|
||||
if (err) {
|
||||
reject(err);
|
||||
} else {
|
||||
resolve(user);
|
||||
}
|
||||
})(req, res);
|
||||
});
|
||||
};
|
||||
|
||||
module.exports = function (middleware) {
|
||||
async function authenticate(req, res) {
|
||||
if (req.loggedIn) {
|
||||
return true;
|
||||
} else if (req.headers.hasOwnProperty('authorization')) {
|
||||
passport.authenticate('bearer', { session: false }, function (err, user) {
|
||||
if (err) { throw new Error(err); }
|
||||
if (!user) { return false; }
|
||||
const user = await passportAuthenticateAsync(req, res);
|
||||
if (!user) { return true; }
|
||||
|
||||
// If the token received was a master token, a _uid must also be present for all calls
|
||||
if (user.hasOwnProperty('uid')) {
|
||||
@@ -53,9 +64,8 @@ module.exports = function (middleware) {
|
||||
}
|
||||
} else {
|
||||
winston.warn('[api/authenticate] Unable to find user after verifying token');
|
||||
return false;
|
||||
return true;
|
||||
}
|
||||
})(req, res);
|
||||
}
|
||||
|
||||
await plugins.fireHook('response:middleware.authenticate', {
|
||||
|
||||
Reference in New Issue
Block a user