fix: don't remove User.isValid

abecms · Nov 24, 2016 · 4eba117 · 4eba117
1 parent d1a346d
commit 4eba117
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 9 deletions.
diff --git a/src/cli/users/index.js b/src/cli/users/index.js
@@ -117,15 +117,15 @@ export function findByResetPasswordToken(resetPasswordToken, done) {
   return done(null, null)
 }
 
-// export function isValid(user, password) {
-//   var bdd = User.getBdd()
-//   if(user.actif === 1) {
-//     if(bcrypt.compareSync(password, user.password)) {
-//       return true
-//     }
-//   }
-//   return false;
-// };
+export function isValid(user, password) {
+  var bdd = User.getBdd()
+  if(user.actif === 1) {
+    if(bcrypt.compareSync(password, user.password)) {
+      return true
+    }
+  }
+  return false;
+};
 
 export function deactivate(id) {
   var bdd = User.getBdd()

diff --git a/test/users.js b/test/users.js
@@ -246,6 +246,25 @@ describe('users', function() {
     User.getBdd.restore()
   })
 
+  it('User.isValid', function(){
+    // stub
+    var sinonInstance = sinon.sandbox.create();
+    var stub = sinonInstance.stub(User, 'getBdd');
+    stub.returns(JSON.parse(JSON.stringify(this.fixture.users)))
+    var stubHashSync = sinonInstance.stub(bcrypt, 'compareSync');
+    stubHashSync.returns(true);
+
+    // test
+    var res = User.isValid(JSON.parse(JSON.stringify(this.fixture.users))[0])
+    chai.expect(res).to.be.equal(true)
+
+    // unstub
+    sinon.assert.calledOnce(User.getBdd)
+    User.getBdd.restore()
+    sinon.assert.calledOnce(bcrypt.compareSync)
+    bcrypt.compareSync.restore()
+  })
+
   it('User.findSync', function(){
     var sinonInstance = sinon.sandbox.create();
     var stub = sinonInstance.stub(User, 'getBdd');