Skip to content

Commit f5bd23b

Browse files
committed
refactor(model): Fix eslint warnings in user.model.js
1 parent e4c2c81 commit f5bd23b

File tree

2 files changed

+14
-8
lines changed

2 files changed

+14
-8
lines changed

templates/app/server/api/user(auth)/user.model(mongooseModels).js

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,16 @@ UserSchema.methods = {
197197
* @return {String}
198198
* @api public
199199
*/
200-
makeSalt(byteSize, callback) {
201-
var defaultByteSize = 16;
200+
makeSalt(...args) {
201+
let byteSize;
202+
let callback;
203+
let defaultByteSize = 16;
202204

203-
if(typeof arguments[0] === 'function') {
204-
callback = arguments[0];
205+
if(typeof args[0] === 'function') {
206+
callback = args[0];
205207
byteSize = defaultByteSize;
206-
} else if(typeof arguments[1] === 'function') {
207-
callback = arguments[1];
208+
} else if(typeof args[1] === 'function') {
209+
callback = args[1];
208210
} else {
209211
throw new Error('Missing Callback');
210212
}
@@ -244,6 +246,7 @@ UserSchema.methods = {
244246
var salt = new Buffer(this.salt, 'base64');
245247

246248
if(!callback) {
249+
// eslint-disable-next-line no-sync
247250
return crypto.pbkdf2Sync(password, salt, defaultIterations, defaultKeyLength)
248251
.toString('base64');
249252
}

templates/app/server/api/user(auth)/user.model(sequelizeModels).js

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -135,8 +135,10 @@ export default function(sequelize, DataTypes) {
135135
* @return {String}
136136
* @api public
137137
*/
138-
makeSalt(byteSize, callback) {
139-
var defaultByteSize = 16;
138+
makeSalt(...args) {
139+
let byteSize;
140+
let callback;
141+
let defaultByteSize = 16;
140142

141143
if(typeof arguments[0] === 'function') {
142144
callback = arguments[0];
@@ -177,6 +179,7 @@ export default function(sequelize, DataTypes) {
177179
var salt = new Buffer(this.salt, 'base64');
178180

179181
if(!callback) {
182+
// eslint-disable-next-line no-sync
180183
return crypto.pbkdf2Sync(password, salt, defaultIterations, defaultKeyLength)
181184
.toString('base64');
182185
}

0 commit comments

Comments
 (0)