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

Merge remote-tracking branch 'refs/remotes/origin/master' into develop

Browse Source 
# Conflicts:
#	package.json
#	src/views/admin/manage/ip-blacklist.tpl
This commit is contained in:
Barış Soner Uşaklı
2017-08-24 19:29:15 -04:00
parent abffc29128 53ca6d1199
commit 5cc39e8546
371 changed files with 961 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/controllers/authentication.js
View File

@@ -288,7 +288,6 @@ authenticationController.doLogin = function (req, uid, callback) {
};
authenticationController.onSuccessfulLogin = function (req, uid, callback) {
callback = callback || function () {};
var uuid = utils.generateUUID();
req.session.meta = {};
@@ -308,6 +307,7 @@ authenticationController.onSuccessfulLogin = function (req, uid, callback) {
});
async.waterfall([
async.apply(meta.blacklist.test, req.ip),
function (next) {
async.parallel([
function (next) {
@@ -330,7 +330,17 @@ authenticationController.onSuccessfulLogin = function (req, uid, callback) {
plugins.fireHook('action:user.loggedIn', { uid: uid, req: req });
next();
},
], callback);
], function (err) {
if (err) {
req.session.destroy();
}
if (typeof callback === 'function') {
callback(err);
} else {
return false;
}
});
};
authenticationController.localLogin = function (req, username, password, next) {