|
@@ -22,7 +22,6 @@ var UserSchema = new mongoose.Schema({
|
|
|
token: String
|
|
|
})
|
|
|
|
|
|
-
|
|
|
/**
|
|
|
* Validations
|
|
|
*/
|
|
@@ -106,7 +105,7 @@ UserSchema.methods = {
|
|
|
* @return {Boolean}
|
|
|
* @api public
|
|
|
*/
|
|
|
- authenticate(password, callback) {
|
|
|
+ authenticate (password, callback) {
|
|
|
if (!callback) {
|
|
|
return this.password === this.encryptPassword(password)
|
|
|
}
|
|
@@ -132,12 +131,12 @@ UserSchema.methods = {
|
|
|
* @return {String}
|
|
|
* @api public
|
|
|
*/
|
|
|
- makeSalt(byteSize, callback) {
|
|
|
+ makeSalt (byteSize, callback) {
|
|
|
var defaultByteSize = 16
|
|
|
|
|
|
if (typeof arguments[0] === 'function') {
|
|
|
callback = arguments[0]
|
|
|
- byteSize = defaultByteSize;
|
|
|
+ byteSize = defaultByteSize
|
|
|
} else if (typeof arguments[1] === 'function') {
|
|
|
callback = arguments[1]
|
|
|
} else {
|
|
@@ -165,7 +164,7 @@ UserSchema.methods = {
|
|
|
* @return {String}
|
|
|
* @api public
|
|
|
*/
|
|
|
- encryptPassword(password, callback) {
|
|
|
+ encryptPassword (password, callback) {
|
|
|
if (!password || !this.salt) {
|
|
|
if (!callback) {
|
|
|
return null
|
|
@@ -179,11 +178,11 @@ UserSchema.methods = {
|
|
|
var salt = new Buffer(this.salt, 'base64')
|
|
|
|
|
|
if (!callback) {
|
|
|
- return crypto.pbkdf2Sync(password, salt, defaultIterations, defaultKeyLength)
|
|
|
+ return crypto.pbkdf2Sync(password, salt, defaultIterations, defaultKeyLength, 'sha1')
|
|
|
.toString('base64')
|
|
|
}
|
|
|
|
|
|
- return crypto.pbkdf2(password, salt, defaultIterations, defaultKeyLength, (err, key) => {
|
|
|
+ return crypto.pbkdf2(password, salt, defaultIterations, defaultKeyLength, 'sha1', (err, key) => {
|
|
|
if (err) {
|
|
|
return callback(err)
|
|
|
} else {
|