@@ -99,22 +99,22 @@ UserSchema
99
99
// Validate email is not taken
100
100
UserSchema
101
101
. path ( 'email' )
102
- . validate ( function ( value , respond ) {
102
+ . validate ( function ( value ) {
103
103
< % _ if ( filters . oauth ) { - % >
104
104
if ( authTypes . indexOf ( this . provider ) !== - 1 ) {
105
- return respond ( true ) ;
105
+ return true ;
106
106
}
107
107
108
108
< % _ } - % >
109
109
return this.constructor.findOne({ email : value } ).exec()
110
110
.then(user => {
111
111
if ( user ) {
112
112
if ( this . id === user . id ) {
113
- return respond ( true ) ;
113
+ return true ;
114
114
}
115
- return respond( false) ;
115
+ return false;
116
116
}
117
- return respond ( true ) ;
117
+ return true ;
118
118
} )
119
119
. catch ( function ( err ) {
120
120
throw err ;
@@ -197,14 +197,16 @@ UserSchema.methods = {
197
197
* @return {String }
198
198
* @api public
199
199
*/
200
- makeSalt ( byteSize , callback ) {
201
- var defaultByteSize = 16 ;
200
+ makeSalt ( ...args ) {
201
+ let byteSize ;
202
+ let callback ;
203
+ let defaultByteSize = 16 ;
202
204
203
- if ( typeof arguments [ 0 ] === 'function' ) {
204
- callback = arguments [ 0 ] ;
205
+ if ( typeof args [ 0 ] === 'function' ) {
206
+ callback = args [ 0 ] ;
205
207
byteSize = defaultByteSize ;
206
- } else if ( typeof arguments [ 1 ] === 'function' ) {
207
- callback = arguments [ 1 ] ;
208
+ } else if ( typeof args [ 1 ] === 'function' ) {
209
+ callback = args [ 1 ] ;
208
210
} else {
209
211
throw new Error ( 'Missing Callback' ) ;
210
212
}
@@ -244,17 +246,20 @@ UserSchema.methods = {
244
246
var salt = new Buffer ( this . salt , 'base64' ) ;
245
247
246
248
if ( ! callback ) {
247
- return crypto . pbkdf2Sync ( password , salt , defaultIterations , defaultKeyLength )
249
+ // eslint-disable-next-line no-sync
250
+ return crypto . pbkdf2Sync ( password , salt , defaultIterations ,
251
+ defaultKeyLength , 'sha1' )
248
252
. toString ( 'base64' ) ;
249
253
}
250
254
251
- return crypto . pbkdf2 ( password , salt , defaultIterations , defaultKeyLength , ( err , key ) => {
252
- if ( err ) {
253
- return callback ( err ) ;
254
- } else {
255
- return callback ( null , key . toString ( 'base64' ) ) ;
256
- }
257
- } ) ;
255
+ return crypto . pbkdf2 ( password , salt , defaultIterations , defaultKeyLength ,
256
+ 'sha1' , ( err , key ) => {
257
+ if ( err ) {
258
+ return callback ( err ) ;
259
+ } else {
260
+ return callback ( null , key . toString ( 'base64' ) ) ;
261
+ }
262
+ } ) ;
258
263
}
259
264
} ;
260
265
0 commit comments