Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-12-20 15:30:39 +01:00
Code Issues Packages Projects Releases Wiki Activity

feat: new hook filter:login.override, deprecate action:auth.overrideLogin

Browse Source
This commit is contained in:
Julian Lam
2021-01-29 16:59:57 -05:00
parent 473d5f4aba
commit b820d23401
1 changed files with 12 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/controllers/authentication.js
View File

@@ -210,9 +210,15 @@ authenticationController.registerAbort = function (req, res) {
}); });
}; };
authenticationController.login = function (req, res, next) { authenticationController.login = async (req, res, next) => {
let { strategy } = await plugins.hooks.fire('filter:login.override', { req, strategy: 'local' });
if (!passport._strategy(strategy)) {
winston.error(`[auth/override] Requested login strategy "${strategy}" not found, reverting back to local login strategy.`);
strategy = 'local';
}
if (plugins.hooks.hasListeners('action:auth.overrideLogin')) { if (plugins.hooks.hasListeners('action:auth.overrideLogin')) {
return continueLogin(req, res, next); return continueLogin(strategy, req, res, next);
} }
var loginWith = meta.config.allowLoginWith || 'username-email'; var loginWith = meta.config.allowLoginWith || 'username-email';
@@ -229,11 +235,11 @@ authenticationController.login = function (req, res, next) {
}, },
function (username, next) { function (username, next) {
req.body.username = username || req.body.username; req.body.username = username || req.body.username;
(res.locals.continueLogin || continueLogin)(req, res, next); (res.locals.continueLogin || continueLogin)(strategy, req, res, next);
}, },
], next); ], next);
} else if (loginWith.includes('username') && !validator.isEmail(req.body.username)) { } else if (loginWith.includes('username') && !validator.isEmail(req.body.username)) {
(res.locals.continueLogin || continueLogin)(req, res, next); (res.locals.continueLogin || continueLogin)(strategy, req, res, next);
} else { } else {
err = '[[error:wrong-login-type-' + loginWith + ']]'; err = '[[error:wrong-login-type-' + loginWith + ']]';
(res.locals.noScriptErrors || helpers.noScriptErrors)(req, res, err, 400); (res.locals.noScriptErrors || helpers.noScriptErrors)(req, res, err, 400);
@@ -241,8 +247,8 @@ authenticationController.login = function (req, res, next) {
}); });
}; };
function continueLogin(req, res, next) { function continueLogin(strategy, req, res, next) {
passport.authenticate('local', async function (err, userData, info) { passport.authenticate(strategy, async function (err, userData, info) {
if (err) { if (err) {
return helpers.noScriptErrors(req, res, err.message, 403); return helpers.noScriptErrors(req, res, err.message, 403);
} }