VIPShare · sll778 · Mar 19, 2017 · Mar 19, 2017
diff --git a/controllers/auth.js b/controllers/auth.js
@@ -17,6 +17,10 @@ var Token = require('../models/token');
  */
 passport.use(new LocalStrategy(
   function(username, password, callback) {
+<<<<<<< HEAD
+
+=======
+>>>>>>> e5c6f7b8bdcb85f655c2bb074167593700fcd086
     User.findOne({ username: username }, function (err, user) {
       if (err) { return callback(err); }
 
@@ -34,6 +38,7 @@ passport.use(new LocalStrategy(
         return callback(null, user);
       });
     });
+
   }
 ));
 

diff --git a/models/user.js b/models/user.js
@@ -41,5 +41,8 @@ UserSchema.methods.verifyPassword = function(password, cb) {
   });
 };
 
+
+
+
 // Export the Mongoose model
 module.exports = mongoose.model('User', UserSchema);
diff --git a/package.json b/package.json
@@ -21,12 +21,12 @@
     "log4js": "^0.6.38",
     "mongoose": "^4.6.4",
     "node-oauth2-server": "^2.4.0",
-    "node-validator": "^0.1.23",
     "oauth2orize": "^1.5.1",
     "passport": "^0.3.2",
     "passport-http": "^0.3.0",
     "passport-http-bearer": "^1.0.1",
     "passport-local": "^1.0.0",
-    "passport-oauth2-client-password": "^0.1.2"
+    "passport-oauth2-client-password": "^0.1.2",
+    "validator": "^6.2.1"
   }
 }
-Original file line number
+Diff line change
@@ Expand Up / @@ -41,5 +41,8 @@ UserSchema.methods.verifyPassword = function(password, cb) { @@
       });
     };
     // Export the Mongoose model
     module.exports = mongoose.model('User', UserSchema);