Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-10-31 19:15:58 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #1976

Browse Source
This commit is contained in:
barisusakli
2014-08-12 21:41:23 -04:00
parent 9511e4a633
commit 005405b16c
5 changed files with 98 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/user.js
View File

@@ -1,6 +1,6 @@
'use strict';
var bcrypt = require('bcryptjs'),
var
async = require('async'),
nconf = require('nconf'),
gravatar = require('gravatar'),
@@ -9,7 +9,8 @@ var bcrypt = require('bcryptjs'),
db = require('./database'),
meta = require('./meta'),
groups = require('./groups'),
emitter = require('./emitter');
emitter = require('./emitter'),
Password = require('./password');
(function(User) {
@@ -295,12 +296,7 @@ var bcrypt = require('bcryptjs'),
return callback(null, password);
}
bcrypt.genSalt(nconf.get('bcrypt_rounds'), function(err, salt) {
if (err) {
return callback(err);
}
bcrypt.hash(password, salt, callback);
});
Password.hash(nconf.get('bcrypt_rounds'), password, callback);
};
User.onNewPostMade = function(postData) {