From c1e03a45b023cc501a2ce18ed1a1159918abe049 Mon Sep 17 00:00:00 2001 From: Alex Holliday Date: Mon, 2 Mar 2026 18:03:10 +0000 Subject: [PATCH] settings --- server/src/controllers/settingsController.ts | 2 +- server/src/validation/settingsValidation.ts | 64 +++++++++++--------- 2 files changed, 37 insertions(+), 29 deletions(-) diff --git a/server/src/controllers/settingsController.ts b/server/src/controllers/settingsController.ts index 69443fd6a..0dc0e5b07 100644 --- a/server/src/controllers/settingsController.ts +++ b/server/src/controllers/settingsController.ts @@ -56,7 +56,7 @@ class SettingsController { }; updateAppSettings = async (req: Request, res: Response, next: NextFunction) => { - await updateAppSettingsBodyValidation.validateAsync(req.body); + updateAppSettingsBodyValidation.parse(req.body); const updatedSettings = await this.settingsService.updateDbSettings(req.body); const returnSettings = this.buildAppSettings(updatedSettings); diff --git a/server/src/validation/settingsValidation.ts b/server/src/validation/settingsValidation.ts index 6321f13f0..045ee33e8 100644 --- a/server/src/validation/settingsValidation.ts +++ b/server/src/validation/settingsValidation.ts @@ -1,34 +1,42 @@ -import joi from "joi"; +import { z } from "zod"; //**************************************** // Settings Validations //**************************************** -export const updateAppSettingsBodyValidation = joi.object({ - checkTTL: joi.number().allow(""), - pagespeedApiKey: joi.string().allow(""), - language: joi.string().allow(""), - timezone: joi.string().allow(""), - showURL: joi.bool().optional(), - systemEmailHost: joi.string().allow(""), - systemEmailPort: joi.number().allow(""), - systemEmailAddress: joi.string().allow(""), - systemEmailPassword: joi.string().allow(""), - systemEmailUser: joi.string().allow(""), - systemEmailConnectionHost: joi.string().allow(""), - systemEmailTLSServername: joi.string().allow(""), - systemEmailSecure: joi.boolean(), - systemEmailPool: joi.boolean(), - systemEmailIgnoreTLS: joi.boolean(), - systemEmailRequireTLS: joi.boolean(), - systemEmailRejectUnauthorized: joi.boolean(), +export const updateAppSettingsBodyValidation = z + .object({ + // Number or empty string fields + checkTTL: z.union([z.number(), z.literal("")]).optional(), + systemEmailPort: z.union([z.number(), z.literal("")]).optional(), - globalThresholds: joi - .object({ - 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(), -}); + // String or empty string fields + pagespeedApiKey: z.union([z.string(), z.literal("")]).optional(), + language: z.union([z.string(), z.literal("")]).optional(), + timezone: z.union([z.string(), z.literal("")]).optional(), + systemEmailHost: z.union([z.string(), z.literal("")]).optional(), + systemEmailAddress: z.union([z.string(), z.literal("")]).optional(), + systemEmailPassword: z.union([z.string(), z.literal("")]).optional(), + systemEmailUser: z.union([z.string(), z.literal("")]).optional(), + systemEmailConnectionHost: z.union([z.string(), z.literal("")]).optional(), + systemEmailTLSServername: z.union([z.string(), z.literal("")]).optional(), + + // Boolean fields (optional by default in Joi) + showURL: z.boolean().optional(), + systemEmailSecure: z.boolean().optional(), + systemEmailPool: z.boolean().optional(), + systemEmailIgnoreTLS: z.boolean().optional(), + systemEmailRequireTLS: z.boolean().optional(), + systemEmailRejectUnauthorized: z.boolean().optional(), + + // Nested object + globalThresholds: z + .object({ + cpu: z.union([z.number().min(1).max(100), z.literal("")]).optional(), + memory: z.union([z.number().min(1).max(100), z.literal("")]).optional(), + disk: z.union([z.number().min(1).max(100), z.literal("")]).optional(), + temperature: z.union([z.number().min(1).max(150), z.literal("")]).optional(), + }) + .optional(), + }) + .strip(); // Joi by default strips unknown keys, match that behavior with .strip()