Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2026-01-04 14:50:47 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #3993

Browse Source
This commit is contained in:
psychobunny
2016-02-23 13:57:00 -05:00
parent 75917e25b3
commit b8eb19b991
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/user/password.js
View File

@@ -19,17 +19,21 @@ module.exports = function(User) {
User.isPasswordCorrect = function(uid, password, callback) {
password = password || '';
async.waterfall([
function (next) {
User.isPasswordValid(password, next);
},
function (next) {
db.getObjectField('user:' + uid, 'password', next);
},
function (hashedPassword, next) {
if (!hashedPassword) {
return callback();
return callback(null, true);
}
Password.compare(password, hashedPassword, next);
User.isPasswordValid(password, function(err) {
if (err) {
return next(err);
}
Password.compare(password, hashedPassword, next);
});
}
], callback);
};