add blacklist test to onSuccessfulLogin as well

v1.18.x
Julian Lam 8 years ago
parent 10c8666520
commit 81cf8f77d3

@ -274,7 +274,6 @@ authenticationController.doLogin = function (req, uid, callback) {
}; };
authenticationController.onSuccessfulLogin = function (req, uid, callback) { authenticationController.onSuccessfulLogin = function (req, uid, callback) {
callback = callback || function () {};
var uuid = utils.generateUUID(); var uuid = utils.generateUUID();
req.session.meta = {}; req.session.meta = {};
@ -294,6 +293,7 @@ authenticationController.onSuccessfulLogin = function (req, uid, callback) {
}); });
async.waterfall([ async.waterfall([
async.apply(meta.blacklist.test, req.ip),
function (next) { function (next) {
async.parallel([ async.parallel([
function (next) { function (next) {
@ -316,7 +316,17 @@ authenticationController.onSuccessfulLogin = function (req, uid, callback) {
plugins.fireHook('action:user.loggedIn', { uid: uid, req: req }); plugins.fireHook('action:user.loggedIn', { uid: uid, req: req });
next(); 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) { authenticationController.localLogin = function (req, username, password, next) {

Loading…
Cancel
Save