mirror/Checkmate
1
0
Fork 0
mirror of https://github.com/bluewave-labs/Checkmate.git synced 2026-05-18 23:48:43 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix client/server validation

Browse Source
This commit is contained in:
Alex Holliday
2026-02-18 19:13:52 +00:00
parent 8cbde4a705
commit b6765830a5
2 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
client/src/Pages/Settings/index.jsx
+15 -2
View File
@@ -103,12 +103,25 @@ const Settings = () => {
})
);
if (!form.formState.dirtyFields.systemEmailPassword) {
// Handle password field:
// - If emailPasswordHasBeenReset is true, ALWAYS include (even if empty to unset)
// - Otherwise, only include if dirty (user typed something)
if (emailPasswordHasBeenReset) {
// Keep password field (even if empty) to allow unsetting
// toSubmit.systemEmailPassword is already in toSubmit
} else if (!form.formState.dirtyFields.systemEmailPassword) {
// Not in reset mode and not dirty -> exclude (no changes)
delete toSubmit.systemEmailPassword;
}
if (!form.formState.dirtyFields.pagespeedApiKey) {
// Handle API key field (same logic)
if (apiKeyHasBeenReset) {
// Keep API key field (even if empty) to allow unsetting
} else if (!form.formState.dirtyFields.pagespeedApiKey) {
// Not in reset mode and not dirty -> exclude (no changes)
delete toSubmit.pagespeedApiKey;
}
saveSettings(toSubmit);
};
server/src/validation/joi.ts
+6 -6
View File
@@ -420,8 +420,8 @@ const updateAppSettingsBodyValidation = joi.object({
systemEmailAddress: joi.string().allow(""),
systemEmailPassword: joi.string().allow(""),
systemEmailUser: joi.string().allow(""),
systemEmailConnectionHost: joi.string().allow("").optional(),
systemEmailTLSServername: joi.string().allow("").optional(),
systemEmailConnectionHost: joi.string().allow(""),
systemEmailTLSServername: joi.string().allow(""),
systemEmailSecure: joi.boolean(),
systemEmailPool: joi.boolean(),
systemEmailIgnoreTLS: joi.boolean(),
@@ -430,10 +430,10 @@ const updateAppSettingsBodyValidation = joi.object({
globalThresholds: joi
.object({
cpu: joi.number().min(1).max(100).allow("").optional(),
memory: joi.number().min(1).max(100).allow("").optional(),
disk: joi.number().min(1).max(100).allow("").optional(),
temperature: joi.number().min(1).max(150).allow("").optional(),
cpu: joi.number().min(1).max(100).allow(""),
memory: joi.number().min(1).max(100).allow(""),
disk: joi.number().min(1).max(100).allow(""),
temperature: joi.number().min(1).max(150).allow(""),
})
.optional(),
});