Skip to content

Commit fc4270c

Browse files
committed
feat(server:user.model): require callback in makeSalt function
we never use the sync version
1 parent 272abef commit fc4270c

File tree

2 files changed

+6
-10
lines changed

2 files changed

+6
-10
lines changed

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -185,7 +185,7 @@ UserSchema.methods = {
185185
/**
186186
* Make salt
187187
*
188-
* @param {Number} byteSize Optional salt byte size, default to 16
188+
* @param {Number} [byteSize] - Optional salt byte size, default to 16
189189
* @param {Function} callback
190190
* @return {String}
191191
* @api public
@@ -198,16 +198,14 @@ UserSchema.methods = {
198198
byteSize = defaultByteSize;
199199
} else if (typeof arguments[1] === 'function') {
200200
callback = arguments[1];
201+
} else {
202+
throw new Error('Missing Callback');
201203
}
202204

203205
if (!byteSize) {
204206
byteSize = defaultByteSize;
205207
}
206208

207-
if (!callback) {
208-
return crypto.randomBytes(byteSize).toString('base64');
209-
}
210-
211209
return crypto.randomBytes(byteSize, (err, salt) => {
212210
if (err) {
213211
callback(err);

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ module.exports = function(sequelize, DataTypes) {
130130
/**
131131
* Make salt
132132
*
133-
* @param {Number} byteSize Optional salt byte size, default to 16
133+
* @param {Number} [byteSize] - Optional salt byte size, default to 16
134134
* @param {Function} callback
135135
* @return {String}
136136
* @api public
@@ -144,16 +144,14 @@ module.exports = function(sequelize, DataTypes) {
144144
}
145145
else if (typeof arguments[1] === 'function') {
146146
callback = arguments[1];
147+
} else {
148+
throw new Error('Missing Callback');
147149
}
148150

149151
if (!byteSize) {
150152
byteSize = defaultByteSize;
151153
}
152154

153-
if (!callback) {
154-
return crypto.randomBytes(byteSize).toString('base64');
155-
}
156-
157155
return crypto.randomBytes(byteSize, function(err, salt) {
158156
if (err) {
159157
callback(err);

0 commit comments

Comments
 (0)