Feature/no ref/add login via username not just email

config/.env

@@ -1,2 +1,2 @@
 PORT = 2121
-DB_STRING = mongodb+srv://demo:demo@cluster0.hcds1.mongodb.net/todos?retryWrites=true&w=majority
+DB_STRING = mongodb+srv://chrisnelson7791:wegoget@cluster0.0v9lcln.mongodb.net/?retryWrites=true&w=majority&appName=Cluster0

config/passport.js

@@ -2,12 +2,32 @@ const LocalStrategy = require('passport-local').Strategy
 const mongoose = require('mongoose')
 const User = require('../models/User')
 
+// module.exports = function (passport) {
+//   passport.use(new LocalStrategy({ usernameField: 'email' }, (email, password, done) => {
+//     User.findOne({ email: email.toLowerCase() }, (err, user) => {
+//       if (err) { return done(err) }
+//       if (!user) {
+//         return done(null, false, { msg: `Email ${email} not found.` })
+//       }
+//       if (!user.password) {
+//         return done(null, false, { msg: 'Your account was registered using a sign-in provider. To enable password login, sign in using a provider, and then set a password under your user profile.' })
+//       }
+//       user.comparePassword(password, (err, isMatch) => {
+//         if (err) { return done(err) }
+//         if (isMatch) {
+//           return done(null, user)
+//         }
+//         return done(null, false, { msg: 'Invalid email or password.' })
+//       })
+//     })
+//   }))
+
 module.exports = function (passport) {
-  passport.use(new LocalStrategy({ usernameField: 'email' }, (email, password, done) => {
-    User.findOne({ email: email.toLowerCase() }, (err, user) => {
+  passport.use(new LocalStrategy({ usernameField: 'username' }, (username, password, done) => {
+    User.findOne({ userName: username }, (err, user) => {
       if (err) { return done(err) }
       if (!user) {
-        return done(null, false, { msg: `Email ${email} not found.` })
+        return done(null, false, { msg: `username ${username} not found.` })
       }
       if (!user.password) {
         return done(null, false, { msg: 'Your account was registered using a sign-in provider. To enable password login, sign in using a provider, and then set a password under your user profile.' })
@@ -17,7 +37,7 @@ module.exports = function (passport) {
         if (isMatch) {
           return done(null, user)
         }
-        return done(null, false, { msg: 'Invalid email or password.' })
+        return done(null, false, { msg: 'Invalid username or password.' })
       })
     })
   }))

controllers/auth.js

@@ -4,6 +4,7 @@ const User = require('../models/User')
 
  exports.getLogin = (req, res) => {
     if (req.user) {
+      console.log('** this user is already logged in - req.user: ', req.user)
       return res.redirect('/todos')
     }
     res.render('login', {
@@ -13,14 +14,14 @@ const User = require('../models/User')
 
   exports.postLogin = (req, res, next) => {
     const validationErrors = []
-    if (!validator.isEmail(req.body.email)) validationErrors.push({ msg: 'Please enter a valid email address.' })
+    // if (!validator.isEmail(req.body.email)) validationErrors.push({ msg: 'Please enter a valid email address.' })
     if (validator.isEmpty(req.body.password)) validationErrors.push({ msg: 'Password cannot be blank.' })
 
     if (validationErrors.length) {
       req.flash('errors', validationErrors)
       return res.redirect('/login')
     }
-    req.body.email = validator.normalizeEmail(req.body.email, { gmail_remove_dots: false })
+    // req.body.email = validator.normalizeEmail(req.body.email, { gmail_remove_dots: false })
 
     passport.authenticate('local', (err, user, info) => {
       if (err) { return next(err) }