From ba37ae78d91598f9a6c2f7650cd3f87a02570150 Mon Sep 17 00:00:00 2001 From: Agusti Fernandez Pardo Date: Tue, 14 Jun 2022 23:41:33 +0200 Subject: [PATCH 1/7] fix: adds middleware, makes userId not optional --- pages/api/availability/_get.ts | 2 +- pages/api/availability/index.ts | 10 +++++++--- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/pages/api/availability/_get.ts b/pages/api/availability/_get.ts index 21450f005e..5289190c03 100644 --- a/pages/api/availability/_get.ts +++ b/pages/api/availability/_get.ts @@ -7,7 +7,7 @@ import { stringOrNumber } from "@calcom/prisma/zod-utils"; const availabilitySchema = z .object({ - userId: stringOrNumber.optional(), + userId: stringOrNumber, username: z.string().optional(), dateFrom: z.string(), dateTo: z.string(), diff --git a/pages/api/availability/index.ts b/pages/api/availability/index.ts index 0fe7836697..b0c4e223d5 100644 --- a/pages/api/availability/index.ts +++ b/pages/api/availability/index.ts @@ -1,5 +1,9 @@ import { defaultHandler } from "@calcom/lib/server"; -export default defaultHandler({ - GET: import("./_get"), -}); +import { withMiddleware } from "@lib/helpers/withMiddleware"; + +export default withMiddleware("HTTP_GET_OR_POST")( + defaultHandler({ + GET: import("./_get"), + }) +); From 372b20a4c937a5b3014febaf61836656e507a3fd Mon Sep 17 00:00:00 2001 From: Agusti Fernandez Pardo Date: Tue, 14 Jun 2022 23:42:51 +0200 Subject: [PATCH 2/7] fix: no post for now --- pages/api/availability/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/api/availability/index.ts b/pages/api/availability/index.ts index b0c4e223d5..fe6357f6bc 100644 --- a/pages/api/availability/index.ts +++ b/pages/api/availability/index.ts @@ -2,7 +2,7 @@ import { defaultHandler } from "@calcom/lib/server"; import { withMiddleware } from "@lib/helpers/withMiddleware"; -export default withMiddleware("HTTP_GET_OR_POST")( +export default withMiddleware("HTTP_GET")( defaultHandler({ GET: import("./_get"), }) From 1bde5d88c105cf0357ce708a52f725dc37072be1 Mon Sep 17 00:00:00 2001 From: Agusti Fernandez Pardo Date: Tue, 14 Jun 2022 23:43:53 +0200 Subject: [PATCH 3/7] fix: add back optional --- pages/api/availability/_get.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/api/availability/_get.ts b/pages/api/availability/_get.ts index 5289190c03..21450f005e 100644 --- a/pages/api/availability/_get.ts +++ b/pages/api/availability/_get.ts @@ -7,7 +7,7 @@ import { stringOrNumber } from "@calcom/prisma/zod-utils"; const availabilitySchema = z .object({ - userId: stringOrNumber, + userId: stringOrNumber.optional(), username: z.string().optional(), dateFrom: z.string(), dateTo: z.string(), From 1e80a83b1f5519fc76fdbab53456ef0fc4310cfd Mon Sep 17 00:00:00 2001 From: Agusti Fernandez Pardo Date: Tue, 14 Jun 2022 23:57:38 +0200 Subject: [PATCH 4/7] add session to req --- lib/helpers/verifyApiKey.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/helpers/verifyApiKey.ts b/lib/helpers/verifyApiKey.ts index c45f3d3c3f..481b006849 100644 --- a/lib/helpers/verifyApiKey.ts +++ b/lib/helpers/verifyApiKey.ts @@ -11,6 +11,8 @@ declare module "next" { userId: number; method: string; query: { [key: string]: string | string[] }; + // eslint-disable-next-line @typescript-eslint/no-explicit-any + session: any; } } From ab26f35520c3c564ad39f4b9ccf7f0521caef3c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Omar=20L=C3=B3pez?= Date: Tue, 14 Jun 2022 16:04:40 -0600 Subject: [PATCH 5/7] Update package.json --- package.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 48cf7b6ef9..493a5929fd 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,8 @@ "author": "Cal.com Inc.", "private": true, "scripts": { - "build": "next build", + "app-store:generate": "yarn workspace @calcom/app-store-cli generate", + "build": "yarn app-store:generate && next build", "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next", "dev": "PORT=3002 next dev", "lint-fix": "next lint --fix && prettier --write .", From 5559e63be10e0812043d7e2e90ff54fa0f9ac97d Mon Sep 17 00:00:00 2001 From: Agusti Fernandez Pardo Date: Wed, 15 Jun 2022 00:19:39 +0200 Subject: [PATCH 6/7] fix add app-store to deps --- package.json | 1 + 1 file changed, 1 insertion(+) diff --git a/package.json b/package.json index 493a5929fd..6384aaa8ca 100644 --- a/package.json +++ b/package.json @@ -26,6 +26,7 @@ }, "dependencies": { "@calcom/prisma": "*", + "@calcom/app-store": "*", "@sentry/nextjs": "^6.19.7", "modify-response-middleware": "^1.1.0", "next": "^12.1.6", From ff701ffec68b4216ccbdadefe2db84c11500400b Mon Sep 17 00:00:00 2001 From: Agusti Fernandez Pardo Date: Wed, 15 Jun 2022 00:21:09 +0200 Subject: [PATCH 7/7] fix: no need for app store deps --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index 6384aaa8ca..493a5929fd 100644 --- a/package.json +++ b/package.json @@ -26,7 +26,6 @@ }, "dependencies": { "@calcom/prisma": "*", - "@calcom/app-store": "*", "@sentry/nextjs": "^6.19.7", "modify-response-middleware": "^1.1.0", "next": "^12.1.6",