Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #4041

Browse Source
This commit is contained in:
barisusakli
2016-01-10 10:26:47 +02:00
parent 2ef42e79ec
commit 005db18120
6 changed files with 61 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/controllers/authentication.js
View File

@@ -216,25 +216,28 @@ function continueLogin(req, res, next) {
}
authenticationController.localLogin = function(req, username, password, next) {
if (!username || !password) {
return next(new Error('[[error:invalid-password]]'));
if (!username) {
return next(new Error('[[error:invalid-username]]'));
}
var userslug = utils.slugify(username);
var uid, userData = {};
async.waterfall([
function(next) {
function (next) {
user.isPasswordValid(password, next);
},
function (next) {
user.getUidByUserslug(userslug, next);
},
function(_uid, next) {
function (_uid, next) {
if (!_uid) {
return next(new Error('[[error:no-user]]'));
}
uid = _uid;
user.auth.logAttempt(uid, req.ip, next);
},
function(next) {
function (next) {
async.parallel({
userData: function(next) {
db.getObjectFields('user:' + uid, ['password', 'banned', 'passwordExpiry'], next);
@@ -244,7 +247,7 @@ authenticationController.localLogin = function(req, username, password, next) {
}
}, next);
},
function(result, next) {
function (result, next) {
userData = result.userData;
userData.uid = uid;
userData.isAdmin = result.isAdmin;
@@ -261,7 +264,7 @@ authenticationController.localLogin = function(req, username, password, next) {
}
Password.compare(password, userData.password, next);
},
function(passwordMatch, next) {
function (passwordMatch, next) {
if (!passwordMatch) {
return next(new Error('[[error:invalid-password]]'));
}