From 7c7098636a76d8c9f2743eceae98defeba95b988 Mon Sep 17 00:00:00 2001 From: SowinskiBraeden Date: Mon, 5 May 2025 18:34:19 -0700 Subject: [PATCH] fix/middleware authentication + bad merge --- app.js | 12 +----------- src/auth/middleware.js | 2 +- src/router/user.js | 17 +++++++++-------- src/views/home.ejs | 4 +--- 4 files changed, 12 insertions(+), 23 deletions(-) diff --git a/app.js b/app.js index d173205..958ede4 100644 --- a/app.js +++ b/app.js @@ -60,11 +60,6 @@ app.get('/login', (req, res) => { return res.status(status.Ok); }); -app.get('/home', (req, res) => { - res.render('home', { session: req.session }); - return res.status(status.Ok); -}); - app.get('/aboutUs', (req, res) => { res.render('aboutUs'); return res.status(status.Ok); @@ -75,11 +70,6 @@ app.get('/logout', (req, res) => { return res.redirect('/login'); }); -app.get('/*splat', (req, res) => { - res.send('404 Not Found'); - return res.status(status.NotFound); -}); - // Initialize database and start app initDatabase().then(() => { console.log("Successfully connected to MongoDB"); @@ -89,7 +79,7 @@ initDatabase().then(() => { // Import middleware & apply to user routes const middleware = require("./src/auth/middleware")(users); - app.use(require("./src/router/user")(middleware)); + app.use(require('./src/router/user')(middleware)); // 404 handler app.get('/*splat', (req, res) => { diff --git a/src/auth/middleware.js b/src/auth/middleware.js index cfdb559..7ca7afe 100644 --- a/src/auth/middleware.js +++ b/src/auth/middleware.js @@ -14,7 +14,7 @@ const createMiddleware = (users) => { } let user = await users.findOne({ "email": req.session.email }).then((user) => user); - + if (!user) { req.session.errMessage = "User not found"; res.redirect("/login"); diff --git a/src/router/user.js b/src/router/user.js index a22b1bd..6c2ab4f 100644 --- a/src/router/user.js +++ b/src/router/user.js @@ -2,38 +2,39 @@ const status = require("../util/statuses"); module.exports = (middleware) => { const router = require("express").Router(); - - router.get('/home', middleware, async (req, res) => { + + router.get('/home', async (req, res) => { + console.log("Router has: ", req.user); res.render('home', { user: req.user }); return res.status(status.Ok); }); - router.get('/assets', middleware, (req, res) => { + router.get('/assets', (req, res) => { res.render('assets', { user: req.user }); return res.status(status.Ok); }); - router.get('/plans', middleware, (req, res) => { + router.get('/plans', (req, res) => { res.render('plans', { user: req.user }); return res.status(status.Ok); }); - router.get('/more', middleware, (req, res) => { + router.get('/more', (req, res) => { res.render('more', { user: req.user }); return res.status(status.Ok); }); - router.get('/profile', middleware, (req, res) => { + router.get('/profile', (req, res) => { res.render('profiles', { user: req.user }); return res.status(status.Ok); }); - router.get('/settings', middleware, (req, res) => { + router.get('/settings', (req, res) => { res.render('settings', { user: req.user }); return res.status(status.Ok); }); - router.get('/logout', middleware, (req, res) => { + router.get('/logout', (req, res) => { req.session.destroy(); return res.redirect('/login'); }); diff --git a/src/views/home.ejs b/src/views/home.ejs index b354997..3a1c813 100644 --- a/src/views/home.ejs +++ b/src/views/home.ejs @@ -9,9 +9,8 @@ - <%- include("./partials/header") %> - <% if (session.authenticated) { console.log(session.email); } else { console.log("No user"); } %>
+ <%= user.email %> The Dashboard Page