Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-02 12:05:57 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #2420

Browse Source
This commit is contained in:
barisusakli
2014-11-17 12:21:47 -05:00
parent 23485fcbf3
commit 9791dfb9ea
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/routes/authentication.js
View File

@@ -82,7 +82,7 @@
},
function(_uid, next) {
if (!_uid) {
return next(null, false, '[[error:no-user]]');
return next(new Error('[[error:no-user]]'));
}
uid = _uid;
user.auth.logAttempt(uid, next);
@@ -95,13 +95,13 @@
return next(new Error('[[error:invalid-user-data]]'));
}
if (userData.banned && parseInt(userData.banned, 10) === 1) {
return next(null, false, '[[error:user-banned]]');
return next(new Error('[[error:user-banned]]'));
}
Password.compare(password, userData.password, next);
},
function(passwordMatch, next) {
if (!passwordMatch) {
return next(null, false, '[[error:invalid-password]]');
return next(new Error('[[error:invalid-password]]'));
}
user.auth.clearLoginAttempts(uid);
next(null, {uid: uid}, '[[success:authentication-successful]]');
@@ -147,7 +147,7 @@
function continueLogin(req, res, next) {
passport.authenticate('local', function(err, userData, info) {
if (err) {
req.flash('error', info);
req.flash('error', err.message);
return res.redirect(nconf.get('relative_path') + '/login');
}