Merge pull request #128 from Gentlee/change-password

Implement changePassword method #127
saintedlama · Aug 8, 2017 · a88d36e · a88d36e
2 parents 3985bbc + 4537324
commit a88d36e
Show file tree

Hide file tree

Showing 2 changed files with 120 additions and 1 deletion.
diff --git a/index.js b/index.js
@@ -107,6 +107,50 @@ module.exports = function(schema, options) {
       });
     });
   };
+
+  function changePassword(user, oldPassword, newPassword, cb) {
+    if (!oldPassword || !newPassword) {
+      return cb(new errors.MissingPasswordError(options.errorMessages.MissingPasswordError));
+    }
+
+    if (!user.get(options.saltField)) {
+      return cb(new errors.NoSaltValueStoredError(options.errorMessages.NoSaltValueStoredError));
+    }
+
+    pbkdf2(oldPassword, user.get(options.saltField), function(err, hashRaw) {
+      if (err) {
+        return cb(err);
+      }
+
+      var hash = new Buffer(hashRaw, 'binary').toString(options.encoding);
+
+      if (scmp(hash, user.get(options.hashField))) {
+        if (oldPassword === newPassword) {
+            return cb(null, user);
+        }
+        user.setPassword(newPassword, cb);
+      } else {
+        return cb(new errors.IncorrectPasswordError(options.errorMessages.IncorrectPasswordError));
+      }
+    });
+  }
+
+  schema.methods.changePassword = function(oldPassword, newPassword, cb) {
+    var self = this;
+
+    if (!self.get(options.saltField)) {
+      self.constructor.findByUsername(self.get(options.usernameField), true, function(err, user) {
+        if (err) return cb(err);
+        if (user) {
+          return changePassword(user, oldPassword, newPassword, cb);
+        } else {
+          return cb(new errors.IncorrectUsernameError(options.errorMessages.IncorrectUsernameError));
+        }
+      });
+    } else {
+      return changePassword(self, oldPassword, newPassword, cb);
+    }
+  };
 
   function authenticate(user, password, cb) {
     if (options.limitAttempts) {
@@ -157,7 +201,6 @@ module.exports = function(schema, options) {
         }
       }
     });
-
   }
 
   schema.methods.authenticate = function(password, cb) {

diff --git a/test/passport-local-mongoose.js b/test/passport-local-mongoose.js
@@ -173,6 +173,82 @@ describe('passportLocalMongoose', function() {
       });
     });
   });
+
+  describe('#changePassword()', function() {
+    it('should change password', function(done) {
+      this.timeout(5000); // Five seconds - heavy crypto in background
+
+      var user = new DefaultUser();
+
+      user.setPassword('password1', function(err) {
+        assert.ifError(err);
+
+        user.changePassword('password1', 'password2', function(err, user) {
+          assert.ifError(err);
+          assert.ok(user);
+
+          user.authenticate('password2', function(err, result, data) {
+            assert.ifError(err);
+            assert.ok(result);
+
+            done();
+          });
+        });
+      });
+    });
+
+    it('should fail on wrong password', function(done) {
+      this.timeout(5000); // Five seconds - heavy crypto in background
+
+      var user = new DefaultUser();
+
+      user.setPassword('password1', function(err) {
+        assert.ifError(err);
+
+        user.changePassword('password2', 'password2', function(err, user) {
+          assert.ok(err);
+          done();
+        })
+      });
+    });
+
+    it('should not fail when passwords are the same', function(done) {
+      this.timeout(5000); // Five seconds - heavy crypto in background
+
+      var user = new DefaultUser();
+
+      user.setPassword('password1', function(err) {
+        assert.ifError(err);
+
+        user.changePassword('password1', 'password1', function(err, user) {
+          assert.ifError(err);
+          assert.ok(user);
+
+          done();
+        });
+      });
+    });
+
+    it('should change password when user model doesnt include salt/hash fields', function(done) {
+      this.timeout(5000); // Five seconds - heavy crypto in background
+
+      var user = new DefaultUser();
+
+      user.setPassword('password1', function(err) {
+        assert.ifError(err);
+
+        delete user.salt;
+        delete user.hash;
+
+        user.changePassword('password1', 'password2', function(err, user) {
+          assert.ifError(err);
+          assert.ok(user);
+
+          done();
+        });
+      });
+    });
+  });
 
   describe('#authenticate()', function() {
     it('should yield false in case user cannot be authenticated', function(done) {