update/create middleware

app.js

@@ -1,34 +1,36 @@
+const status = require("./src/util/statuses");
+const MongoStore = require("connect-mongo");
+const session = require("express-session");
 const express = require('express');
 const path = require('path');
-const session = require("express-session");
-const MongoStore = require("connect-mongo");
 require('dotenv').config();
 
 const app = express();
 const port = process.env.PORT || 3000;
 
+const mongoURI = process.env.mongoURI || "mongodb://localhost:27017/";
+const database = process.env.database || "knoldus"; // Database name
+const secret   = process.env.secret   || "123-secret-xyz";
+
+/*** Sessions ***/
+app.use(session({
+    secret: secret,
+    store: MongoStore.create({ mongoUrl: `${mongoURI}${database}`, crypto: { secret: secret } }),
+    resave: true,
+    saveUninitialized: false,
+    cookie: { maxAge: 60000 },
+}));
+
 app.set('view engine', 'ejs');
 app.set('views',path.join(__dirname, 'src/views'));
 app.use(express.urlencoded({ extended: true }));
 app.use("/static", express.static("./src/public"));
 
-/*** Sessions ***/
-app.use(session({
-    secret: config.express_secret,
-    store: MongoStore.create({ mongoUrl: `${mongoURI}/${config.mongo_database}`, crypto: { secret: config.mongo_secret } }),
-    resave: true,
-    saveUninitialized: false,
-    cookie: { maxAge: 60000 },
-}));
-
 /*** Database ***/
 const { connectMongo, getCollection } = require("./src/database/connection");
 
 let users;
 async function initDatabase() {
-    const mongoURI = process.env.mongoURI || "mongodb://localhost:27017/";
-    const database = process.env.database || "knoldus"; // Database name
-    
     const db = await connectMongo(mongoURI, database);
     
     // For any collection, init here
@@ -36,7 +38,14 @@ async function initDatabase() {
 }
 
 initDatabase().then(() => {
-    require("./src/auth/authentication")(app, users);
+    // Import authentication handler
+    app.use(require("./src/auth/authentication")(users));
+
+    // Import middleware
+    const middleware = require("./src/auth/middleware")(users);
+
+    // Apply middleware to protected user routes
+    app.use(require("./src/router/user")(middleware));
 });
 
 /*** ROUTINGS ***/
@@ -44,65 +53,36 @@ initDatabase().then(() => {
 app.get('/', (req, res) => {
     if (!req.session.errMessage) req.session.errMessage = "";
     res.render('index');
-    return res.status(200);
+    return res.status(status.Ok);
 });
 
 app.get('/landing', (req, res) => {
     res.render('landing');
-    return res.status(200);
+    return res.status(status.Ok);
 });
 
 app.get('/signup', (req, res) => {
     res.render('signup', { errMessage: req.session.errMessage });
-    return res.status(200);
+    return res.status(status.Ok);
 });
 
 app.get('/login', (req, res) => {
     if (req.session.authenticated) {
-        
+        res.redirect("/home");
+        return res.status(status.Ok);        
     }
     res.render('login', { errMessage: req.session.errMessage });
-    return res.status(200);
-});
-
-app.get('/home', (req, res) => {
-    res.render('home');
-    return res.status(200);
-});
-
-app.get('/assets', (req, res) => {
-    res.render('assets');
-    return res.status(200);
-});
-
-app.get('/plans', (req, res) => {
-    res.render('plans');
-    return res.status(200);
-});
-
-app.get('/more', (req, res) => {
-    res.render('more');
-    return res.status(200);
-});
-
-app.get('/profile', (req, res) => {
-    res.render('profiles');
-    return res.status(200);
-});
-
-app.get('/settings', (req, res) => {
-    res.render('settings');
-    return res.status(200);
+    return res.status(status.Ok);
 });
 
 app.get('/aboutUs', (req, res) => {
     res.render('aboutUs');
-    return res.status(200);
+    return res.status(status.Ok);
 });
 
 app.get('/*splat', (req, res) => {
     res.send('404 Not Found');
-    return res.status(404);
+    return res.status(status.NotFound);
 });
 
 app.listen(port, () => {