adds isLoggedIn middleware globally to userRouter and privilegeRouter instead of at each individual route handler

Author: fuston05

api/server.js

@@ -4,7 +4,7 @@ const cors = require("cors");
 const server = express();
 const helmet = require("helmet");
 const morgan = require("morgan");
-const { assignId, accessLogStream } = require("../middleware");
+const { assignId, accessLogStream, isLoggedIn } = require("../middleware");
 
 // global middleware
 server.use(helmet());
@@ -25,7 +25,7 @@ server.use(
 const { userRouter, authRouter ,privilegeRouter } = require("../routers");
 
 // use routers
-server.use("/users", userRouter);
+server.use("/users", isLoggedIn, userRouter);
 server.use("/auth", authRouter);
 server.use("/privileges", privilegeRouter);
 

routers/privilegeRouter.js

@@ -7,7 +7,7 @@ const { isLoggedIn } = require("../middleware");
 const { privileges } = require("../models");
 
 // GET all provileges info
-router.get("/", isLoggedIn, (req, res, next) => {
+router.get("/", (req, res, next) => {
   privileges
     .find()
     .then((privRes) => {
@@ -22,7 +22,7 @@ router.get("/", isLoggedIn, (req, res, next) => {
 });
 
 // GET privilege by ID
-router.get("/:id", isLoggedIn, (req, res, next) => {
+router.get("/:id", (req, res, next) => {
   privileges
     .findById(req.params.id)
     .then((privRes) => {
@@ -63,6 +63,7 @@ router.put("/", async (req, res, next) => {
   privileges
     .updatePrivilege(req.body)
     .then((updateRes) => {
+      console.log('updateRes: ', updateRes)
       res.status(200).json(updateRes[0]);
     })
     .catch(next);
@@ -82,7 +83,7 @@ router.delete("/:id", async (req, res, next) => {
     .deletePrivilege(req.params.id)
     .then((delRes) => {
       if (delRes) {
-        checkPrivExists.message= "Successfully Deleted"
+        checkPrivExists.message = "Successfully Deleted";
         return res.status(200).json(checkPrivExists);
       }
     })

routers/userRouter.js

@@ -2,13 +2,11 @@
 const express = require("express");
 const router = express.Router();
 
-const { isLoggedIn } = require("../middleware");
-
 const { users } = require("../models");
 
 // get all users
 //  -if logged in
-router.get("/", isLoggedIn, (req, res, next) => {
+router.get("/", (req, res, next) => {
   users
     .find()
     .then((users) => {
@@ -21,7 +19,7 @@ router.get("/", isLoggedIn, (req, res, next) => {
 });
 
 // get user by id
-router.get("/:id", isLoggedIn, (req, res, next) => {
+router.get("/:id", (req, res, next) => {
   const { id } = req.params;
   users
     .findById(id)
@@ -35,7 +33,7 @@ router.get("/:id", isLoggedIn, (req, res, next) => {
 });
 
 // update a user
-router.put("/", isLoggedIn, (req, res, next) => {
+router.put("/", (req, res, next) => {
   users
     .updateUser(req.body)
     .then((user) => {
@@ -49,7 +47,7 @@ router.put("/", isLoggedIn, (req, res, next) => {
 });
 
 // delete a user
-router.delete("/:id", isLoggedIn, (req, res, next) => {
+router.delete("/:id", (req, res, next) => {
   const { id } = req.params;
   // returns number of affected rows
   users