Merge branch 'dev' into feature/questionnaire

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;