Merge remote-tracking branch 'upstream/develop' into feat/incidents

Server/routes/authRoute.js

@@ -1,5 +1,6 @@
 const router = require("express").Router();
 const { verifyJWT } = require("../middleware/verifyJWT");
+const { verifyAdmin } = require("../middleware/verifyAdmin");
 const { verifyOwnership } = require("../middleware/verifyOwnership");
 const multer = require("multer");
 const upload = multer();
@@ -13,6 +14,7 @@ const {
   validateRecoveryTokenController,
   resetPasswordController,
   checkAdminController,
+  getAllUsersController,
   deleteUserController,
   inviteController,
 } = require("../controllers/authController");
@@ -27,6 +29,7 @@ router.post(
   userEditController
 );
 router.get("/users/admin", checkAdminController);
+router.get("/users", verifyJWT, verifyAdmin, getAllUsersController);
 router.delete(
   "/user/:userId",
   verifyJWT,