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

on login display invalid-login-credentials

Browse Source
This commit is contained in:
Barış Soner Uşaklı
2017-04-24 13:31:38 -04:00
parent 4900f21dd5
commit c45c4a5fdb
3 changed files with 11 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/controllers/authentication.js
View File

@@ -16,7 +16,7 @@ var Password = require('../password');
var sockets = require('../socket.io');
var authenticationController = {};
var authenticationController = module.exports;
authenticationController.register = function (req, res) {
var registrationType = meta.config.registrationType || 'normal';
@@ -357,13 +357,8 @@ authenticationController.localLogin = function (req, username, password, next) {
user.getUidByUserslug(userslug, next);
},
function (_uid, next) {
if (!_uid) {
return next(new Error('[[error:no-user]]'));
}
uid = _uid;
user.auth.logAttempt(uid, req.ip, next);
},
function (next) {
async.parallel({
userData: function (next) {
db.getObjectFields('user:' + uid, ['password', 'passwordExpiry'], next);
@@ -384,9 +379,7 @@ authenticationController.localLogin = function (req, username, password, next) {
if (!result.isAdmin && parseInt(meta.config.allowLocalLogin, 10) === 0) {
return next(new Error('[[error:local-login-disabled]]'));
}
if (!userData || !userData.password) {
return next(new Error('[[error:invalid-user-data]]'));
}
if (result.banned) {
// Retrieve ban reason and show error
return user.getLatestBanInfo(uid, function (err, banInfo) {
@@ -404,11 +397,14 @@ authenticationController.localLogin = function (req, username, password, next) {
});
}
user.auth.logAttempt(uid, req.ip, next);
},
function (next) {
Password.compare(password, userData.password, next);
},
function (passwordMatch, next) {
if (!passwordMatch) {
return next(new Error('[[error:invalid-password]]'));
return next(new Error('[[error:invalid-login-credentials]]'));
}
user.auth.clearLoginAttempts(uid);
next(null, userData, '[[success:authentication-successful]]');
@@ -441,6 +437,3 @@ authenticationController.logout = function (req, res, next) {
res.status(200).send('');
}
};
module.exports = authenticationController;