From 41d22c8ccb64f30a8f2a4e5ed106828e0c075027 Mon Sep 17 00:00:00 2001 From: zomars Date: Mon, 5 Dec 2022 16:09:19 -0700 Subject: [PATCH] Fixes for console --- lib/validations/shared/baseApiParams.ts | 16 +++++++--------- lib/validations/shared/queryUserId.ts | 8 +++----- pages/api/users/[userId]/index.ts | 13 +++++-------- 3 files changed, 15 insertions(+), 22 deletions(-) diff --git a/lib/validations/shared/baseApiParams.ts b/lib/validations/shared/baseApiParams.ts index b670be62d3..d0482d0d27 100644 --- a/lib/validations/shared/baseApiParams.ts +++ b/lib/validations/shared/baseApiParams.ts @@ -2,12 +2,10 @@ import { z } from "zod"; // Extracted out as utility function so can be reused // at different endpoints that require this validation. -export const baseApiParams = z - .object({ - // since we added apiKey as query param this is required by next-validations helper - // for query params to work properly and not fail. - apiKey: z.string().optional(), - // version required for supporting /v1/ redirect to query in api as *?version=1 - version: z.string().optional(), - }) - .strict(); +export const baseApiParams = z.object({ + // since we added apiKey as query param this is required by next-validations helper + // for query params to work properly and not fail. + apiKey: z.string().optional(), + // version required for supporting /v1/ redirect to query in api as *?version=1 + version: z.string().optional(), +}); diff --git a/lib/validations/shared/queryUserId.ts b/lib/validations/shared/queryUserId.ts index 88e2c7e8de..f187d0f134 100644 --- a/lib/validations/shared/queryUserId.ts +++ b/lib/validations/shared/queryUserId.ts @@ -7,11 +7,9 @@ import { baseApiParams } from "./baseApiParams"; // Extracted out as utility function so can be reused // at different endpoints that require this validation. -export const schemaQueryUserId = baseApiParams - .extend({ - userId: stringOrNumber, - }) - .strict(); +export const schemaQueryUserId = baseApiParams.extend({ + userId: stringOrNumber, +}); export const schemaQuerySingleOrMultipleUserIds = z.object({ userId: z.union([stringOrNumber, z.array(stringOrNumber)]), diff --git a/pages/api/users/[userId]/index.ts b/pages/api/users/[userId]/index.ts index b6cb937af3..ef0f429b1e 100644 --- a/pages/api/users/[userId]/index.ts +++ b/pages/api/users/[userId]/index.ts @@ -1,14 +1,11 @@ import { defaultHandler } from "@calcom/lib/server"; import { withMiddleware } from "~/lib/helpers/withMiddleware"; -import { withValidQueryUserId } from "~/lib/validations/shared/queryUserId"; export default withMiddleware()( - withValidQueryUserId( - defaultHandler({ - GET: import("./_get"), - PATCH: import("./_patch"), - DELETE: import("./_delete"), - }) - ) + defaultHandler({ + GET: import("./_get"), + PATCH: import("./_patch"), + DELETE: import("./_delete"), + }) );