feat: add regex validation for dtos

wzarek · Jun 9, 2024 · 7411132 · 7411132
1 parent f1e6889
commit 7411132
Show file tree

Hide file tree

Showing 9 changed files with 68 additions and 20 deletions.
diff --git a/Client/reasn-client/packages/common/__tests__/models/EventDto.test.ts b/Client/reasn-client/packages/common/__tests__/models/EventDto.test.ts
@@ -14,7 +14,7 @@ describe("EventDto", () => {
   const updatedAt = new Date("2022-01-01");
   const slug = "test-event";
   const status = EventStatus.APPROVED;
-  const tags: TagDto[] = [{ Name: "Tag 1" }, { Name: "Tag 2" }];
+  const tags: TagDto[] = [{ Name: "first tag" }, { Name: "second tag" }];
 
   describe("fromJson", () => {
     it("should create an instance of EventDto from JSON string", () => {

diff --git a/Client/reasn-client/packages/common/__tests__/models/UserDto.test.ts b/Client/reasn-client/packages/common/__tests__/models/UserDto.test.ts
@@ -8,7 +8,7 @@ describe("UserDto", () => {
   const name = "John";
   const surname = "Doe";
   const email = "[email protected]";
-  const phone = "+1234567890";
+  const phone = "+48 1234567890";
   const role = UserRole.USER;
   const addressId = 2;
   const interests: UserInterestDto[] = [

diff --git a/Client/reasn-client/packages/common/models/AddressDto.ts b/Client/reasn-client/packages/common/models/AddressDto.ts
@@ -2,11 +2,26 @@ import ModelMappingError from "@reasn/common/errors/ModelMappingError";
 import { z } from "zod";
 
 export const AddressDtoSchema = z.object({
-  Country: z.string(),
-  City: z.string(),
-  Street: z.string(),
-  State: z.string(),
-  ZipCode: z.string().nullable(),
+  Country: z
+    .string()
+    .max(64)
+    .regex(/^\p{Lu}[\p{L}\s'-]*(?<![\s-])$/u),
+  City: z
+    .string()
+    .max(64)
+    .regex(/^\p{Lu}[\p{Ll}'.]+(?:[\s-][\p{L}'.]+)*$/u),
+  Street: z
+    .string()
+    .max(64)
+    .regex(/^[\p{L}\d\s\-/.,#']+(?<![-\s#,])$/u),
+  State: z
+    .string()
+    .max(64)
+    .regex(/^\p{Lu}\p{Ll}+(?:(\s|-)\p{L}+)*$/u),
+  ZipCode: z
+    .string()
+    .nullable()
+    .refine((value) => value === null || /^[\p{L}\d\s-]{3,}$/u.test(value)),
 });
 
 export type AddressDto = z.infer<typeof AddressDtoSchema>;

diff --git a/Client/reasn-client/packages/common/models/CommentDto.ts b/Client/reasn-client/packages/common/models/CommentDto.ts
@@ -3,7 +3,7 @@ import { z } from "zod";
 
 export const CommentDtoSchema = z.object({
   EventId: z.number(),
-  Content: z.string(),
+  Content: z.string().max(1024),
   CreatedAt: z
     .string()
     .datetime({ offset: true })

diff --git a/Client/reasn-client/packages/common/models/EventDto.ts b/Client/reasn-client/packages/common/models/EventDto.ts
@@ -4,9 +4,9 @@ import { EventStatus } from "@reasn/common/enums/modelsEnums";
 import { z } from "zod";
 
 export const EventDtoSchema = z.object({
-  Name: z.string(),
+  Name: z.string().max(64),
   AddressId: z.number(),
-  Description: z.string(),
+  Description: z.string().max(4048),
   OrganizerId: z.number(),
   StartAt: z
     .string()
@@ -28,8 +28,17 @@ export const EventDtoSchema = z.object({
     .datetime({ offset: true })
     .or(z.date())
     .transform((arg) => new Date(arg)),
-  Slug: z.string().nullable(),
+  Slug: z
+    .string()
+    .nullable()
+    .refine(
+      (value) =>
+        value === null ||
+        (value.length <= 128 && /^[\p{L}\d]+[\p{L}\d-]*$/u.test(value)),
+    ),
+
   Status: z.nativeEnum(EventStatus),
+
   Tags: z.array(TagDtoSchema),
 });
 

diff --git a/Client/reasn-client/packages/common/models/InterestDto.ts b/Client/reasn-client/packages/common/models/InterestDto.ts
@@ -2,7 +2,10 @@ import ModelMappingError from "@reasn/common/errors/ModelMappingError";
 import { z } from "zod";
 
 export const InterestDtoSchema = z.object({
-  Name: z.string(),
+  Name: z
+    .string()
+    .max(32)
+    .regex(/^\p{Lu}\p{Ll}+(?:\s\p{L}+)*$/u),
 });
 
 export type InterestDto = z.infer<typeof InterestDtoSchema>;

diff --git a/Client/reasn-client/packages/common/models/ParameterDto.ts b/Client/reasn-client/packages/common/models/ParameterDto.ts
@@ -2,8 +2,14 @@ import ModelMappingError from "@reasn/common/errors/ModelMappingError";
 import { z } from "zod";
 
 export const ParameterDtoSchema = z.object({
-  Key: z.string(),
-  Value: z.string(),
+  Key: z
+    .string()
+    .max(32)
+    .regex(/^\p{L}+(?:\s\p{L}+)*$/u),
+  Value: z
+    .string()
+    .max(64)
+    .regex(/^[\p{L}\d]+(?:\s[\p{L}\d]+)*$/u),
 });
 
 export type ParameterDto = z.infer<typeof ParameterDtoSchema>;

diff --git a/Client/reasn-client/packages/common/models/TagDto.ts b/Client/reasn-client/packages/common/models/TagDto.ts
@@ -2,7 +2,10 @@ import ModelMappingError from "@reasn/common/errors/ModelMappingError";
 import { z } from "zod";
 
 export const TagDtoSchema = z.object({
-  Name: z.string(),
+  Name: z
+    .string()
+    .max(64)
+    .regex(/^\p{L}+(?:\s\p{L}+)*$/u),
 });
 
 export type TagDto = z.infer<typeof TagDtoSchema>;

diff --git a/Client/reasn-client/packages/common/models/UserDto.ts b/Client/reasn-client/packages/common/models/UserDto.ts
@@ -4,11 +4,23 @@ import { UserRole } from "@reasn/common/enums/modelsEnums";
 import { z } from "zod";
 
 export const UserDtoSchema = z.object({
-  Username: z.string(),
-  Name: z.string(),
-  Surname: z.string(),
-  Email: z.string(),
-  Phone: z.string().nullable(),
+  Username: z
+    .string()
+    .max(64)
+    .regex(/^[\p{L}\d._%+-]{4,}$/u),
+  Name: z
+    .string()
+    .max(64)
+    .regex(/^\p{Lu}[\p{Ll}\s'-]+$/u),
+  Surname: z
+    .string()
+    .max(64)
+    .regex(/^\p{L}+(?:[\s'-]\p{L}+)*$/u),
+  Email: z.string().email(),
+  Phone: z
+    .string()
+    .nullable()
+    .refine((value) => value === null || /^\+\d{1,3}\s\d{1,15}$/.test(value)),
   Role: z.nativeEnum(UserRole),
   AddressId: z.number(),
   Intrests: z.array(UserInterestDtoSchema),