Merge branch 'pr/25'

taobataoma · Apr 16, 2014 · a976eb9 · a976eb9
2 parents c6a8a9b + 8f09b8b
commit a976eb9
Showing 1 changed file with 3 additions and 0 deletions.
diff --git a/app/models/user.js b/app/models/user.js
@@ -104,6 +104,9 @@ UserSchema.methods.hashPassword = function(password) {
  * Create instance method for authenticating user
  */
 UserSchema.methods.authenticate = function(password) {
+	if (!this.password || !this.salt) {
+		return false;
+	}
 	return this.password === this.hashPassword(password);
 };