Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-05 23:30:36 +01:00
Code Issues Packages Projects Releases Wiki Activity

Moved all error handling into helpers function

Browse Source
This commit is contained in:
André Zanghelini
2017-07-02 15:37:23 -03:00
parent d497e08109
commit 4a09dfbd08
2 changed files with 9 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/controllers/authentication.js
View File

@@ -202,32 +202,21 @@ authenticationController.login = function (req, res, next) {
continueLogin(req, res, next);
} else {
var err = '[[error:wrong-login-type-' + loginWith + ']]';
if (req.body.noscript === 'true') {
return helpers.noScriptErrors(req, res, err, 500);
}
res.status(500).send(err);
helpers.noScriptErrors(req, res, err, 500);
}
};
function continueLogin(req, res, next) {
passport.authenticate('local', function (err, userData, info) {
if (err) {
if (req.body.noscript === 'true') {
return helpers.noScriptErrors(req, res, err.message, 403);
}
return res.status(403).send(err.message);
return helpers.noScriptErrors(req, res, err.message, 403);
}
if (!userData) {
if (typeof info === 'object') {
info = '[[error:invalid-username-or-password]]';
}
if (req.body.noscript === 'true') {
return helpers.noScriptErrors(req, res, info, 403);
}
return res.status(403).send(info);
return helpers.noScriptErrors(req, res, info, 403);
}
var passwordExpiry = userData.passwordExpiry !== undefined ? parseInt(userData.passwordExpiry, 10) : null;
@@ -247,10 +236,7 @@ function continueLogin(req, res, next) {
req.session.passwordExpired = true;
user.reset.generate(userData.uid, function (err, code) {
if (err) {
if (req.body.noscript === 'true') {
return helpers.noScriptErrors(req, res, err.message, 403);
}
return res.status(403).send(err.message);
return helpers.noScriptErrors(req, res, err.message, 403);
}
res.status(200).send(nconf.get('relative_path') + '/reset/' + code);
@@ -258,10 +244,7 @@ function continueLogin(req, res, next) {
} else {
authenticationController.doLogin(req, userData.uid, function (err) {
if (err) {
if (req.body.noscript === 'true') {
return helpers.noScriptErrors(req, res, err.message, 403);
}
return res.status(403).send(err.message);
return helpers.noScriptErrors(req, res, err.message, 403);
}
var next;

4
src/controllers/helpers.js
View File

@@ -15,6 +15,10 @@ var middleware = require('../middleware');
var helpers = module.exports;
helpers.noScriptErrors = function (req, res, error, httpStatus) {
if (req.body.noscript === 'false') {
return res.status(httpStatus).send(error);
}
var middleware = require('../middleware');
var httpStatusString = httpStatus.toString();
middleware.buildHeader(req, res, function () {