remove jwtSecret from settings

This commit is contained in:
Alex Holliday committed 2024-09-30 11:14:53 +08:00
1 parent 6418efde2a
commit 6268b2573c
7 files changed
+47 -34

No files matched your search

+1 -1
View File
@@ -53,7 +53,7 @@ function App() {
const dispatch = useDispatch();
useEffect(() => {
dispatch(getAppSettings(authToken));
dispatch(getAppSettings({ authToken }));
}, [dispatch, authToken]);
// Cleanup
+6 -16
View File
@@ -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;
+33 -10
View File
@@ -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 }) => {
</Typography>
</Box>
<Stack gap={theme.spacing(20)}>
<Field
type="text"
id="jwtSecret"
label="JWT Secret"
name="jwtSecret"
value={localSettings.jwtSecret}
onChange={handleChange}
/>
<Field
type="text"
id="jwtTTL"