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

feat: allow override of local fns in login controller, 400 instead of 500 for wrong login type [breaking]

Browse Source
This commit is contained in:
Julian Lam
2021-01-07 12:16:35 -05:00
parent d3e041e292
commit 1cf0032d9f
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/controllers/authentication.js
View File

@@ -226,7 +226,7 @@ authenticationController.login = function (req, res, next) {
plugins.hooks.fire('filter:login.check', { req: req, res: res, userData: req.body }, (err) => { plugins.hooks.fire('filter:login.check', { req: req, res: res, userData: req.body }, (err) => {
if (err) { if (err) {
return helpers.noScriptErrors(req, res, err.message, 403); return (res.locals.noScriptErrors || helpers.noScriptErrors)(req, res, err.message, 403);
} }
if (req.body.username && utils.isEmailValid(req.body.username) && loginWith.includes('email')) { if (req.body.username && utils.isEmailValid(req.body.username) && loginWith.includes('email')) {
async.waterfall([ async.waterfall([
@@ -235,14 +235,14 @@ 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;
continueLogin(req, res, next); (res.locals.continueLogin || continueLogin)(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)) {
continueLogin(req, res, next); (res.locals.continueLogin || continueLogin)(req, res, next);
} else { } else {
err = '[[error:wrong-login-type-' + loginWith + ']]'; err = '[[error:wrong-login-type-' + loginWith + ']]';
helpers.noScriptErrors(req, res, err, 500); (res.locals.noScriptErrors || helpers.noScriptErrors)(req, res, err, 400);
} }
}); });
}; };