Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Open
wants to merge 5 commits into
base: main
Choose a base branch
from
Open

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a6d0513
update environment variables
ccchrissss Dec 19, 2024
17eca6b
Update title for each page in views folder
ccchrissss Dec 19, 2024
91a858a
add username input to login page
ccchrissss Dec 20, 2024
f7dea8c
add nodemon. reconfigure passport to use only username to authenticate.
ccchrissss Dec 20, 2024
8641c96
log current port in console when app runs
ccchrissss Dec 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion config/.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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
28 changes: 24 additions & 4 deletions config/passport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.' })
Expand All @@ -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.' })
})
})
}))
Expand Down
5 changes: 3 additions & 2 deletions controllers/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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', {
Expand All @@ -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) }
Expand Down
Loading