From 31509247de097149337f83288427e888bb4c92c0 Mon Sep 17 00:00:00 2001
From: Alex Holliday <ajhollid@gmail.com>
Date: Mon, 30 Sep 2024 15:20:10 +0800
Subject: [PATCH] removed console logs, removed permission check for getting
 settings

---
 Client/src/Pages/AdvancedSettings/index.jsx | 1 -
 Client/src/Utils/NetworkService.js          | 4 +++-
 Server/routes/settingsRoute.js              | 2 +-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Client/src/Pages/AdvancedSettings/index.jsx b/Client/src/Pages/AdvancedSettings/index.jsx
index 7609b2578..aa13db0e7 100644
--- a/Client/src/Pages/AdvancedSettings/index.jsx
+++ b/Client/src/Pages/AdvancedSettings/index.jsx
@@ -47,7 +47,6 @@ const AdvancedSettings = ({ isAdmin }) => {
     const getSettings = async () => {
       const action = await dispatch(getAppSettings({ authToken }));
       if (action.payload.success) {
-        console.log(action.payload.data);
         setLocalSettings(action.payload.data);
       } else {
         createToast({ body: "Failed to get settings" });
diff --git a/Client/src/Utils/NetworkService.js b/Client/src/Utils/NetworkService.js
index 00b52f7f7..7e2a56209 100644
--- a/Client/src/Utils/NetworkService.js
+++ b/Client/src/Utils/NetworkService.js
@@ -10,7 +10,9 @@ class NetworkService {
     this.setBaseUrl(baseURL);
     this.unsubscribe = store.subscribe(() => {
       const state = store.getState();
-      baseURL = state.settings.apiBaseUrl || BASE_URL;
+      if (state.settings.apiBaseUrl) {
+        baseURL = state.settings.apiBaseUrl;
+      }
       this.setBaseUrl(baseURL);
     });
     this.axiosInstance.interceptors.response.use(
diff --git a/Server/routes/settingsRoute.js b/Server/routes/settingsRoute.js
index 834f68f26..3cbfff2b8 100644
--- a/Server/routes/settingsRoute.js
+++ b/Server/routes/settingsRoute.js
@@ -3,7 +3,7 @@ const settingsController = require("../controllers/settingsController");
 const { isAllowed } = require("../middleware/isAllowed");
 const Monitor = require("../models/Monitor");
 
-router.get("/", isAllowed(["superadmin"]), settingsController.getAppSettings);
+router.get("/", settingsController.getAppSettings);
 router.put(
   "/",
   isAllowed(["superadmin"]),