💄 Redirect table

server/routers/redirect/createRedirect.ts

@@ -10,6 +10,7 @@ import { fromError } from "zod-validation-error";
 import { OpenAPITags, registry } from "@server/openApi";
 import { and, eq } from "drizzle-orm";
 import {
+    redirectDestinationDomainSchema,
     redirectMatchPathSchema,
     redirectPathMatchTypeSchema,
     redirectRewritePathSchema,
@@ -30,7 +31,7 @@ const bodySchema = z.strictObject({
     resourceId: z.number().int().positive().optional().nullable(),
     domainId: z.string().nonempty().optional().nullable(),
     subdomain: z.string().nonempty().optional().nullable(),
-    destinationDomain: z.string().nonempty(),
+    destinationDomain: redirectDestinationDomainSchema,
     pathMatchType: redirectPathMatchTypeSchema.optional(),
     matchPath: redirectMatchPathSchema,
     rewritePath: redirectRewritePathSchema.optional().nullable(),

server/routers/redirect/updateRedirect.ts

@@ -11,6 +11,7 @@ import { OpenAPITags, registry } from "@server/openApi";
 import { and, eq, ne } from "drizzle-orm";
 import {
     redirectNiceIdSchema,
+    redirectDestinationDomainSchema,
     redirectMatchPathSchema,
     redirectPathMatchTypeSchema,
     redirectRewritePathSchema,
@@ -32,7 +33,7 @@ const bodySchema = z.strictObject({
     resourceId: z.number().int().positive().optional().nullable(),
     domainId: z.string().nonempty().optional().nullable(),
     subdomain: z.string().nonempty().optional().nullable(),
-    destinationDomain: z.string().nonempty().optional(),
+    destinationDomain: redirectDestinationDomainSchema.optional(),
     pathMatchType: redirectPathMatchTypeSchema.optional(),
     matchPath: redirectMatchPathSchema.optional(),
     rewritePath: redirectRewritePathSchema.optional().nullable(),

server/routers/redirect/validation.ts

@@ -1,4 +1,5 @@
 import { z } from "zod";
+import { isValidDomain } from "@server/lib/validators";
 
 export const redirectNiceIdSchema = z
     .string()
@@ -21,3 +22,10 @@ export const redirectRewritePathTypeSchema = z.enum([
 export const redirectMatchPathSchema = z.string().nonempty().default("*");
 
 export const redirectRewritePathSchema = z.string().nonempty();
+
+export const redirectDestinationDomainSchema = z
+    .string()
+    .nonempty()
+    .refine(isValidDomain, {
+        message: "Invalid domain"
+    });