Merge pull request #3368 from bluewave-labs/develop

Develop -> master (3.5.0)

client/src/Hooks/useMonitorForm.ts

@@ -40,8 +40,6 @@ export const useMonitorForm = ({
 					matchMethod: data?.matchMethod || "",
 					expectedValue: data?.expectedValue || "",
 					jsonPath: data?.jsonPath || "",
-					basicAuthUser: data?.basicAuthUser || "",
-					basicAuthPassword: data?.basicAuthPassword || "",
 				};
 				break;
 			case "ping":
@@ -115,8 +113,6 @@ export const useMonitorForm = ({
 					matchMethod: "",
 					expectedValue: "",
 					jsonPath: "",
-					basicAuthUser: "",
-					basicAuthPassword: "",
 				};
 		}
 

client/src/Pages/CreateMonitor/index.tsx

@@ -770,50 +770,6 @@ const CreateMonitorPage = () => {
 				/>
 			)}
 
-			{watchedType === "http" && (
-				<ConfigBox
-					title={t("pages.createMonitor.form.basicAuth.title")}
-					subtitle={t("pages.createMonitor.form.basicAuth.description")}
-					rightContent={
-						<Stack spacing={theme.spacing(LAYOUT.MD)}>
-							<Controller
-								name="basicAuthUser"
-								control={control}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										value={field.value ?? ""}
-										fieldLabel={t(
-											"pages.createMonitor.form.basicAuth.option.username.label"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-							<Controller
-								name="basicAuthPassword"
-								control={control}
-								render={({ field, fieldState }) => (
-									<TextField
-										{...field}
-										value={field.value ?? ""}
-										type="password"
-										fieldLabel={t(
-											"pages.createMonitor.form.basicAuth.option.password.label"
-										)}
-										fullWidth
-										error={!!fieldState.error}
-										helperText={fieldState.error?.message ?? ""}
-									/>
-								)}
-							/>
-						</Stack>
-					}
-				/>
-			)}
-
 			{watchedType === "http" && (
 				<ConfigBox
 					title={t("pages.createMonitor.form.advanced.title")}

client/src/Types/Monitor.ts

@@ -44,8 +44,6 @@ export interface Monitor {
 	jsonPath?: string;
 	expectedValue?: string;
 	matchMethod?: MonitorMatchMethod;
-	basicAuthUser?: string;
-	basicAuthPassword?: string;
 	url: string;
 	port?: number;
 	isActive: boolean;

client/src/Validation/monitor.ts

@@ -38,8 +38,6 @@ const httpSchema = baseSchema.extend({
 	matchMethod: z.enum(["equal", "include", "regex", ""]).optional(),
 	expectedValue: z.string().optional(),
 	jsonPath: z.string().optional(),
-	basicAuthUser: z.string().optional(),
-	basicAuthPassword: z.string().optional(),
 });
 
 // Ping monitor schema

client/src/locales/en.json

@@ -501,18 +501,6 @@
 						"hardware": "Monitor CPU, memory, disk usage, and temperature for your infrastructure."
 					}
 				},
-				"basicAuth": {
-					"description": "Configure HTTP basic authentication credentials for this monitor.",
-					"option": {
-						"username": {
-							"label": "Username"
-						},
-						"password": {
-							"label": "Password"
-						}
-					},
-					"title": "Basic authentication"
-				},
 				"ignoreTls": {
 					"description": "Configure TLS/SSL certificate validation for HTTPS connections.",
 					"option": {

server/src/db/models/Monitor.ts

@@ -93,12 +93,6 @@ const MonitorSchema = new Schema<MonitorDocument>(
 			type: String,
 			enum: ["equal", "include", "regex", ""],
 		},
-		basicAuthUser: {
-			type: String,
-		},
-		basicAuthPassword: {
-			type: String,
-		},
 		url: {
 			type: String,
 			required: true,

server/src/service/infrastructure/networkService.ts

@@ -296,7 +296,7 @@ class NetworkService implements INetworkService {
 	}
 
 	private async requestHttp<T = unknown>(monitor: Monitor): Promise<MonitorStatusResponse<T>> {
-		const { url, secret, ignoreTlsErrors, useAdvancedMatching, jsonPath, matchMethod, expectedValue, basicAuthUser, basicAuthPassword } = monitor;
+		const { url, secret, ignoreTlsErrors, useAdvancedMatching, jsonPath, matchMethod, expectedValue } = monitor;
 		const httpResponse = this.buildStatusResponse<T>({
 			monitor,
 			overrides: {
@@ -310,15 +310,8 @@ class NetworkService implements INetworkService {
 			if (!url) {
 				throw new Error("Monitor URL is required");
 			}
-			const headers: Record<string, string> = {};
-			if (secret) {
-				headers["Authorization"] = `Bearer ${secret}`;
-			} else if (basicAuthUser) {
-				const credentials = Buffer.from(`${basicAuthUser}:${basicAuthPassword || ""}`).toString("base64");
-				headers["Authorization"] = `Basic ${credentials}`;
-			}
 			const config: Record<string, unknown> = {
-				headers: Object.keys(headers).length > 0 ? headers : undefined,
+				headers: secret ? { Authorization: `Bearer ${secret}` } : undefined,
 			};
 
 			if (ignoreTlsErrors) {

server/src/types/monitor.ts

@@ -27,8 +27,6 @@ export interface Monitor {
 	jsonPath?: string;
 	expectedValue?: string;
 	matchMethod?: MonitorMatchMethod;
-	basicAuthUser?: string;
-	basicAuthPassword?: string;
 	url: string;
 	port?: number;
 	isActive: boolean;

server/src/validation/monitorValidation.ts

@@ -70,8 +70,6 @@ export const createMonitorBodyValidation = z.object({
 	jsonPath: z.union([z.string(), z.literal("")]).optional(),
 	expectedValue: z.union([z.string(), z.literal("")]).optional(),
 	matchMethod: z.union([z.string(), z.null(), z.literal("")]).optional(),
-	basicAuthUser: z.union([z.string(), z.literal("")]).optional(),
-	basicAuthPassword: z.union([z.string(), z.literal("")]).optional(),
 	gameId: z.union([z.string(), z.literal("")]).optional(),
 	grpcServiceName: z.union([z.string(), z.literal("")]).default(""),
 	selectedDisks: z.array(z.string()).optional(),
@@ -96,8 +94,6 @@ export const editMonitorBodyValidation = z.object({
 	jsonPath: z.union([z.string(), z.literal("")]).optional(),
 	expectedValue: z.union([z.string(), z.literal("")]).optional(),
 	matchMethod: z.union([z.string(), z.null(), z.literal("")]).optional(),
-	basicAuthUser: z.union([z.string(), z.literal("")]).optional(),
-	basicAuthPassword: z.union([z.string(), z.literal("")]).optional(),
 	port: z.number().min(1).max(65535).optional(),
 	cpuAlertThreshold: z.number().optional(),
 	memoryAlertThreshold: z.number().optional(),