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

closes #6646

Browse Source
This commit is contained in:
Julian Lam
2018-07-26 16:38:36 -04:00
parent ea2bd33bfa
commit 4f8815eb78
1 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/controllers/authentication.js
View File

@@ -12,7 +12,6 @@ var meta = require('../meta');
var user = require('../user');
var plugins = require('../plugins');
var utils = require('../utils');
var Password = require('../password');
var translator = require('../translator');
var helpers = require('./helpers');
@@ -398,9 +397,6 @@ authenticationController.localLogin = function (req, username, password, next) {
uid = _uid;
async.parallel({
userData: function (next) {
db.getObjectFields('user:' + uid, ['password', 'passwordExpiry'], next);
},
isAdminOrGlobalMod: function (next) {
user.isAdminOrGlobalMod(uid, next);
},
@@ -410,9 +406,10 @@ authenticationController.localLogin = function (req, username, password, next) {
}, next);
},
function (result, next) {
userData = result.userData;
userData.uid = uid;
userData.isAdminOrGlobalMod = result.isAdminOrGlobalMod;
userData = {
uid: uid,
isAdminOrGlobalMod: result.isAdminOrGlobalMod,
};
if (!result.isAdminOrGlobalMod && parseInt(meta.config.allowLocalLogin, 10) === 0) {
return next(new Error('[[error:local-login-disabled]]'));
@@ -425,7 +422,7 @@ authenticationController.localLogin = function (req, username, password, next) {
user.auth.logAttempt(uid, req.ip, next);
},
function (next) {
Password.compare(password, userData.password, next);
user.isPasswordCorrect(uid, password, next);
},
function (passwordMatch, next) {
if (!passwordMatch) {