closes #2550, closes #2518

This commit is contained in:
barisusakli
2015-02-01 19:11:58 -05:00
parent 79083004e4
commit 2c8e8a1f1c
17 changed files with 369 additions and 249 deletions

View File

@@ -68,7 +68,7 @@
});
};
Auth.login = function(username, password, next) {
Auth.login = function(req, username, password, next) {
if (!username || !password) {
return next(new Error('[[error:invalid-password]]'));
}
@@ -85,7 +85,7 @@
return next(new Error('[[error:no-user]]'));
}
uid = _uid;
user.auth.logAttempt(uid, next);
user.auth.logAttempt(uid, req.ip, next);
},
function(next) {
db.getObjectFields('user:' + uid, ['password', 'banned'], next);
@@ -109,7 +109,7 @@
], next);
};
passport.use(new passportLocal(Auth.login));
passport.use(new passportLocal({passReqToCallback: true}, Auth.login));
passport.serializeUser(function(user, done) {
done(null, user.uid);