Skip to content

Commit 75560be

Browse files
guumasterguumaster
committed
merged feature/services_user_realms
1 parent 05bc11a commit 75560be

File tree

4 files changed

+35
-33
lines changed

4 files changed

+35
-33
lines changed

‎package.json

+3-1
Original file line numberDiff line numberDiff line change
@@ -70,5 +70,7 @@
7070
"url": "https://github.com/thegameofcode/cipherlayer/issues"
7171
},
7272
"homepage": "https://github.com/thegameofcode/cipherlayer",
73-
"pre-commit": [ ]
73+
"pre-commit": [
74+
"lint"
75+
]
7476
}

‎src/managers/dao.js

+4-4
Original file line numberDiff line numberDiff line change
@@ -192,7 +192,7 @@ function updateFieldWithMethod(userId, method, fieldName, fieldValue, cbk){
192192
}
193193
};
194194

195-
usersCollection.findOneAndUpdate({ _id }, data, { returnOriginal: false, projection: { password: 0 }}, function (err, updatedProfiles) {
195+
usersCollection.findOneAndUpdate({ _id: userId }, data, { returnOriginal: false, projection: { password: 0 }}, function (err, updatedProfiles) {
196196
if (err) {
197197
return cbk(err, null);
198198
}
@@ -213,11 +213,11 @@ function addToArrayFieldById(userId, fieldName, fieldValue, cbk) {
213213
}
214214
}
215215
};
216-
usersCollection.findOneAndUpdate({ _id: userId }, data, { returnOriginal: false, projection: { password: 0 }}, function (err, updatedProfiles) {
216+
usersCollection.findOneAndUpdate({ _id: userId }, data, { returnOriginal: false, projection: { password: 0 }}, function (err) {
217217
if (err) {
218218
return cbk(err, null);
219219
}
220-
return cbk(null, updatedProfiles);
220+
return cbk(null, 1);
221221
});
222222
}
223223

@@ -279,7 +279,7 @@ function getRealmFromName(name, cbk) {
279279
return cbk({err: 'invalid_realm_name', code: 400});
280280
}
281281
const nameRe = makeRegEx(name);
282-
realmsCollection.find({name: nameRe}, {_id: 0}).limit(1).next(function (err, realms) {
282+
realmsCollection.find({name: nameRe}, {_id: 0}).limit(1).next(function (err, realm) {
283283
if (err) {
284284
return cbk(err);
285285
}

‎src/managers/user.js

+2-2
Original file line numberDiff line numberDiff line change
@@ -405,8 +405,8 @@ function setPassword(id, body, cbk) {
405405
return cbk(err);
406406
}
407407
cryptoMng.encrypt(body.password, function (encryptedPwd) {
408-
daoMng.updateField(id, 'password', encryptedPwd, function (err, result) {
409-
return cbk(err, result);
408+
daoMng.updateField(id, 'password', encryptedPwd, function (err) {
409+
return cbk(err, 1);
410410
});
411411
});
412412
}

‎tests-unit/dao.js

+26-26
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,8 @@ describe('user dao', function () {
2727
count: noop,
2828
find: noop,
2929
insertOne: noop,
30-
update: noop,
31-
ensureIndex: noop,
32-
toArray: noop
30+
updateOne: noop,
31+
ensureIndex: noop
3332
};
3433

3534
fakeDb = {
@@ -43,7 +42,8 @@ describe('user dao', function () {
4342
},
4443
next(cbk) {
4544
return cbk(null, null);
46-
}
45+
},
46+
toArray: noop
4747
};
4848

4949
sinon.stub(fakeCollection, 'deleteMany').yields();
@@ -213,15 +213,15 @@ describe('user dao', function () {
213213
const expectedField = 'field1';
214214
const expectedValue = 'value1';
215215

216-
fakeCollection.update = function (query, update, cbk) {
216+
fakeCollection.findOneAndUpdate = function (query, update, options, cbk) {
217217
assert.equal(query._id, expectedUser.id);
218218
assert.equal(update.$set[expectedField], expectedValue);
219-
cbk(null, 1);
219+
cbk(null, expectedUser);
220220
};
221221

222222
dao.updateFieldWithMethod(expectedUser.id, '$set', expectedField, expectedValue, function (err, updates) {
223223
assert.equal(err, null);
224-
assert.equal(updates, 1);
224+
assert.deepEqual(updates, expectedUser);
225225
return done();
226226
});
227227
});
@@ -231,15 +231,15 @@ describe('user dao', function () {
231231
const expectedField = 'field1';
232232
const expectedValue = ['value1', 'value2'];
233233

234-
fakeCollection.update = function (query, update, cbk) {
234+
fakeCollection.findOneAndUpdate = function (query, update, options, cbk) {
235235
assert.equal(query._id, expectedUser.id);
236236
assert.equal(update.$pull[expectedField], expectedValue);
237-
cbk(null, 1);
237+
cbk(null, expectedUser);
238238
};
239239

240240
dao.updateFieldWithMethod(expectedUser.id, '$pull', expectedField, expectedValue, function (err, updates) {
241241
assert.equal(err, null);
242-
assert.equal(updates, 1);
242+
assert.equal(updates, expectedUser);
243243
return done();
244244
});
245245
});
@@ -249,15 +249,15 @@ describe('user dao', function () {
249249
const expectedField = 'field1';
250250
const expectedValue = 'value1';
251251

252-
fakeCollection.updateOne = function (query, update, cbk) {
252+
fakeCollection.findOneAndUpdate = function (query, update, options, cbk) {
253253
assert.equal(query._id, expectedUser.id);
254254
assert.equal(update.$set[expectedField], expectedValue);
255-
cbk(null, { modifiedCount: 1});
255+
cbk(null, expectedUser);
256256
};
257257

258258
dao.updateField(expectedUser.id, expectedField, expectedValue, function (err, updates) {
259259
assert.equal(err, null);
260-
assert.equal(updates, 1);
260+
assert.equal(updates, expectedUser);
261261
return done();
262262
});
263263
});
@@ -267,15 +267,15 @@ describe('user dao', function () {
267267
const expectedField = 'field1';
268268
const expectedValue = ['value1', 'value2'];
269269

270-
fakeCollection.update = function (query, update, cbk) {
270+
fakeCollection.findOneAndUpdate = function (query, update, options, cbk) {
271271
assert.equal(query._id, expectedUser.id);
272272
assert.deepEqual(update.$pull[expectedField], expectedValue);
273-
cbk(null, 1);
273+
cbk(null, expectedUser);
274274
};
275275

276276
dao.removeFromArrayFieldById(expectedUser.id, expectedField, expectedValue, function (err, added) {
277277
assert.equal(err, null);
278-
assert.equal(added, 1);
278+
assert.equal(added, expectedUser);
279279
return done();
280280
});
281281
});
@@ -285,10 +285,10 @@ describe('user dao', function () {
285285
const expectedField = 'field1';
286286
const expectedValue = ['value1', 'value2'];
287287

288-
fakeCollection.update = function (query, update, cbk) {
288+
fakeCollection.findOneAndUpdate = function (query, update, options, cbk) {
289289
assert.equal(query._id, expectedUser.id);
290290
assert.deepEqual(update.$push[expectedField], {$each: [expectedValue]});
291-
cbk(null, 1);
291+
cbk(null, expectedUser);
292292
};
293293

294294
dao.addToArrayFieldById(expectedUser.id, expectedField, expectedValue, function (err, added) {
@@ -311,8 +311,8 @@ describe('user dao', function () {
311311
call: true
312312
}
313313
};
314-
sinon.stub(fakeCollection, 'find').returns(fakeCollection);
315-
sinon.stub(fakeCollection, 'toArray').onCall(0).yields(null, [fakeRealm]);
314+
sinon.stub(fakeCollection, 'find').onCall(0).returns(fakeFind);
315+
sinon.stub(fakeFind, 'toArray').onCall(0).yields(null, [fakeRealm]);
316316

317317
const expectedRealm = _.assign({}, fakeRealm);
318318
dao.getRealms(function (err, realms) {
@@ -337,7 +337,7 @@ describe('user dao', function () {
337337
const expectedValue = {field1: 'value1', field2: 'value2'};
338338

339339
let callNumber = 0;
340-
fakeCollection.update = function (query, update, upsertCbk, cbk) {
340+
fakeCollection.updateOne = function (query, update, cbk) {
341341
callNumber++;
342342
switch (callNumber) {
343343
case 1:
@@ -352,7 +352,7 @@ describe('user dao', function () {
352352
}
353353
}
354354
});
355-
return upsertCbk(null, 1);
355+
return cbk(null, { modifiedCount: 1 });
356356
}
357357
};
358358

@@ -370,11 +370,11 @@ describe('user dao', function () {
370370
const expectedValue = {field1: 'value1', field2: 'value2'};
371371
expectedUser[expectedField] = [];
372372

373-
fakeCollection.update = function (query, update, upsert, cbk) {
373+
fakeCollection.updateOne = function (query, update, upsert, cbk) {
374374
assert.deepEqual(query, {_id: expectedUser.id, 'fieldsArray.field1': 'value1'});
375375
assert.deepEqual(update, {$set: {'fieldsArray.$': expectedValue}});
376376
assert.deepEqual(upsert, {upsert: true});
377-
cbk(null, 1);
377+
cbk(null, { modifiedCount: 1});
378378
};
379379

380380
dao.updateArrayItem(expectedUser.id, expectedField, expectedKey, expectedValue, function (err, updates) {
@@ -393,11 +393,11 @@ describe('user dao', function () {
393393
expectedUser[expectedField] = [expectedValue1, expectedValue2];
394394
const expectedNewValue = {key: 'value2', field2: 'newvalue2'};
395395

396-
fakeCollection.update = function (query, update, upsert, cbk) {
396+
fakeCollection.updateOne = function (query, update, upsert, cbk) {
397397
assert.deepEqual(query, {_id: expectedUser.id, 'fieldsArray.key': 'value2'});
398398
assert.deepEqual(update, {$set: {'fieldsArray.$': expectedNewValue}});
399399
assert.deepEqual(upsert, {upsert: true});
400-
cbk(null, 1);
400+
cbk(null, { modifiedCount: 1});
401401
};
402402

403403
dao.updateArrayItem(expectedUser.id, expectedField, expectedKey, expectedNewValue, function (err, updates) {

0 commit comments

Comments
 (0)