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

restoring passwordExpiry for use in continueLogin, fixed tests, hopefully

Browse Source
This commit is contained in:
Julian Lam
2018-07-27 12:34:51 -04:00
parent 786af5fbb3
commit 3c6c0ed7a1
2 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/controllers/authentication.js
View File

@@ -397,6 +397,7 @@ authenticationController.localLogin = function (req, username, password, next) {
uid = _uid;
async.parallel({
userData: async.apply(db.getObjectFields, 'user:' + uid, ['passwordExpiry']),
isAdminOrGlobalMod: function (next) {
user.isAdminOrGlobalMod(uid, next);
},
@@ -406,10 +407,10 @@ authenticationController.localLogin = function (req, username, password, next) {
}, next);
},
function (result, next) {
userData = {
userData = Object.assign(result.userData, {
uid: uid,
isAdminOrGlobalMod: result.isAdminOrGlobalMod,
};
});
if (!result.isAdminOrGlobalMod && parseInt(meta.config.allowLocalLogin, 10) === 0) {
return next(new Error('[[error:local-login-disabled]]'));