Merge branch 'dev' into feature/questionnaire

app.js

@@ -38,17 +38,6 @@ async function initDatabase() {
     users = await getCollection(db, "users");
 }
 
-initDatabase().then(() => {
-    // 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 ***/
 
 app.get('/', (req, res) => {
@@ -81,31 +70,6 @@ app.get('/aboutUs', (req, res) => {
     return res.status(status.Ok);
 });
 
-app.get('/assets', (req, res) => {
-    res.render('assets');
-    return res.status(status.Ok);
-});
-
-app.get('/plans', (req, res) => {
-    res.render('plans');
-    return res.status(status.Ok);
-});
-
-app.get('/more', (req, res) => {
-    res.render('more');
-    return res.status(status.Ok);
-});
-
-app.get('/profile', (req, res) => {
-    res.render('profile');
-    return res.status(status.Ok);
-});
-
-app.get('/settings', (req, res) => {
-    res.render('settings');
-    return res.status(status.Ok);
-});
-
 app.get('/logout', (req, res) => {
     req.session.destroy();
     return res.redirect('/login');
@@ -116,6 +80,25 @@ app.get('/*splat', (req, res) => {
     return res.status(status.NotFound);
 });
 
-app.listen(port, () => {
+// Initialize database and start app
-    console.log(`Server listening on port ${port}`);
+initDatabase().then(() => {
+    console.log("Successfully connected to MongoDB");
+
+    // Import authentication handler
+    app.use(require("./src/auth/authentication")(users));
+
+    // Import middleware & apply to user routes
+    const middleware = require("./src/auth/middleware")(users);
+    app.use(require("./src/router/user")(middleware));
+
+    // 404 handler
+    app.get('/*splat', (req, res) => {
+        res.send('404 Not Found');
+        return res.status(status.NotFound);
+    });    
+
+    // Start app
+    app.listen(port, () => {
+        console.log(`Server listening on port ${port}`);
+    });    
 });

src/auth/authentication.js

@@ -5,6 +5,12 @@ const salt = 12;
 
 module.exports = (users) => {
     const router = require("express").Router();
+
+    router.get("/logout", (req, res) => {
+        req.session.destroy();
+        // res.status(status.Unauthorized);
+        return res.redirect('/login');
+    });
     
     router.post("/login", async (req, res) => {
         const credentialSchema = joi.object({
@@ -86,11 +92,5 @@ module.exports = (users) => {
         });
     });
 
-    router.get("/logout", (req, res) => {
-        req.session.destroy();
-        // res.status(status.Unauthorized);
-        return res.redirect('/login');
-    });
-
     return router;
 }

src/auth/middleware.js

@@ -1,6 +1,11 @@
 const status = require("../util/statuses");
 
-module.exports = (users) => {
+/**
+ * createMiddleware returns a middleware function for express.
+ * @param {MongoClient.collection} users
+ * @return {async function} 
+ */
+const createMiddleware = (users) => {
     return async (req, res, next) => {
         if (!req.session.authenticated || !req.session.email) {
             req.session.errMessage = "Please login to view that resource";
@@ -9,7 +14,7 @@ module.exports = (users) => {
         }
     
         let user = await users.findOne({ "email": req.session.email }).then((user) => user);
-    
+
         if (!user) {
             req.session.errMessage = "User not found";
             res.redirect("/login");
@@ -18,5 +23,7 @@ module.exports = (users) => {
     
         req.user = user;
         next();
-    }
+    };
-};
+}
+
+module.exports = createMiddleware;

src/database/connection.js

@@ -3,7 +3,8 @@ const MongoClient = require("mongodb").MongoClient;
 /**
  * connectMongo returns a database connection to MongoDB
  * @param {string} mongoURI 
- * @param {string} databaseName 
+ * @param {string} databaseName
+ * @return {MongoClient}
  */
 const connectMongo = async (mongoURI, databaseName) => {
     const database = await MongoClient.connect(mongoURI, { connectTimeoutMS: 1000 });

src/router/user.js

@@ -1,3 +1,5 @@
+const status = require("../util/statuses");
+
 module.exports = (middleware) => {
     const router = require("express").Router();