NodeBB/nodebb-plugin-write-api
2
0
Fork 0
mirror of https://hk.gh-proxy.com/https://github.com/NodeBB/nodebb-plugin-write-api.git synced 2025-10-04 04:31:14 +08:00
Code Issues Projects Packages Wiki Activity Actions

refactor: middleware.requireUser to be async

Browse source
This commit is contained in:
Julian Lam 2020-10-06 09:34:02 -04:00
parent 92b2276136
commit a33db1150d
2 changed files with 51 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

4
index.js
View file

@ -43,8 +43,8 @@ API.addMenuItem = function (custom_header, callback) {
callback(null, custom_header);
};

API.authenticate = function (data) {
require('./routes/v2/middleware').requireUser(data.req, data.res, data.next);
API.authenticate = async (data) => {
await require('./routes/v2/middleware').requireUser(data.req, data.res, data.next);
};

API.associateUser = require('./routes/v2/middleware').associateUser;

34
routes/v2/middleware.js
View file

@ -2,6 +2,7 @@

const jwt = require('jsonwebtoken');
const async = require('async');
const util = require('util');

const passport = require.main.require('passport');
const nconf = require.main.require('nconf');
@ -22,8 +23,21 @@ const Middleware = {
},
};

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);
});
};

Middleware.requireUser = async function (req, res, next) {
var writeApi = require.main.require('nodebb-plugin-write-api');
const loginAsync = util.promisify(req.login).bind(req);
var routeMatch;

await plugins.fireHook('response:plugin.write-api.authenticate', {
@ -40,31 +54,34 @@ Middleware.requireUser = async function (req, res, next) {
}

if (req.headers.hasOwnProperty('authorization')) {
passport.authenticate('bearer', { session: false }, function (err, user) {
if (err) { return next(err); }
const user = await passportAuthenticateAsync(req, res);
if (!user) { return errorHandler.respond(401, res); }

// If the token received was a master token, a _uid must also be present for all calls
if (user.hasOwnProperty('uid')) {
req.login(user, function (err) {
if (err) { return errorHandler.respond(500, res); }
try {
await loginAsync(user);
} catch (e) {
return errorHandler.respond(500, res);
}

req.uid = user.uid;
req.loggedIn = req.uid > 0;
next();
});
} else if (user.hasOwnProperty('master') && user.master === true) {
if (req.body.hasOwnProperty('_uid') || req.query.hasOwnProperty('_uid')) {
user.uid = req.body._uid || req.query._uid;
delete user.master;

req.login(user, function (err) {
if (err) { return errorHandler.respond(500, res); }
try {
await loginAsync(user);
} catch (e) {
return errorHandler.respond(500, res);
}

req.uid = user.uid;
req.loggedIn = req.uid > 0;
next();
});
} else {
res.status(400).json(errorHandler.generate(
400, 'params-missing',
@ -75,7 +92,6 @@ Middleware.requireUser = async function (req, res, next) {
} else {
return errorHandler.respond(500, res);
}
})(req, res, next);
} else if (writeApi.settings['jwt:enabled'] === 'on' && writeApi.settings.hasOwnProperty('jwt:secret')) {
var token = (writeApi.settings['jwt:payloadKey'] ? (req.query[writeApi.settings['jwt:payloadKey']] || req.body[writeApi.settings['jwt:payloadKey']]) : null) || req.query.token || req.body.token;
jwt.verify(token, writeApi.settings['jwt:secret'], {