fixed login errors

ktmDeveloper · ktmDeveloper · commit 6e36cf9cfbae · 2018-06-19T11:08:24.000-07:00
diff --git a/config/strategies/local.strategy.js b/config/strategies/local.strategy.js
@@ -10,7 +10,7 @@ module.exports = function(){
         passReqToCallback : true // allows us to pass back the entire request to the callback
     }, 
     function(req, email, password, done){
-       authCtrl.fetch(email, password, done)
+       authCtrl.fetch(req, email, password, done)
     }));
 
 }
diff --git a/controller/auth.server.controller.js b/controller/auth.server.controller.js
@@ -2,7 +2,7 @@ var authModel = require('../models/auth.server.model.js');
 
 
 exports.create = function(req, res){
-    console.log(authModel);
+    //console.log(authModel);
     // var newAuth = new authModel({
     //     email: req.body.email,
     //     firstName: req.body.firstName,
@@ -29,19 +29,19 @@ exports.create = function(req, res){
         });
     }) 
 };
-exports.fetch = function(email, password, done){
+exports.fetch = function(req, email, password, done){
     authModel.findOne({email:email}, function(err, user){
         // if there are any errors, return the error before anything else
         if (err)
             return done(err);
 
         // if no user is found, return the message
         if (!user)
-            return done(null, false, req.flash('loginMessage', 'No user found.')); // req.flash is the way to set flashdata using connect-flash
+            return done(null, false); // req.flash is the way to set flashdata using connect-flash
 
         // if the user is found but the password is wrong
         if (!user.validPassword(password))
-            return done(null, false, req.flash('loginMessage', 'Oops! Wrong password.')); // create the loginMessage and save it to session as flashdata
+            return done(null, false); // create the loginMessage and save it to session as flashdata
 
         // all is well, return successful user
         return done(null, user);
diff --git a/routes/authRoutes.js b/routes/authRoutes.js
@@ -26,12 +26,13 @@ authRoutes
             user: req.user
         });
     } else {
+        
         return authCtrl.create(req, res); 
     }
 })
 .post('/login/', passport.authenticate('local', {
                 failureRedirect: '/login',
-                failureFlash: true }),
+                failureFlash: 'Invalid password or username' }),
                 function(req, res){
                     res.redirect('/');
                 })

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ module.exports = function(){`
`10`	`10`	`passReqToCallback : true // allows us to pass back the entire request to the callback`
`11`	`11`	`},`
`12`	`12`	`function(req, email, password, done){`
`13`		`- authCtrl.fetch(email, password, done)`
	`13`	`+ authCtrl.fetch(req, email, password, done)`
`14`	`14`	`}));`
`15`	`15`
`16`	`16`	`}`