diff --git a/Client/src/App.jsx b/Client/src/App.jsx index 7bfc630fd..df3e79c80 100644 --- a/Client/src/App.jsx +++ b/Client/src/App.jsx @@ -53,7 +53,7 @@ function App() { const dispatch = useDispatch(); useEffect(() => { - dispatch(getAppSettings(authToken)); + dispatch(getAppSettings({ authToken })); }, [dispatch, authToken]); // Cleanup diff --git a/Client/src/Features/Settings/settingsSlice.js b/Client/src/Features/Settings/settingsSlice.js index 8bec2f87c..ab6a5c746 100644 --- a/Client/src/Features/Settings/settingsSlice.js +++ b/Client/src/Features/Settings/settingsSlice.js @@ -5,26 +5,14 @@ const initialState = { isLoading: false, apiBaseUrl: "http://localhost:5000/api/v1", logLevel: "debug", - clientHost: "http://localhost:5173", - jwtSecret: "my_secret", - dbType: "MongoDB", - dbConnectionString: "mongodb://localhost:27017/uptime_db", - redisHost: "127.0.0.1", - redisPort: 6379, - jwtTTL: "99d", - pagespeedApiKey: "", - systemEmailHost: "smtp.gmail.com", - systemEmailPort: 465, - systemEmailAddress: "", - systemEmailPassword: "", }; export const getAppSettings = createAsyncThunk( "settings/getSettings", - async (authToken, thunkApi) => { + async (data, thunkApi) => { try { const res = await networkService.getAppSettings({ - authToken: authToken, + authToken: data.authToken, }); return res.data; } catch (error) { @@ -83,7 +71,8 @@ const handleGetSettingsFulfilled = (state, action) => { state.isLoading = false; state.success = action.payload.success; state.msg = action.payload.msg; - Object.assign(state, action.payload.data); + state.apiBaseUrl = action.payload.data.apiBaseUrl; + state.logLevel = action.payload.data.logLevel; }; const handleGetSettingsRejected = (state, action) => { state.isLoading = false; @@ -94,7 +83,8 @@ const handleUpdateSettingsFulfilled = (state, action) => { state.isLoading = false; state.success = action.payload.success; state.msg = action.payload.msg; - Object.assign(state, action.payload.data); + state.apiBaseUrl = action.payload.data.apiBaseUrl; + state.logLevel = action.payload.data.logLevel; }; const handleUpdateSettingsRejected = (state, action) => { state.isLoading = false; diff --git a/Client/src/Pages/AdvancedSettings/index.jsx b/Client/src/Pages/AdvancedSettings/index.jsx index 29a9fe53c..38c0a3b12 100644 --- a/Client/src/Pages/AdvancedSettings/index.jsx +++ b/Client/src/Pages/AdvancedSettings/index.jsx @@ -9,7 +9,10 @@ import PropTypes from "prop-types"; import LoadingButton from "@mui/lab/LoadingButton"; import { ConfigBox } from "../Settings/styled"; import { useNavigate } from "react-router"; -import { updateAppSettings } from "../../Features/Settings/settingsSlice"; +import { + getAppSettings, + updateAppSettings, +} from "../../Features/Settings/settingsSlice"; import { useState, useEffect } from "react"; import Select from "../../Components/Inputs/Select"; @@ -26,7 +29,33 @@ const AdvancedSettings = ({ isAdmin }) => { const { authToken } = useSelector((state) => state.auth); const dispatch = useDispatch(); const settings = useSelector((state) => state.settings); - const [localSettings, setLocalSettings] = useState(settings); + const [localSettings, setLocalSettings] = useState({ + apiBaseUrl: "", + logLevel: "debug", + systemEmailHost: "", + systemEmailPort: "", + systemEmailAddress: "", + systemEmailPassword: "", + jwtTTL: "", + dbType: "", + redisHost: "", + redisPort: "", + pagespeedApiKey: "", + }); + + useEffect(() => { + 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" }); + } + }; + getSettings(); + }, [authToken, dispatch]); + const logItems = [ { _id: 1, name: "none" }, { _id: 2, name: "debug" }, @@ -58,6 +87,8 @@ const AdvancedSettings = ({ isAdmin }) => { ); let body = ""; if (action.payload.success) { + console.log(action.payload.data); + setLocalSettings(action.payload.data); body = "Settings saved successfully"; } else { body = "Failed to save settings"; @@ -153,14 +184,6 @@ const AdvancedSettings = ({ isAdmin }) => { - { try { - const settings = await req.settingsService.getSettings(); + const settings = { ...(await req.settingsService.getSettings()) }; + delete settings.jwtSecret; return res.status(200).json({ success: true, msg: successMessages.GET_APP_SETTINGS, @@ -31,7 +32,8 @@ const updateAppSettings = async (req, res, next) => { try { await req.db.updateAppSettings(req.body); - const updatedSettings = await req.settingsService.reloadSettings(); + const updatedSettings = { ...(await req.settingsService.reloadSettings()) }; + delete updatedSettings.jwtSecret; return res.status(200).json({ success: true, msg: successMessages.UPDATE_APP_SETTINGS, diff --git a/Server/middleware/verifyJWT.js b/Server/middleware/verifyJWT.js index ffbcd55a5..0007bad39 100644 --- a/Server/middleware/verifyJWT.js +++ b/Server/middleware/verifyJWT.js @@ -36,7 +36,6 @@ const verifyJWT = (req, res, next) => { const parsedToken = token.slice(TOKEN_PREFIX.length, token.length); // Verify the token's authenticity const { jwtSecret } = req.settingsService.getSettings(); - jwt.verify(parsedToken, jwtSecret, (err, decoded) => { if (err) { return res diff --git a/Server/service/settingsService.js b/Server/service/settingsService.js index 13b19eb6c..752f86607 100644 --- a/Server/service/settingsService.js +++ b/Server/service/settingsService.js @@ -2,6 +2,8 @@ const { env } = require("process"); const AppSettings = require("../models/AppSettings"); const SERVICE_NAME = "SettingsService"; const envConfig = { + logLevel: undefined, + apiBaseUrl: undefined, clientHost: process.env.CLIENT_HOST, jwtSecret: process.env.JWT_SECRET, dbType: process.env.DB_TYPE, @@ -18,7 +20,7 @@ const envConfig = { class SettingsService { constructor() { - this.settings = envConfig; + this.settings = { ...envConfig }; } async loadSettings() { @@ -27,7 +29,6 @@ class SettingsService { if (!this.settings) { throw new Error("Settings not found"); } - // Try to load settings from env first, if not found, load from db for (const key in envConfig) { if (envConfig[key] === undefined && dbSettings[key] !== undefined) { @@ -38,7 +39,6 @@ class SettingsService { if (!this.settings) { throw new Error("Settings not found"); } - return this.settings; } catch (error) { error.service === undefined ? (error.service = SERVICE_NAME) : null; diff --git a/Server/validation/joi.js b/Server/validation/joi.js index 7b26ea8e1..91ba53b94 100644 --- a/Server/validation/joi.js +++ b/Server/validation/joi.js @@ -389,7 +389,6 @@ const updateAppSettingsBodyValidation = joi.object({ apiBaseUrl: joi.string().allow(""), logLevel: joi.string().valid("debug", "none", "error", "warn").allow(""), clientHost: joi.string().allow(""), - jwtSecret: joi.string().allow(""), dbType: joi.string().allow(""), dbConnectionString: joi.string().allow(""), redisHost: joi.string().allow(""),