fix/middleware authentication + bad merge

2025-05-05 18:34:19 -07:00
1 parent a446943d4a
commit 7c7098636a
@@ -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) => {
@@ -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");
@@ -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');
    });
@@ -9,9 +9,8 @@
 </head>

 <body>
-    <%- include("./partials/header") %>
-    <% if (session.authenticated) { console.log(session.email); } else { console.log("No user"); } %>
    <main>
+        <%= user.email %>
        The Dashboard Page
    </main>
    <footer>
@@ -20,7 +19,6 @@
                <p>&copy; 2025 RCalculator. All rights reserved.</p>
             </div>
        </div>
-        <%- include("./partials/navBar") %>
    </footer>
 </body>