feat: add next-validations and zod validations

package.json

@@ -29,6 +29,7 @@
   },
   "dependencies": {
     "next": "^12.1.0",
+    "next-validations": "^0.1.11",
     "zod": "^3.14.2"
   }
 }

pages/api/event-types/[id].ts

@@ -1,19 +1,47 @@
+import { PrismaClient, EventType } from "@prisma/client";
 import type { NextApiRequest, NextApiResponse } from "next";
+import { withValidation } from "next-validations";
+import { z } from "zod";
 
-import prisma from "@calcom/prisma";
-import { EventType } from "@calcom/prisma/client";
+const prisma = new PrismaClient();
 
-type Data = {
-  event?: EventType;
+const schema = z
+  .object({
+    id: z
+      .string()
+      .regex(/^\d+$/)
+      .transform((id) => parseInt(id)),
+  })
+  .strict();
+
+const validate = withValidation({
+  schema,
+  type: "Zod",
+  mode: "query",
+});
+
+type ResponseData = {
+  data?: EventType;
   error?: any;
 };
 
-export default async function eventType(req: NextApiRequest, res: NextApiResponse<Data>) {
+export async function eventType(req: NextApiRequest, res: NextApiResponse<ResponseData>) {
+  const { query, method } = req;
+  if (method === "GET") {
+    const safe = await schema.safeParse(query);
+    if (safe.success) {
       try {
-    const event = await prisma.eventType.findUnique({ where: { id: Number(req.query.id) } });
-    res.status(200).json({ event });
+        const event = await prisma.eventType.findUnique({ where: { id: safe.data.id } });
+        res.status(200).json({ data: event });
       } catch (error) {
         console.log(error);
         res.status(400).json({ error: error });
       }
+    }
+  } else {
+    // Reject any other HTTP method than POST
+    res.status(405).json({ error: "Only GET Method allowed" });
+  }
 }
+
+export default validate(eventType);

pages/api/event-types/index.ts

@@ -1,17 +1,16 @@
+import { PrismaClient, EventType } from "@prisma/client";
 import type { NextApiRequest, NextApiResponse } from "next";
 
-import prisma from "@calcom/prisma";
-import { EventType } from "@calcom/prisma/client";
-
-type Data = {
-  events?: EventType[];
+const prisma = new PrismaClient();
+type ResponseData = {
+  data?: EventType[];
   error?: any;
 };
 
-export default async function eventType(req: NextApiRequest, res: NextApiResponse<Data>) {
+export default async function eventType(req: NextApiRequest, res: NextApiResponse<ResponseData>) {
   try {
     const eventTypes = await prisma.eventType.findMany({ where: { id: Number(req.query.eventTypeId) } });
-    res.status(200).json({ events: { ...eventTypes } });
+    res.status(200).json({ data: { ...eventTypes } });
   } catch (error) {
     console.log(error);
     // FIXME: Add zod for validation/error handling

pages/api/event-types/new.ts

@@ -1,86 +1,49 @@
+import { PrismaClient, EventType } from "@prisma/client";
 import type { NextApiRequest, NextApiResponse } from "next";
+import { withValidation } from "next-validations";
+import { z } from "zod";
 
-import prisma from "@calcom/prisma";
-import { EventType } from "@calcom/prisma/client";
+const prisma = new PrismaClient();
+
+const schema = z
+  .object({
+    title: z.string().min(3),
+    slug: z.string().min(3),
+    length: z.number().min(1).max(1440), // max is a full day.
+    description: z.string().min(3).optional(),
+  })
+  .strict(); // Adding strict so that we can disallow passing in extra fields
+
+const validate = withValidation({
+  schema,
+  type: "Zod",
+  mode: "body",
+});
 
 interface Body {
-  userId: string;
-
-  newOrganization: {
-    name: string;
-    users: string[];
-  };
+  title: string;
+  slug: string;
+  length: number;
 }
 type Data = {
-  event?: EventType;
+  data?: EventType;
   error?: string;
 };
 
-export default async function createEventLink(req: NextApiRequest, res: NextApiResponse<Data>) {
-  const {
-    body: {
-      title,
-      slug,
-      description,
-      position,
-      locations,
-      hidden,
-      teamId,
-      eventName,
-      timeZone,
-      periodType,
-      periodStartDate,
-      periodEndDate,
-      periodDays,
-      periodCountCalendarDays,
-      requiresConfirmation,
-      disableGuests,
-      minimumBookingNotice,
-      beforeEventBuffer,
-      afterEventBuffer,
-      schedulingType,
-      price,
-      currency,
-      slotInterval,
-      metadata,
-      length,
-    },
-    method,
-  } = req;
+type NextApiRequestWithBody = NextApiRequest & {
+  body: Body;
+};
+
+async function createEventType(req: NextApiRequestWithBody, res: NextApiResponse<Data>) {
+  const { body, method }: { body: Body; method?: string } = req;
   if (method === "POST") {
-    // Process a POST request
-    const newEvent = await prisma.eventType.create({
-      data: {
-        title: `${title}`,
-        slug: `${slug}`,
-        length: Number(length),
-        // description: description as string,
-        // position: Number(position),
-        // locations: locations,
-        // hidden: Boolean(hidden) as boolean,
-        // teamId: Number.isInteger(teamId) ? Number(teamId) : null,
-        // eventName: eventName,
-        // timeZone: timeZone,
-        // periodType: periodType,
-        // periodStartDate: periodStartDate,
-        // periodEndDate: periodEndDate,
-        // periodDays: periodDays,
-        // periodCountCalendarDays: periodCountCalendarDays,
-        // requiresConfirmation: requiresConfirmation,
-        // disableGuests: disableGuests,
-        // minimumBookingNotice: minimumBookingNotice,
-        // beforeEventBuffer: beforeEventBuffer,
-        // afterEventBuffer: afterEventBuffer,
-        // schedulingType: schedulingType,
-        // price: price,
-        // currency: currency,
-        // slotInterval: slotInterval,
-        // metadata: metadata,
-      },
-    });
-    res.status(201).json({ event: newEvent });
+    schema.safeParse(body);
+    const newEvent = await prisma.eventType.create({ data: body });
+    res.status(201).json({ data: newEvent });
   } else {
-    // Handle any other HTTP method
+    // Reject any other HTTP method than POST
     res.status(405).json({ error: "Only POST Method allowed" });
   }
 }
+
+export default validate(createEventType);

pages/api/users/[id].ts

@@ -1,9 +1,7 @@
-import { PrismaClient } from "@prisma/client";
 import type { NextApiRequest, NextApiResponse } from "next";
 
-// This local import doesn't work
-// import { PrismaClient } from "@calcom/prisma";
-const prisma = new PrismaClient();
+import prisma from "@calcom/prisma";
+import { User } from "@calcom/prisma/client";
 
 type Data = {
   message: string;

pages/api/users/valid.ts

@@ -0,0 +1,19 @@
+import { NextApiRequest, NextApiResponse } from "next";
+import { withValidation } from "next-validations";
+import { z } from "zod";
+
+const schema = z.object({
+  username: z.string().min(6),
+});
+
+const validate = withValidation({
+  schema,
+  type: "Zod",
+  mode: "body",
+});
+
+const handler = (req: NextApiRequest, res: NextApiResponse) => {
+  res.status(200).json(req.body);
+};
+
+export default validate(handler);

tsconfig.json

@@ -4,12 +4,20 @@
     "node_modules"
   ],
   "compilerOptions": {
-    "lib": ["ES2015"],
-    "module": "CommonJS",
-    "outDir": "./dist",
-    "rootDir": "./",
     "strictNullChecks": true,
     "baseUrl": "./",
+    "target": "es5",
+    "lib": [
+      "dom",
+      "dom.iterable",
+      "esnext"
+    ],
+    "allowJs": true,
+    "noEmit": true,
+    "incremental": true,
+    "module": "esnext",
+    "resolveJsonModule": true,
+    "jsx": "preserve"
   },
   "include": [
     "./pages/api/*.ts"