From ef02bd8078c433f7e62c699b32b44ec06c01b0b4 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 26 Aug 2024 09:46:23 -0700 Subject: [PATCH] Check for superadmin as opposed to admin --- Server/controllers/authController.js | 8 ++++---- Server/db/mongo/MongoDB.js | 6 +++--- Server/models/user.js | 2 +- Server/routes/authRoute.js | 4 ++-- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Server/controllers/authController.js b/Server/controllers/authController.js index 6fbcdb669..7c053ae56 100644 --- a/Server/controllers/authController.js +++ b/Server/controllers/authController.js @@ -293,13 +293,13 @@ const inviteVerifyController = async (req, res, next) => { * @returns {Promise} */ -const checkAdminController = async (req, res) => { +const checkSuperadminController = async (req, res) => { try { - const adminExists = await req.db.checkAdmin(req, res); + const superAdminExists = await req.db.checkSuperadmin(req, res); return res.status(200).json({ success: true, msg: successMessages.AUTH_ADMIN_EXISTS, - data: adminExists, + data: superAdminExists, }); } catch (error) { error.service = SERVICE_NAME; @@ -508,7 +508,7 @@ module.exports = { userEditController, inviteController, inviteVerifyController, - checkAdminController, + checkSuperadminController, recoveryRequestController, validateRecoveryTokenController, resetPasswordController, diff --git a/Server/db/mongo/MongoDB.js b/Server/db/mongo/MongoDB.js index 9c1005c32..8c1d97351 100644 --- a/Server/db/mongo/MongoDB.js +++ b/Server/db/mongo/MongoDB.js @@ -15,9 +15,9 @@ const connect = async () => { } }; -const checkAdmin = async (req, res) => { +const checkSuperadmin = async (req, res) => { try { - const admin = await UserModel.findOne({ role: "admin" }); + const admin = await UserModel.findOne({ role: "superadmin" }); if (admin !== null) { return true; } @@ -141,7 +141,7 @@ module.exports = { requestRecoveryToken, validateRecoveryToken, resetPassword, - checkAdmin, + checkSuperadmin, getAllMonitors, getMonitorStatsById, getMonitorById, diff --git a/Server/models/user.js b/Server/models/user.js index 977cabc15..73567798c 100644 --- a/Server/models/user.js +++ b/Server/models/user.js @@ -38,7 +38,7 @@ const UserSchema = mongoose.Schema( role: { type: [String], default: "user", - enum: ["user", "admin"], + enum: ["user", "admin", "superadmin"], }, }, { diff --git a/Server/routes/authRoute.js b/Server/routes/authRoute.js index 201807121..589c0f1ac 100644 --- a/Server/routes/authRoute.js +++ b/Server/routes/authRoute.js @@ -14,7 +14,7 @@ const { recoveryRequestController, validateRecoveryTokenController, resetPasswordController, - checkAdminController, + checkSuperadminController, getAllUsersController, deleteUserController, inviteController, @@ -30,7 +30,7 @@ router.put( verifyJWT, userEditController ); -router.get("/users/admin", checkAdminController); +router.get("/users/superadmin", checkSuperadminController); router.get("/users", verifyJWT, verifyAdmin, getAllUsersController); router.delete( "/user/:userId",