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

password should be passed to action hook, and it was being ovewritten

Browse Source
This commit is contained in:
Aziz Khoury
2014-01-20 16:29:46 -05:00
parent 4fad334e18
commit 74f23497dc
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/login.js
View File

@@ -34,8 +34,10 @@ var user = require('./user'),
message: "user-banned" message: "user-banned"
}); });
} }
console.log(password);
console.log(JSON.stringify(userData));
bcrypt.compare(password, userData.password, function(err, res) { bcrypt.compare(password, userData.password || '', function(err, res) {
if (err) { if (err) {
winston.err(err.message); winston.err(err.message);
next(new Error('bcrypt compare error')); next(new Error('bcrypt compare error'));

5
src/user.js
View File

@@ -84,6 +84,7 @@ var bcrypt = require('bcrypt'),
var gravatar = User.createGravatarURLFromEmail(userData.email); var gravatar = User.createGravatarURLFromEmail(userData.email);
var timestamp = Date.now(); var timestamp = Date.now();
var password = userData.password;
userData = { userData = {
'uid': uid, 'uid': uid,
@@ -127,8 +128,8 @@ var bcrypt = require('bcrypt'),
// Join the "registered-users" meta group // Join the "registered-users" meta group
groups.joinByGroupName('registered-users', uid); groups.joinByGroupName('registered-users', uid);
if (userData.password) { if (password) {
User.hashPassword(userData.password, function(err, hash) { User.hashPassword(password, function(err, hash) {
User.setUserField(uid, 'password', hash); User.setUserField(uid, 'password', hash);
callback(null, uid); callback(null, uid);
}); });