chore: release v4.8.4

This reverts commit a7f24e777b.

.env.example

@@ -107,6 +107,12 @@ NEXT_PUBLIC_POSTHOG_KEY=
 
 NEXT_PUBLIC_POSTHOG_HOST=
 
+# plain.com config
+
+PLAIN_API_KEY=
+PLAIN_API_URL=https://api.plain.com/v1
+PLAIN_HMAC_SECRET_KEY=
+
 # Zendesk Config
 NEXT_PUBLIC_ZENDESK_KEY=
 
@@ -119,7 +125,7 @@ NEXT_PUBLIC_FRESHCHAT_HOST=
 
 # Google OAuth credentials
 # To enable Login with Google you need to:
-# 1. Set `GOOGLE_API_CREDENTIALS` above
+# 1. Set `GOOGLE_API_CREDENTIALS` below
 # 2. Set `GOOGLE_LOGIN_ENABLED` to `true`
 # When self-hosting please ensure you configure the Google integration as an Internal app so no one else can login to your instance
 # @see https://support.google.com/cloud/answer/6158849#public-and-internal&zippy=%2Cpublic-and-internal-applications
@@ -239,7 +245,8 @@ CLOUDFLARE_TURNSTILE_SECRET=
 NEXT_PUBLIC_TEAM_IMPERSONATION=false
 
 # Close.com internal CRM
-CLOSECOM_API_KEY=
+CLOSECOM_CLIENT_ID=
+CLOSECOM_CLIENT_SECRET=
 
 # Sendgrid internal sync service
 SENDGRID_SYNC_API_KEY=
@@ -347,8 +354,6 @@ E2E_TEST_OIDC_USER_PASSWORD=
 AB_TEST_BUCKET_PROBABILITY=50
 # whether we redirect to the future/event-types from event-types or not
 APP_ROUTER_EVENT_TYPES_ENABLED=0
-APP_ROUTER_SETTINGS_DEVELOPER_ENABLED=0
-APP_ROUTER_SETTINGS_ORG_ENABLED=0
 APP_ROUTER_APPS_INSTALLED_CATEGORY_ENABLED=0
 APP_ROUTER_APPS_SLUG_ENABLED=0
 APP_ROUTER_APPS_SLUG_SETUP_ENABLED=0
@@ -356,16 +361,9 @@ APP_ROUTER_APPS_SLUG_SETUP_ENABLED=0
 APP_ROUTER_APPS_CATEGORIES_ENABLED=0
 # whether we redirect to the future/apps/categories/[category] from /apps/categories/[category] or not
 APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED=0
-APP_ROUTER_BOOKING_ENABLED=0
 APP_ROUTER_BOOKINGS_STATUS_ENABLED=0
-APP_ROUTER_WORKFLOWS_ENABLED=0
-APP_ROUTER_SETTINGS_TEAMS_ENABLED=0
-APP_ROUTER_GETTING_STARTED_STEP_ENABLED=0
 APP_ROUTER_APPS_ENABLED=0
-APP_ROUTER_VIDEO_ENABLED=0
 APP_ROUTER_TEAM_ENABLED=0
-APP_ROUTER_TEAMS_ENABLED=0
-APP_ROUTER_AVAILABILITY_ENABLED=0
 APP_ROUTER_AUTH_FORGOT_PASSWORD_ENABLED=0
 APP_ROUTER_AUTH_LOGIN_ENABLED=0
 APP_ROUTER_AUTH_LOGOUT_ENABLED=0
@@ -374,10 +372,6 @@ APP_ROUTER_AUTH_SAML_ENABLED=0
 APP_ROUTER_AUTH_ERROR_ENABLED=0
 APP_ROUTER_AUTH_PLATFORM_ENABLED=0
 APP_ROUTER_AUTH_OAUTH2_ENABLED=0
-APP_ROUTER_MORE_ENABLED=0
-APP_ROUTER_MAINTENANCE_ENABLED=0
-APP_ROUTER_UPGRADE_ENABLED=0
-APP_ROUTER_CONNECT_AND_JOIN_ENABLED=0
 
 # disable setry server source maps
 SENTRY_DISABLE_SERVER_WEBPACK_PLUGIN=1
@@ -417,3 +411,6 @@ NEXT_PUBLIC_LOGGER_LEVEL=
 
 # Used to use Replexica SDK, a tool for real-time AI-powered localization
 REPLEXICA_API_KEY=
+
+# Comma-separated list of DSyncData.directoryId to log SCIM API requests for. It can be enabled temporarily for debugging the requests being sent to SCIM server.
+DIRECTORY_IDS_TO_LOG=

.github/CODEOWNERS

@@ -0,0 +1,11 @@
+/packages/app-store/applecalendar/**/* @calcom/Foundation
+/packages/app-store/caldavcalendar/**/* @calcom/Foundation
+/packages/app-store/exchange2013calendar/**/* @calcom/Foundation
+/packages/app-store/exchange2016calendar/**/* @calcom/Foundation
+/packages/app-store/exchangecalendar/**/* @calcom/Foundation
+/packages/app-store/feishucalendar/**/* @calcom/Foundation
+/packages/app-store/googlecalendar/**/* @calcom/Foundation
+/packages/app-store/ics-feedcalendar/**/* @calcom/Foundation
+/packages/app-store/larkcalendar/**/* @calcom/Foundation
+/packages/app-store/office365calendar/**/* @calcom/Foundation
+/packages/app-store/zohocalendar/**/* @calcom/Foundation

.github/workflows/draft-release.yml

@@ -23,7 +23,7 @@ jobs:
         with:
           fetch-depth: 0
           ref: 'main'
-          ssh-key: ${{ secrets.DEPLOY_KEY }}
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
 
       - name: Configure git
         run: |
@@ -40,11 +40,11 @@ jobs:
       - name: Commit changes
         run: |
           git add .
-          git commit -m "chore: release ${{ inputs.next_version }}"
+          git commit -m "chore: release v${{ inputs.next_version }}"
           git push
 
       - name: Draft release
-        run: gh release create $VERSION --generate-notes --draft
+        run: gh release create v$VERSION --generate-notes --draft
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           VERSION: ${{ inputs.next_version }}

.github/workflows/e2e-api-v2.yml

@@ -17,6 +17,7 @@ env:
   NEXTAUTH_URL: ${{ secrets.CI_NEXTAUTH_URL }}
   NODE_OPTIONS: --max-old-space-size=29000
   REDIS_URL: "redis://localhost:6379"
+  REPLEXICA_API_KEY: ${{ secrets.CI_REPLEXICA_API_KEY }}
   STRIPE_PRIVATE_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
   STRIPE_API_KEY: ${{ secrets.CI_STRIPE_PRIVATE_KEY }}
   STRIPE_CLIENT_ID: ${{ secrets.CI_STRIPE_CLIENT_ID }}

.github/workflows/nextjs-bundle-analysis.yml

@@ -17,7 +17,6 @@ env:
   DAILY_API_KEY: ${{ secrets.CI_DAILY_API_KEY }}
   DATABASE_URL: ${{ secrets.CI_DATABASE_URL }}
   DATABASE_DIRECT_URL: ${{ secrets.CI_DATABASE_URL }}
-  DEPLOYSENTINEL_API_KEY: ${{ secrets.DEPLOYSENTINEL_API_KEY }}
   E2E_TEST_APPLE_CALENDAR_EMAIL: ${{ secrets.E2E_TEST_APPLE_CALENDAR_EMAIL }}
   E2E_TEST_APPLE_CALENDAR_PASSWORD: ${{ secrets.E2E_TEST_APPLE_CALENDAR_PASSWORD }}
   E2E_TEST_MAILHOG_ENABLED: ${{ vars.E2E_TEST_MAILHOG_ENABLED }}
@@ -51,7 +50,8 @@ env:
 jobs:
   analyze:
     if: always()
-    runs-on: buildjet-2vcpu-ubuntu-2204
+    runs-on: buildjet-4vcpu-ubuntu-2204
+    timeout-minutes: 30
     steps:
       - uses: actions/checkout@v4
       - uses: ./.github/actions/dangerous-git-checkout
@@ -60,6 +60,7 @@ jobs:
       - name: Analyze bundle
         run: |
           cd apps/web
+          export NODE_OPTIONS="--max_old_space_size=8192"
           npx -p nextjs-bundle-analysis@0.5.0 report
 
       - name: Upload bundle

.github/workflows/on-changes-requested.yml

@@ -15,7 +15,7 @@ jobs:
             printf '{
               "pr_number": ${{ github.event.pull_request.number }}
             }' >> context.json
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: context.json
           path: ./

.github/workflows/post-release.yml

@@ -15,7 +15,7 @@ jobs:
         with:
           fetch-depth: 0
           ref: 'main'
-          ssh-key: ${{ secrets.DEPLOY_KEY }}
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
 
       - name: Configure git
         run: |

.github/workflows/unit-tests.yml

@@ -1,6 +1,8 @@
 name: Unit
 on:
   workflow_call:
+env:
+  REPLEXICA_API_KEY: ${{ secrets.CI_REPLEXICA_API_KEY }}
 permissions:
   contents: read
 jobs:

.yarn/versions/0f63a127.yml

@@ -0,0 +1,8 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"

.yarn/versions/2e3d771e.yml

@@ -0,0 +1,8 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"

.yarn/versions/306bf815.yml

@@ -0,0 +1,8 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"

.yarn/versions/354f3ba3.yml

@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"

.yarn/versions/4a56dcaa.yml

@@ -0,0 +1,8 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"

.yarn/versions/8f86d7b6.yml

@@ -0,0 +1,8 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"

.yarn/versions/94d54193.yml

@@ -0,0 +1,7 @@
+undecided:
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"

.yarn/versions/a33020ce.yml

@@ -0,0 +1,2 @@
+undecided:
+  - "@calcom/prisma"

.yarn/versions/aa332bc0.yml

@@ -0,0 +1,2 @@
+undecided:
+  - calcom-monorepo

.yarn/versions/cceb2606.yml

@@ -0,0 +1,8 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"

.yarn/versions/e376493f.yml

@@ -0,0 +1,8 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"

.yarn/versions/ef07ed23.yml

@@ -0,0 +1,8 @@
+undecided:
+  - calcom-monorepo
+  - "@calcom/app-store-cli"
+  - "@calcom/platform-constants"
+  - "@calcom/platform-enums"
+  - "@calcom/platform-types"
+  - "@calcom/platform-utils"
+  - "@calcom/prisma"

apps/api/v1/lib/helpers/verifyApiKey.ts

@@ -6,6 +6,7 @@ import { IS_PRODUCTION } from "@calcom/lib/constants";
 import prisma from "@calcom/prisma";
 
 import { isAdminGuard } from "../utils/isAdmin";
+import { isLockedOrBlocked } from "../utils/isLockedOrBlocked";
 import { ScopeOfAdmin } from "../utils/scopeOfAdmin";
 
 // Used to check if the apiKey is not expired, could be extracted if reused. but not for now.
@@ -24,23 +25,35 @@ export const verifyApiKey: NextMiddleware = async (req, res, next) => {
   if (!hasValidLicense && IS_PRODUCTION) {
     return res.status(401).json({ error: "Invalid or missing CALCOM_LICENSE_KEY environment variable" });
   }
-  // Check if the apiKey query param is provided.
+
   if (!req.query.apiKey) return res.status(401).json({ message: "No apiKey provided" });
-  // remove the prefix from the user provided api_key. If no env set default to "cal_"
+
   const strippedApiKey = `${req.query.apiKey}`.replace(process.env.API_KEY_PREFIX || "cal_", "");
-  // Hash the key again before matching against the database records.
   const hashedKey = hashAPIKey(strippedApiKey);
-  // Check if the hashed api key exists in database.
-  const apiKey = await prisma.apiKey.findUnique({ where: { hashedKey } });
-  // If cannot find any api key. Throw a 401 Unauthorized.
-  if (!apiKey) return res.status(401).json({ error: "Your apiKey is not valid" });
+  const apiKey = await prisma.apiKey.findUnique({
+    where: { hashedKey },
+    include: {
+      user: {
+        select: { role: true, locked: true, email: true },
+      },
+    },
+  });
+  if (!apiKey) return res.status(401).json({ error: "Your API key is not valid." });
   if (apiKey.expiresAt && dateNotInPast(apiKey.expiresAt)) {
-    return res.status(401).json({ error: "This apiKey is expired" });
+    return res.status(401).json({ error: "This API key is expired." });
   }
-  if (!apiKey.userId) return res.status(404).json({ error: "No user found for this apiKey" });
+  if (!apiKey.userId || !apiKey.user)
+    return res.status(404).json({ error: "No user found for this API key." });
+
   // save the user id in the request for later use
   req.userId = apiKey.userId;
+  req.user = apiKey.user;
+
   const { isAdmin, scope } = await isAdminGuard(req);
+  const userIsLockedOrBlocked = await isLockedOrBlocked(req);
+
+  if (userIsLockedOrBlocked)
+    return res.status(403).json({ error: "You are not authorized to perform this request." });
 
   req.isSystemWideAdmin = isAdmin && scope === ScopeOfAdmin.SystemWide;
   req.isOrganizationOwnerOrAdmin = isAdmin && scope === ScopeOfAdmin.OrgOwnerOrAdmin;

apps/api/v1/lib/utils/isAdmin.ts

@@ -6,8 +6,7 @@ import { UserPermissionRole, MembershipRole } from "@calcom/prisma/enums";
 import { ScopeOfAdmin } from "./scopeOfAdmin";
 
 export const isAdminGuard = async (req: NextApiRequest) => {
-  const { userId } = req;
-  const user = await prisma.user.findUnique({ where: { id: userId }, select: { role: true } });
+  const { user, userId } = req;
   if (!user) return { isAdmin: false, scope: null };
 
   const { role: userRole } = user;
@@ -34,7 +33,7 @@ export const isAdminGuard = async (req: NextApiRequest) => {
       },
     },
   });
-  if (!orgOwnerOrAdminMemberships.length) return { isAdmin: false, scope: null };
+  if (orgOwnerOrAdminMemberships.length > 0) return { isAdmin: true, scope: ScopeOfAdmin.OrgOwnerOrAdmin };
 
-  return { isAdmin: true, scope: ScopeOfAdmin.OrgOwnerOrAdmin };
+  return { isAdmin: false, scope: null };
 };

apps/api/v1/lib/utils/isLockedOrBlocked.ts

@@ -0,0 +1,9 @@
+import type { NextApiRequest } from "next";
+
+import { checkIfEmailIsBlockedInWatchlistController } from "@calcom/features/watchlist/operations/check-if-email-in-watchlist.controller";
+
+export async function isLockedOrBlocked(req: NextApiRequest) {
+  const user = req.user;
+  if (!user?.email) return false;
+  return user.locked || (await checkIfEmailIsBlockedInWatchlistController(user.email));
+}

apps/api/v1/lib/validations/booking.ts

@@ -23,6 +23,7 @@ const schemaBookingBaseBodyParams = Booking.pick({
   status: true,
   rescheduledBy: true,
   cancelledBy: true,
+  createdAt: true,
 }).partial();
 
 export const schemaBookingCreateBodyParams = extendedBookingCreateBody.merge(schemaQueryUserId.partial());
@@ -119,4 +120,5 @@ export const schemaBookingReadPublic = Booking.extend({
   fromReschedule: true,
   cancelledBy: true,
   rescheduledBy: true,
+  createdAt: true,
 });

apps/api/v1/next.d.ts

@@ -8,6 +8,7 @@ export declare module "next" {
     session?: Session | null;
 
     userId: number;
+    user?: { role: string; locked: boolean; email: string } | null;
     method: string;
     // session: { user: { id: number } };
     // query: Partial<{ [key: string]: string | string[] }>;

apps/api/v1/test/lib/middleware/verifyApiKey.test.ts

@@ -1,17 +1,17 @@
-import prismaMock from "../../../../../../tests/libs/__mocks__/prismaMock";
+import prismock from "../../../../../../tests/libs/__mocks__/prisma";
 
 import type { Request, Response } from "express";
 import type { NextApiRequest, NextApiResponse } from "next";
 import { createMocks } from "node-mocks-http";
-import { describe, vi, it, expect, afterEach, beforeEach } from "vitest";
+import { afterEach, beforeEach, describe, expect, it, vi } from "vitest";
 
 import LicenseKeyService from "@calcom/ee/common/server/LicenseKeyService";
 import prisma from "@calcom/prisma";
+import { MembershipRole, UserPermissionRole } from "@calcom/prisma/enums";
 
-import { isAdminGuard } from "~/lib/utils/isAdmin";
+import { hashAPIKey } from "~/../../../packages/features/ee/api-keys/lib/apiKeys";
 
 import { verifyApiKey } from "../../../lib/helpers/verifyApiKey";
-import { ScopeOfAdmin } from "../../../lib/utils/scopeOfAdmin";
 
 type CustomNextApiRequest = NextApiRequest & Request;
 type CustomNextApiResponse = NextApiResponse & Response;
@@ -20,11 +20,6 @@ afterEach(() => {
   vi.resetAllMocks();
 });
 
-vi.mock("@calcom/prisma");
-vi.mock("~/lib/utils/isAdmin", () => ({
-  isAdminGuard: vi.fn(),
-}));
-
 describe("Verify API key", () => {
   let service: LicenseKeyService;
 
@@ -45,7 +40,6 @@ describe("Verify API key", () => {
     };
 
     vi.mocked(service.checkLicense).mockResolvedValue(false);
-    vi.mocked(isAdminGuard).mockResolvedValue({ isAdmin: false, scope: null });
 
     const serverNext = vi.fn((next: void) => Promise.resolve(next));
 
@@ -69,7 +63,6 @@ describe("Verify API key", () => {
     };
 
     vi.mocked(service.checkLicense).mockResolvedValue(true);
-    vi.mocked(isAdminGuard).mockResolvedValue({ isAdmin: false, scope: null });
 
     const serverNext = vi.fn((next: void) => Promise.resolve(next));
 
@@ -91,10 +84,18 @@ describe("Verify API key", () => {
       },
       prisma,
     });
-
-    prismaMock.apiKey.findUnique.mockResolvedValue({
-      id: 1,
-      userId: 2,
+    const hashedKey = hashAPIKey("test_key");
+    await prismock.apiKey.create({
+      data: {
+        hashedKey,
+        user: {
+          create: {
+            email: "admin@example.com",
+            role: UserPermissionRole.ADMIN,
+            locked: false,
+          },
+        },
+      },
     });
 
     const middleware = {
@@ -102,7 +103,6 @@ describe("Verify API key", () => {
     };
 
     vi.mocked(service.checkLicense).mockResolvedValue(true);
-    vi.mocked(isAdminGuard).mockResolvedValue({ isAdmin: true, scope: ScopeOfAdmin.SystemWide });
 
     const serverNext = vi.fn((next: void) => Promise.resolve(next));
 
@@ -125,10 +125,36 @@ describe("Verify API key", () => {
       },
       prisma,
     });
-
-    prismaMock.apiKey.findUnique.mockResolvedValue({
-      id: 1,
-      userId: 2,
+    const hashedKey = hashAPIKey("test_key");
+    await prismock.apiKey.create({
+      data: {
+        hashedKey,
+        user: {
+          create: {
+            email: "org-admin@acme.com",
+            role: UserPermissionRole.USER,
+            locked: false,
+            teams: {
+              create: {
+                accepted: true,
+                role: MembershipRole.OWNER,
+                team: {
+                  create: {
+                    name: "ACME",
+                    isOrganization: true,
+                    organizationSettings: {
+                      create: {
+                        isAdminAPIEnabled: true,
+                        orgAutoAcceptEmail: "acme.com",
+                      },
+                    },
+                  },
+                },
+              },
+            },
+          },
+        },
+      },
     });
 
     const middleware = {
@@ -136,7 +162,6 @@ describe("Verify API key", () => {
     };
 
     vi.mocked(service.checkLicense).mockResolvedValue(true);
-    vi.mocked(isAdminGuard).mockResolvedValue({ isAdmin: true, scope: ScopeOfAdmin.OrgOwnerOrAdmin });
 
     const serverNext = vi.fn((next: void) => Promise.resolve(next));
 
@@ -149,4 +174,44 @@ describe("Verify API key", () => {
     expect(req.isSystemWideAdmin).toBe(false);
     expect(req.isOrganizationOwnerOrAdmin).toBe(true);
   });
+
+  it("should return 403 if user is locked or blocked", async () => {
+    const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+      method: "POST",
+      body: {},
+      query: {
+        apiKey: "cal_test_key",
+      },
+      prisma,
+    });
+    const hashedKey = hashAPIKey("test_key");
+    await prismock.apiKey.create({
+      data: {
+        hashedKey,
+        user: {
+          create: {
+            email: "locked@example.com",
+            role: UserPermissionRole.USER,
+            locked: true,
+          },
+        },
+      },
+    });
+
+    const middleware = {
+      fn: verifyApiKey,
+    };
+
+    vi.mocked(service.checkLicense).mockResolvedValue(true);
+
+    const serverNext = vi.fn((next: void) => Promise.resolve(next));
+    const middlewareSpy = vi.spyOn(middleware, "fn");
+
+    await middleware.fn(req, res, serverNext);
+
+    expect(middlewareSpy).toBeCalled();
+    expect(res.statusCode).toBe(403);
+    expect(JSON.parse(res._getData())).toEqual({ error: "You are not authorized to perform this request." });
+    expect(serverNext).not.toHaveBeenCalled();
+  });
 });

apps/api/v1/test/lib/utils/isAdmin.integration-test.ts

@@ -19,6 +19,7 @@ describe("isAdmin guard", () => {
     });
 
     req.userId = 0;
+    req.user = undefined;
 
     const { isAdmin, scope } = await isAdminGuard(req);
 
@@ -35,6 +36,7 @@ describe("isAdmin guard", () => {
     const memberUser = await prisma.user.findFirstOrThrow({ where: { email: "member2-acme@example.com" } });
 
     req.userId = memberUser.id;
+    req.user = memberUser;
 
     const { isAdmin, scope } = await isAdminGuard(req);
 
@@ -51,6 +53,7 @@ describe("isAdmin guard", () => {
     const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "admin@example.com" } });
 
     req.userId = adminUser.id;
+    req.user = adminUser;
 
     const { isAdmin, scope } = await isAdminGuard(req);
 
@@ -67,6 +70,8 @@ describe("isAdmin guard", () => {
     const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-acme@example.com" } });
 
     req.userId = adminUser.id;
+    req.user = adminUser;
+
     const { isAdmin, scope } = await isAdminGuard(req);
     expect(isAdmin).toBe(true);
     expect(scope).toBe(ScopeOfAdmin.OrgOwnerOrAdmin);
@@ -81,6 +86,8 @@ describe("isAdmin guard", () => {
     const adminUser = await prisma.user.findFirstOrThrow({ where: { email: "owner1-dunder@example.com" } });
 
     req.userId = adminUser.id;
+    req.user = adminUser;
+
     const { isAdmin } = await isAdminGuard(req);
     expect(isAdmin).toBe(false);
   });

apps/api/v1/test/lib/utils/isLockedOrBlocked.test.ts

@@ -0,0 +1,91 @@
+import prismock from "../../../../../../tests/libs/__mocks__/prisma";
+
+import { describe, expect, it, beforeEach } from "vitest";
+
+import { WatchlistSeverity } from "@calcom/prisma/enums";
+
+import { isLockedOrBlocked } from "../../../lib/utils/isLockedOrBlocked";
+
+describe("isLockedOrBlocked", () => {
+  beforeEach(async () => {
+    await prismock.watchlist.createMany({
+      data: [
+        {
+          type: "DOMAIN",
+          value: "spam.com",
+          createdById: 1,
+        },
+        {
+          type: "DOMAIN",
+          value: "blocked.com",
+          severity: WatchlistSeverity.CRITICAL,
+          createdById: 1,
+        },
+      ],
+    });
+  });
+
+  it("should return false if no user in request", async () => {
+    const req = { userId: null, user: null } as any;
+    const result = await isLockedOrBlocked(req);
+    expect(result).toBe(false);
+  });
+
+  it("should return false if user has no email", async () => {
+    const req = { userId: 123, user: { email: null } } as any;
+    const result = await isLockedOrBlocked(req);
+    expect(result).toBe(false);
+  });
+
+  it("should return true if user is locked", async () => {
+    const req = {
+      userId: 123,
+      user: {
+        locked: true,
+        email: "test@example.com",
+      },
+    } as any;
+
+    const result = await isLockedOrBlocked(req);
+    expect(result).toBe(true);
+  });
+
+  it("should return true if user email domain is watchlisted", async () => {
+    const req = {
+      userId: 123,
+      user: {
+        locked: false,
+        email: "test@blocked.com",
+      },
+    } as any;
+
+    const result = await isLockedOrBlocked(req);
+    expect(result).toBe(true);
+  });
+
+  it("should return false if user is not locked and email domain is not watchlisted", async () => {
+    const req = {
+      userId: 123,
+      user: {
+        locked: false,
+        email: "test@example.com",
+      },
+    } as any;
+
+    const result = await isLockedOrBlocked(req);
+    expect(result).toBe(false);
+  });
+
+  it("should handle email domains case-insensitively", async () => {
+    const req = {
+      userId: 123,
+      user: {
+        locked: false,
+        email: "test@BLOCKED.COM",
+      },
+    } as any;
+
+    const result = await isLockedOrBlocked(req);
+    expect(result).toBe(true);
+  });
+});

apps/api/v1/tsconfig.json

@@ -12,6 +12,7 @@
   },
   "include": [
     "next-env.d.ts",
+    "./next.d.ts",
     "**/*.ts",
     "**/*.tsx",
     "../../../packages/types/*.d.ts",

apps/api/v2/Dockerfile

@@ -6,6 +6,7 @@ ARG DATABASE_URL
 WORKDIR /calcom
 
 RUN set -eux;
+RUN ln -s /usr/lib/libssl.so.3 /lib/libssl.so.3
 
 ENV NODE_ENV="production"
 ENV NODE_OPTIONS="--max-old-space-size=8192"

apps/api/v2/package.json

@@ -29,7 +29,7 @@
     "@axiomhq/winston": "^1.2.0",
     "@calcom/platform-constants": "*",
     "@calcom/platform-enums": "*",
-    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.63",
+    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.73",
     "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
     "@calcom/platform-types": "*",
     "@calcom/platform-utils": "*",

apps/api/v2/src/config/app.ts

@@ -30,6 +30,8 @@ const loadConfig = (): AppConfig => {
     stripe: {
       apiKey: getEnv("STRIPE_API_KEY"),
       webhookSecret: getEnv("STRIPE_WEBHOOK_SECRET"),
+      teamMonthlyPriceId: getEnv("STRIPE_TEAM_MONTHLY_PRICE_ID", "set-team-monthly-price-in-your-env"),
+      isTeamBillingEnabled: getEnv("IS_TEAM_BILLING_ENABLED", true),
     },
     app: {
       baseUrl: getEnv("WEB_APP_URL", "https://app.cal.com"),

apps/api/v2/src/config/type.ts

@@ -21,6 +21,8 @@ export type AppConfig = {
   stripe: {
     apiKey: string;
     webhookSecret: string;
+    teamMonthlyPriceId: string;
+    isTeamBillingEnabled: boolean;
   };
   app: {
     baseUrl: string;

apps/api/v2/src/ee/bookings/2024-04-15/controllers/bookings.controller.ts

@@ -160,10 +160,10 @@ export class BookingsController_2024_04_15 {
   @Post("/")
   async createBooking(
     @Req() req: BookingRequest,
-    @Body() body: CreateBookingInput_2024_04_15
+    @Body() body: CreateBookingInput_2024_04_15,
+    @Headers(X_CAL_CLIENT_ID) clientId?: string
   ): Promise<ApiResponse<Partial<BookingResponse>>> {
-    const clientIdHeader = req.get(X_CAL_CLIENT_ID);
-    const oAuthClientId = clientIdHeader?.toString();
+    const oAuthClientId = clientId?.toString();
     const { orgSlug, locationUrl } = body;
     req.headers["x-cal-force-slug"] = orgSlug;
     try {
@@ -191,10 +191,10 @@ export class BookingsController_2024_04_15 {
   async cancelBooking(
     @Req() req: BookingRequest,
     @Param("bookingId") bookingId: string,
-    @Body() _: CancelBookingInput_2024_04_15
+    @Body() _: CancelBookingInput_2024_04_15,
+    @Headers(X_CAL_CLIENT_ID) clientId?: string
   ): Promise<ApiResponse<{ bookingId: number; bookingUid: string; onlyRemovedAttendee: boolean }>> {
-    const clientIdHeader = req.get(X_CAL_CLIENT_ID);
-    const oAuthClientId = clientIdHeader?.toString();
+    const oAuthClientId = clientId?.toString();
     if (bookingId) {
       try {
         req.body.id = parseInt(bookingId);
@@ -245,10 +245,10 @@ export class BookingsController_2024_04_15 {
   @Post("/recurring")
   async createRecurringBooking(
     @Req() req: BookingRequest,
-    @Body() _: CreateRecurringBookingInput_2024_04_15[]
+    @Body() _: CreateRecurringBookingInput_2024_04_15[],
+    @Headers(X_CAL_CLIENT_ID) clientId?: string
   ): Promise<ApiResponse<BookingResponse[]>> {
-    const clientIdHeader = req.get(X_CAL_CLIENT_ID);
-    const oAuthClientId = clientIdHeader?.toString();
+    const oAuthClientId = clientId?.toString();
     try {
       const recurringEventId = uuidv4();
       for (const recurringEvent of req.body) {
@@ -283,10 +283,10 @@ export class BookingsController_2024_04_15 {
   @Post("/instant")
   async createInstantBooking(
     @Req() req: BookingRequest,
-    @Body() _: CreateBookingInput_2024_04_15
+    @Body() _: CreateBookingInput_2024_04_15,
+    @Headers(X_CAL_CLIENT_ID) clientId?: string
   ): Promise<ApiResponse<Awaited<ReturnType<typeof handleInstantMeeting>>>> {
-    const clientIdHeader = req.get(X_CAL_CLIENT_ID);
-    const oAuthClientId = clientIdHeader?.toString();
+    const oAuthClientId = clientId?.toString();
     req.userId = (await this.getOwnerId(req)) ?? -1;
     try {
       const instantMeeting = await handleInstantMeeting(
@@ -333,7 +333,7 @@ export class BookingsController_2024_04_15 {
   }
 
   private async getOAuthClientsParams(clientId: string): Promise<OAuthRequestParams> {
-    const res = DEFAULT_PLATFORM_PARAMS;
+    const res = { ...DEFAULT_PLATFORM_PARAMS };
     try {
       const client = await this.oAuthClientRepository.getOAuthClient(clientId);
       // fetch oAuthClient from db and use data stored in db to set these values

apps/api/v2/src/ee/bookings/2024-04-15/inputs/create-booking.input.ts

@@ -1,3 +1,4 @@
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Transform, Type } from "class-transformer";
 import {
   IsBoolean,
@@ -13,53 +14,66 @@ import {
 
 class Location {
   @IsString()
+  @ApiProperty()
   optionValue!: string;
 
   @IsString()
+  @ApiProperty()
   value!: string;
 }
 
 class Response {
   @IsString()
+  @ApiProperty()
   name!: string;
 
   @IsEmail()
+  @ApiProperty()
   email!: string;
 
   @IsArray()
   @IsString({ each: true })
+  @ApiProperty({ type: [String] })
   guests!: string[];
 
   @IsOptional()
   @ValidateNested()
   @Type(() => Location)
+  @ApiPropertyOptional({ type: Location })
   location?: Location;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   notes?: string;
 }
 
 export class CreateBookingInput_2024_04_15 {
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   end?: string;
 
   @IsString()
+  @ApiProperty()
   start!: string;
 
   @IsNumber()
+  @ApiProperty()
   eventTypeId!: number;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   eventTypeSlug?: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   rescheduleUid?: string;
 
   @IsTimeZone()
+  @ApiProperty()
   timeZone!: string;
 
   @Transform(({ value }: { value: string | string[] }) => {
@@ -68,38 +82,48 @@ export class CreateBookingInput_2024_04_15 {
   @IsOptional()
   @IsArray()
   @IsString({ each: true })
+  @ApiPropertyOptional({ type: [String] })
   user?: string[];
 
   @IsString()
+  @ApiProperty()
   language!: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   bookingUid?: string;
 
   @IsObject()
+  @ApiProperty({ type: Object })
   metadata!: Record<string, string>;
 
   @IsBoolean()
   @IsOptional()
+  @ApiPropertyOptional()
   hasHashedBookingLink?: boolean;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   hashedLink!: string | null;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   seatReferenceUid?: string;
 
   @Type(() => Response)
+  @ApiProperty({ type: Response })
   responses!: Response;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   orgSlug?: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   locationUrl?: string;
 }

apps/api/v2/src/ee/bookings/2024-04-15/inputs/create-recurring-booking.input.ts

@@ -1,4 +1,5 @@
 import { CreateBookingInput_2024_04_15 } from "@/ee/bookings/2024-04-15/inputs/create-booking.input";
+import { ApiPropertyOptional } from "@nestjs/swagger";
 import { IsBoolean, IsString, IsNumber, IsOptional } from "class-validator";
 
 import type { AppsStatus } from "@calcom/platform-libraries";
@@ -6,23 +7,29 @@ import type { AppsStatus } from "@calcom/platform-libraries";
 export class CreateRecurringBookingInput_2024_04_15 extends CreateBookingInput_2024_04_15 {
   @IsBoolean()
   @IsOptional()
+  @ApiPropertyOptional()
   noEmail?: boolean;
 
   @IsOptional()
   @IsNumber()
+  @ApiPropertyOptional()
   recurringCount?: number;
 
   @IsOptional()
+  @ApiPropertyOptional({ type: [Object] })
   appsStatus?: AppsStatus[] | undefined;
 
   @IsOptional()
+  @ApiPropertyOptional({ type: [Object] })
   allRecurringDates?: Record<string, string>[];
 
   @IsOptional()
   @IsNumber()
+  @ApiPropertyOptional()
   currentRecurringIndex?: number;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   recurringEventId?: string;
 }

apps/api/v2/src/ee/bookings/2024-04-15/inputs/mark-no-show.input.ts

@@ -1,22 +1,27 @@
+import { ApiPropertyOptional, ApiProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsOptional, IsArray, IsEmail, IsBoolean, ValidateNested } from "class-validator";
 
 class Attendee {
   @IsEmail()
+  @ApiProperty()
   email!: string;
 
   @IsBoolean()
+  @ApiProperty()
   noShow!: boolean;
 }
 
 export class MarkNoShowInput_2024_04_15 {
   @IsBoolean()
   @IsOptional()
+  @ApiPropertyOptional()
   noShowHost?: boolean;
 
   @ValidateNested()
   @Type(() => Attendee)
   @IsArray()
   @IsOptional()
+  @ApiPropertyOptional({ type: [Attendee] })
   attendees?: Attendee[];
 }

apps/api/v2/src/ee/bookings/2024-04-15/outputs/get-booking.output.ts

@@ -1,4 +1,4 @@
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import {
   IsString,
@@ -17,145 +17,185 @@ import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
 
 class Metadata {
   @IsUrl()
+  @ApiProperty()
   videoCallUrl!: string;
 }
 
 class Location {
   @IsString()
+  @ApiProperty()
   optionValue!: string;
 
   @IsString()
+  @ApiProperty()
   value!: string;
 }
 
 class Response {
   @IsString()
+  @ApiProperty()
   name!: string;
 
   @IsEmail()
+  @ApiProperty()
   email!: string;
 
   @IsString()
+  @ApiProperty()
   notes!: string;
 
   @IsArray()
   @IsString({ each: true })
+  @ApiProperty({ type: [String] })
   guests!: string[];
 
   @ValidateNested()
   @Type(() => Location)
+  @ApiProperty({ type: Location })
   location!: Location;
 }
 
 class User {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   name!: string | null;
 
   @IsEmail()
+  @ApiProperty()
   email!: string;
 
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   username!: string | null;
 
   @IsString()
+  @ApiProperty()
   timeZone!: string;
 }
 
 class Attendee {
   @IsString()
+  @ApiProperty()
   name!: string;
 
   @IsEmail()
+  @ApiProperty()
   email!: string;
 
   @IsString()
+  @ApiProperty()
   timeZone!: string;
 }
 
 class EventType {
   @IsOptional()
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   eventName!: string | null;
 
   @IsString()
+  @ApiProperty()
   slug!: string;
 
   @IsOptional()
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   timeZone!: string | null;
 }
 
 class GetBookingData_2024_04_15 {
   @IsString()
+  @ApiProperty()
   title!: string;
 
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsString()
+  @ApiProperty()
   uid!: string;
 
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   description!: string | null;
 
   @IsObject()
+  @ApiProperty({ type: Object })
   customInputs!: any;
 
   @IsOptional()
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   smsReminderNumber!: string | null;
 
   @IsOptional()
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   recurringEventId!: string | null;
 
   @IsDateString()
+  @ApiProperty()
   startTime!: Date;
 
   @IsDateString()
+  @ApiProperty()
   endTime!: Date;
 
   @IsUrl()
+  @ApiProperty({ type: String, nullable: true })
   location!: string | null;
 
   @IsString()
+  @ApiProperty()
   status!: string;
 
+  @Type(() => Metadata)
+  @ApiProperty({ type: Metadata })
   metadata!: Metadata | any;
 
   @IsOptional()
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   cancellationReason!: string | null;
 
   @ValidateNested()
   @Type(() => Response)
+  @ApiProperty({ type: Response })
   responses!: Response | any;
 
   @IsOptional()
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   rejectionReason!: string | null;
 
   @IsString()
   @IsEmail()
+  @ApiProperty({ type: String, nullable: true })
   userPrimaryEmail!: string | null;
 
   @ValidateNested()
   @Type(() => User)
+  @ApiProperty({ type: User, nullable: true })
   user!: User | null;
 
   @ValidateNested()
   @Type(() => Attendee)
   @IsArray()
+  @ApiProperty({ type: [Attendee] })
   attendees!: Attendee[];
 
   @IsInt()
+  @ApiProperty({ type: Number, nullable: true })
   eventTypeId!: number | null;
 
   @ValidateNested()
   @Type(() => EventType)
+  @ApiProperty({ type: EventType, nullable: true })
   eventType!: EventType | null;
 }
 

apps/api/v2/src/ee/bookings/2024-04-15/outputs/get-bookings.output.ts

@@ -1,4 +1,4 @@
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import {
   IsString,
@@ -26,179 +26,230 @@ enum Status {
 
 class Attendee {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsEmail()
+  @ApiProperty()
   email!: string;
 
   @IsString()
+  @ApiProperty()
   name!: string;
 
   @IsString()
+  @ApiProperty()
   timeZone!: string;
 
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   locale!: string | null;
 
   @IsInt()
+  @ApiProperty({ type: Number, nullable: true })
   bookingId!: number | null;
 }
 
 class EventType {
-  @IsString()
   @IsOptional()
+  @IsString()
+  @ApiPropertyOptional()
   slug?: string;
 
   @IsOptional()
   @IsInt()
+  @ApiPropertyOptional()
   id?: number;
 
   @IsOptional()
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   eventName?: string | null;
 
   @IsInt()
+  @ApiProperty()
   price!: number;
 
   @IsOptional()
+  @ApiPropertyOptional()
   recurringEvent?: any;
 
   @IsString()
+  @ApiProperty()
   currency!: string;
 
   @IsObject()
+  @ApiProperty()
   metadata!: any;
 
   @IsBoolean()
   @IsOptional()
-  seatsShowAttendees?: boolean | undefined | null;
+  @ApiPropertyOptional({ type: Boolean, nullable: true })
+  seatsShowAttendees?: boolean | null;
 
   @IsBoolean()
   @IsOptional()
-  seatsShowAvailabilityCount?: boolean | undefined | null;
+  @ApiPropertyOptional({ type: Boolean, nullable: true })
+  seatsShowAvailabilityCount?: boolean | null;
 
   @IsOptional()
+  @ApiPropertyOptional({ nullable: true })
   team?: any | null;
 }
 
 class Reference {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsString()
+  @ApiProperty()
   type!: string;
 
   @IsString()
+  @ApiProperty()
   uid!: string;
 
   @IsOptional()
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   meetingId?: string | null;
 
   @IsOptional()
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   thirdPartyRecurringEventId?: string | null;
 
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   meetingPassword!: string | null;
 
   @IsOptional()
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   meetingUrl?: string | null;
 
   @IsInt()
+  @ApiProperty({ type: Number, nullable: true })
   bookingId!: number | null;
 
   @IsEmail()
+  @ApiProperty({ type: String, nullable: true })
   externalCalendarId!: string | null;
 
   @IsOptional()
+  @ApiPropertyOptional()
   deleted?: any;
 
   @IsInt()
+  @ApiProperty({ type: Number, nullable: true })
   credentialId!: number | null;
 }
 
 class User {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   name!: string | null;
 
   @IsEmail()
+  @ApiProperty()
   email!: string;
 }
 
 class GetBookingsDataEntry {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsString()
+  @ApiProperty()
   title!: string;
 
   @IsOptional()
   @IsEmail()
+  @ApiProperty({ type: String, nullable: true })
   userPrimaryEmail?: string | null;
 
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   description!: string | null;
 
   @IsObject()
+  @ApiProperty({ type: Object })
   customInputs!: object | any;
 
   @IsDateString()
+  @ApiProperty()
   startTime!: string;
 
   @IsDateString()
+  @ApiProperty()
   endTime!: string;
 
   @ValidateNested({ each: true })
   @Type(() => Attendee)
   @IsArray()
+  @ApiProperty({ type: [Attendee] })
   attendees!: Attendee[];
 
+  @ApiProperty()
   metadata!: any;
 
   @IsString()
+  @ApiProperty()
   uid!: string;
 
   @IsOptional()
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   recurringEventId!: string | null;
 
   @IsUrl()
+  @ApiProperty({ type: String, nullable: true })
   location!: string | null;
 
   @ValidateNested()
   @Type(() => EventType)
+  @ApiProperty({ type: EventType })
   eventType!: EventType;
 
   @IsEnum(Status)
-  status!: "CANCELLED" | "REJECTED" | "ACCEPTED" | "PENDING" | "AWAITING_HOST";
+  @ApiProperty({ enum: Status, type: String })
+  status!: Status;
 
   @IsBoolean()
+  @ApiProperty({ type: Boolean })
   paid!: boolean;
 
   @IsArray()
+  @ApiProperty()
   payment!: any[];
 
   @ValidateNested()
   @Type(() => Reference)
   @IsArray()
+  @ApiProperty({ type: [Reference] })
   references!: Reference[];
 
   @IsBoolean()
+  @ApiProperty({ type: Boolean })
   isRecorded!: boolean;
 
   @IsArray()
+  @ApiProperty()
   seatsReferences!: any[];
 
   @ValidateNested()
   @Type(() => User)
+  @ApiProperty({ type: User })
   user!: User | null;
 
   @IsOptional()
+  @ApiPropertyOptional()
   rescheduled?: any;
 }
 
@@ -206,17 +257,20 @@ class GetBookingsData_2024_04_15 {
   @ValidateNested()
   @Type(() => GetBookingsDataEntry)
   @IsArray()
+  @ApiProperty({ type: [GetBookingsDataEntry] })
   bookings!: GetBookingsDataEntry[];
 
   @IsArray()
+  @ApiProperty()
   recurringInfo!: any[];
 
   @IsInt()
+  @ApiProperty({ type: Number, nullable: true })
   nextCursor!: number | null;
 }
 
 export class GetBookingsOutput_2024_04_15 {
-  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS], type: String })
   @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
   status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
 

apps/api/v2/src/ee/bookings/2024-04-15/outputs/mark-no-show.output.ts

@@ -1,4 +1,4 @@
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsString, IsEnum, IsOptional, ValidateNested, IsArray, IsEmail, IsBoolean } from "class-validator";
 
@@ -6,24 +6,29 @@ import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
 
 class Attendee {
   @IsEmail()
+  @ApiProperty()
   email!: string;
 
   @IsBoolean()
+  @ApiProperty()
   noShow!: boolean;
 }
 
 class HandleMarkNoShowData_2024_04_15 {
   @IsString()
+  @ApiProperty()
   message!: string;
 
   @IsBoolean()
   @IsOptional()
+  @ApiPropertyOptional()
   noShowHost?: boolean;
 
   @ValidateNested()
   @Type(() => Attendee)
   @IsArray()
   @IsOptional()
+  @ApiPropertyOptional({ type: [Attendee] })
   attendees?: Attendee[];
 }
 

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/api-key-bookings.e2e-spec.ts

@@ -169,6 +169,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(data.eventTypeId).toEqual(eventTypeId);
             expect(data.attendees[0]).toEqual({
               name: body.attendee.name,
+              email: body.attendee.email,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/booking-fields.e2e-spec.ts

@@ -0,0 +1,526 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { CreateBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/create-booking.output";
+import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
+import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
+import { SchedulesService_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/services/schedules.service";
+import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+import * as request from "supertest";
+import { BookingsRepositoryFixture } from "test/fixtures/repository/bookings.repository.fixture";
+import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
+import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomNumber } from "test/utils/randomNumber";
+import { withApiAuth } from "test/utils/withApiAuth";
+
+import { CAL_API_VERSION_HEADER, SUCCESS_STATUS, VERSION_2024_08_13 } from "@calcom/platform-constants";
+import {
+  CreateBookingInput_2024_08_13,
+  GetBookingOutput_2024_08_13,
+  GetSeatedBookingOutput_2024_08_13,
+} from "@calcom/platform-types";
+import { BookingOutput_2024_08_13 } from "@calcom/platform-types";
+import { Booking, PlatformOAuthClient, Team, User } from "@calcom/prisma/client";
+
+const suffix = randomNumber();
+
+describe("Bookings Endpoints 2024-08-13", () => {
+  describe("Booking fields", () => {
+    let app: INestApplication;
+    let organization: Team;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let bookingsRepositoryFixture: BookingsRepositoryFixture;
+    let schedulesService: SchedulesService_2024_04_15;
+    let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
+    let oauthClientRepositoryFixture: OAuthClientRepositoryFixture;
+    let oAuthClient: PlatformOAuthClient;
+    let teamRepositoryFixture: TeamRepositoryFixture;
+
+    const userEmail = `alice-${suffix}@api.com`;
+    let user: User;
+
+    let bookingWithSplitName: Booking;
+    const splitName = {
+      firstName: "Oldie",
+      lastName: "Goldie",
+    };
+
+    let seatedBookingWithSplitName: Booking;
+
+    let eventTypeWithBookingFieldsId: number;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, SchedulesModule_2024_04_15],
+        })
+      )
+        .overrideGuard(PermissionsGuard)
+        .useValue({
+          canActivate: () => true,
+        })
+        .compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      bookingsRepositoryFixture = new BookingsRepositoryFixture(moduleRef);
+      eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
+      oauthClientRepositoryFixture = new OAuthClientRepositoryFixture(moduleRef);
+      teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      schedulesService = moduleRef.get<SchedulesService_2024_04_15>(SchedulesService_2024_04_15);
+
+      organization = await teamRepositoryFixture.create({ name: `booking fields ${suffix}` });
+      oAuthClient = await createOAuthClient(organization.id);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        platformOAuthClients: {
+          connect: {
+            id: oAuthClient.id,
+          },
+        },
+      });
+
+      const userSchedule: CreateScheduleInput_2024_04_15 = {
+        name: "working time",
+        timeZone: "Europe/Rome",
+        isDefault: true,
+      };
+      await schedulesService.createUserSchedule(user.id, userSchedule);
+      const event = await eventTypesRepositoryFixture.create(
+        { title: "peer coding", slug: `normal-booking-${randomNumber()}`, length: 60 },
+        user.id
+      );
+
+      bookingWithSplitName = await bookingsRepositoryFixture.create({
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+        startTime: new Date(Date.UTC(2020, 0, 8, 12, 0, 0)),
+        endTime: new Date(Date.UTC(2020, 0, 8, 13, 0, 0)),
+        title: "peer coding lets goo",
+        uid: "booking",
+        eventType: {
+          connect: {
+            id: event.id,
+          },
+        },
+        location: "integrations:daily",
+        customInputs: {},
+        metadata: {},
+        responses: {
+          name: splitName,
+          email: "oldie@gmail.com",
+        },
+        attendees: {
+          create: {
+            email: "oldie@gmail.com",
+            name: "Oldie Goldie",
+            locale: "lv",
+            timeZone: "Europe/Rome",
+          },
+        },
+      });
+
+      const seatedEvent = await eventTypesRepositoryFixture.create(
+        { title: "peer coding", slug: `seated-${randomNumber()}`, length: 60, seatsPerTimeSlot: 3 },
+        user.id
+      );
+
+      seatedBookingWithSplitName = await bookingsRepositoryFixture.create({
+        user: {
+          connect: {
+            id: user.id,
+          },
+        },
+        startTime: new Date(Date.UTC(2020, 0, 8, 14, 0, 0)),
+        endTime: new Date(Date.UTC(2020, 0, 8, 15, 0, 0)),
+        title: "peer coding lets goo",
+        uid: "seated-booking",
+        eventType: {
+          connect: {
+            id: seatedEvent.id,
+          },
+        },
+        location: "integrations:daily",
+        customInputs: {},
+        metadata: {},
+        responses: {
+          name: splitName,
+          email: "oldie@gmail.com",
+        },
+        attendees: {
+          create: {
+            email: "oldie@gmail.com",
+            name: "Oldie Goldie",
+            locale: "lv",
+            timeZone: "Europe/Rome",
+            bookingSeat: {
+              create: {
+                referenceUid: "unique-seat-uid",
+                data: {
+                  responses: {
+                    email: "oldie@gmail.com",
+                    name: {
+                      firstName: "Oldie",
+                      lastName: "Goldie",
+                    },
+                  },
+                },
+                metadata: {},
+                booking: {
+                  connect: {
+                    uid: "seated-booking",
+                  },
+                },
+              },
+            },
+          },
+        },
+      });
+
+      const eventTypeWithBookingFields = await eventTypesRepositoryFixture.create(
+        {
+          title: "peer coding with booking fields",
+          slug: `with-custom-booking-fields-${randomNumber()}`,
+          length: 60,
+          bookingFields: [
+            {
+              name: "name",
+              type: "name",
+              label: "",
+              sources: [
+                {
+                  id: "default",
+                  type: "default",
+                  label: "Default",
+                },
+              ],
+              variant: "fullName",
+              editable: "system",
+              required: true,
+              placeholder: "",
+              defaultLabel: "your_name",
+              variantsConfig: {
+                variants: {
+                  fullName: {
+                    fields: [
+                      {
+                        name: "fullName",
+                        type: "text",
+                        label: "your_name",
+                        required: true,
+                        placeholder: "",
+                      },
+                    ],
+                  },
+                  firstAndLastName: {
+                    fields: [
+                      {
+                        name: "firstName",
+                        type: "text",
+                        label: "name",
+                        required: true,
+                        placeholder: "lauris",
+                      },
+                      {
+                        name: "lastName",
+                        type: "text",
+                        label: "surname",
+                        required: true,
+                        placeholder: "skraucis",
+                      },
+                    ],
+                  },
+                },
+              },
+              disableOnPrefill: false,
+            },
+            {
+              name: "email",
+              type: "email",
+              sources: [
+                {
+                  id: "default",
+                  type: "default",
+                  label: "Default",
+                },
+              ],
+              editable: "system",
+              required: true,
+              defaultLabel: "email_address",
+            },
+            {
+              name: "location",
+              type: "radioInput",
+              sources: [
+                {
+                  id: "default",
+                  type: "default",
+                  label: "Default",
+                },
+              ],
+              editable: "system",
+              required: false,
+              defaultLabel: "location",
+              getOptionsAt: "locations",
+              optionsInputs: {
+                phone: {
+                  type: "phone",
+                  required: true,
+                  placeholder: "",
+                },
+                somewhereElse: {
+                  type: "text",
+                  required: true,
+                  placeholder: "",
+                },
+                attendeeInPerson: {
+                  type: "address",
+                  required: true,
+                  placeholder: "",
+                },
+              },
+              hideWhenJustOneOption: true,
+            },
+            {
+              name: "title",
+              type: "text",
+              hidden: true,
+              sources: [
+                {
+                  id: "default",
+                  type: "default",
+                  label: "Default",
+                },
+              ],
+              editable: "system-but-optional",
+              required: true,
+              defaultLabel: "what_is_this_meeting_about",
+              defaultPlaceholder: "",
+            },
+            {
+              name: "notes",
+              type: "textarea",
+              sources: [
+                {
+                  id: "default",
+                  type: "default",
+                  label: "Default",
+                },
+              ],
+              editable: "system-but-optional",
+              required: false,
+              defaultLabel: "additional_notes",
+              defaultPlaceholder: "share_additional_notes",
+            },
+            {
+              name: "guests",
+              type: "multiemail",
+              hidden: false,
+              sources: [
+                {
+                  id: "default",
+                  type: "default",
+                  label: "Default",
+                },
+              ],
+              editable: "system-but-optional",
+              required: false,
+              defaultLabel: "additional_guests",
+              defaultPlaceholder: "email",
+            },
+            {
+              name: "rescheduleReason",
+              type: "textarea",
+              views: [
+                {
+                  id: "reschedule",
+                  label: "Reschedule View",
+                },
+              ],
+              sources: [
+                {
+                  id: "default",
+                  type: "default",
+                  label: "Default",
+                },
+              ],
+              editable: "system-but-optional",
+              required: false,
+              defaultLabel: "reason_for_reschedule",
+              defaultPlaceholder: "reschedule_placeholder",
+            },
+            {
+              name: "favorite-movie",
+              type: "text",
+              label: "favorite movie",
+              sources: [
+                {
+                  id: "user",
+                  type: "user",
+                  label: "User",
+                  fieldRequired: true,
+                },
+              ],
+              editable: "user",
+              required: true,
+              placeholder: "matrix",
+              disableOnPrefill: false,
+            },
+          ],
+        },
+        user.id
+      );
+      eventTypeWithBookingFieldsId = eventTypeWithBookingFields.id;
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+
+      await app.init();
+    });
+
+    async function createOAuthClient(organizationId: number) {
+      const data = {
+        logo: "logo-url",
+        name: "name",
+        redirectUris: ["http://localhost:5555"],
+        permissions: 32,
+      };
+      const secret = "secret";
+
+      const client = await oauthClientRepositoryFixture.create(organizationId, data, secret);
+      return client;
+    }
+
+    describe("get individual booking", () => {
+      it("should should get a seated booking with split name responses", async () => {
+        return request(app.getHttpServer())
+          .get(`/v2/bookings/${bookingWithSplitName.uid}`)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(200)
+          .then(async (response) => {
+            const responseBody: GetBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(responseDataIsBooking(responseBody.data)).toBe(true);
+
+            if (responseDataIsBooking(responseBody.data)) {
+              const data: BookingOutput_2024_08_13 = responseBody.data;
+              expect(data.attendees[0].name).toEqual(`${splitName.firstName} ${splitName.lastName}`);
+              expect(data.bookingFieldsResponses.name).toEqual(splitName);
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibily recurring bookings"
+              );
+            }
+          });
+      });
+
+      it("should should get a seated booking with split name responses", async () => {
+        return request(app.getHttpServer())
+          .get(`/v2/bookings/${seatedBookingWithSplitName.uid}`)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(200)
+          .then(async (response) => {
+            const responseBody: GetBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(responseDataIsBooking(responseBody.data)).toBe(true);
+
+            if (responseDataIsBooking(responseBody.data)) {
+              // eslint-disable-next-line
+              // @ts-ignore
+              const data: GetSeatedBookingOutput_2024_08_13 = responseBody.data;
+              console.log("asap data", JSON.stringify(data, null, 2));
+              expect(data.attendees[0].name).toEqual(`${splitName.firstName} ${splitName.lastName}`);
+              expect(data.attendees[0].bookingFieldsResponses.name).toEqual(splitName);
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibily recurring bookings"
+              );
+            }
+          });
+      });
+    });
+
+    describe("make booking", () => {
+      it("should not be able to book an event type with custom required booking fields if they are missing in bookingFieldsResponses", async () => {
+        const body: CreateBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+          eventTypeId: eventTypeWithBookingFieldsId,
+          attendee: {
+            name: "Mr Proper",
+            email: "mr_proper@gmail.com",
+            timeZone: "Europe/Rome",
+            language: "it",
+          },
+          location: "https://meet.google.com/abc-def-ghi",
+        };
+        return request(app.getHttpServer())
+          .post(`/v2/bookings`)
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(400);
+      });
+
+      it("should be able to book an event type with custom required booking fields", async () => {
+        const body: CreateBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+          eventTypeId: eventTypeWithBookingFieldsId,
+          attendee: {
+            name: "Mr Proper",
+            email: "mr_proper@gmail.com",
+            timeZone: "Europe/Rome",
+            language: "it",
+          },
+          location: "https://meet.google.com/abc-def-ghi",
+          bookingFieldsResponses: {
+            "favorite-movie": "lord of the rings",
+          },
+        };
+        return request(app.getHttpServer())
+          .post(`/v2/bookings`)
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .expect(201)
+          .then(async (response) => {
+            const responseBody: CreateBookingOutput_2024_08_13 = response.body;
+            expect(responseBody.status).toEqual(SUCCESS_STATUS);
+            expect(responseBody.data).toBeDefined();
+            expect(responseDataIsBooking(responseBody.data)).toBe(true);
+
+            if (responseDataIsBooking(responseBody.data)) {
+              const data: BookingOutput_2024_08_13 = responseBody.data;
+              expect(data.bookingFieldsResponses["favorite-movie"]).toEqual("lord of the rings");
+            } else {
+              throw new Error(
+                "Invalid response data - expected booking but received array of possibily recurring bookings"
+              );
+            }
+          });
+      });
+    });
+
+    afterAll(async () => {
+      await oauthClientRepositoryFixture.delete(oAuthClient.id);
+      await teamRepositoryFixture.delete(organization.id);
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await bookingsRepositoryFixture.deleteAllBookings(user.id, user.email);
+      await app.close();
+    });
+  });
+
+  function responseDataIsBooking(data: any): data is BookingOutput_2024_08_13 {
+    return !Array.isArray(data) && typeof data === "object" && data && "id" in data;
+  }
+});

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/emails/team-emails.e2e-spec.ts

@@ -34,6 +34,7 @@ import {
   OrganizerCancelledEmail,
   AttendeeCancelledEmail,
   OrganizerReassignedEmail,
+  AttendeeUpdatedEmail,
 } from "@calcom/platform-libraries";
 import {
   CreateBookingInput_2024_08_13,
@@ -61,10 +62,12 @@ jest
 jest
   .spyOn(OrganizerCancelledEmail.prototype, "getHtml")
   .mockImplementation(() => Promise.resolve("<p>email</p>"));
-
 jest
   .spyOn(OrganizerReassignedEmail.prototype, "getHtml")
   .mockImplementation(() => Promise.resolve("<p>email</p>"));
+jest
+  .spyOn(AttendeeUpdatedEmail.prototype, "getHtml")
+  .mockImplementation(() => Promise.resolve("<p>email</p>"));
 
 type EmailSetup = {
   team: Team;
@@ -681,6 +684,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
             expect(responseBody.data).toBeDefined();
             expect(AttendeeCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
             expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(AttendeeUpdatedEmail.prototype.getHtml).not.toHaveBeenCalled();
             emailsDisabledSetup.roundRobinEventType.currentHostId = reassignToId;
           });
       });
@@ -697,6 +701,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
             expect(AttendeeCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
             expect(OrganizerScheduledEmail.prototype.getHtml).not.toHaveBeenCalled();
             expect(OrganizerReassignedEmail.prototype.getHtml).not.toHaveBeenCalled();
+            expect(AttendeeUpdatedEmail.prototype.getHtml).not.toHaveBeenCalled();
           });
       });
     });
@@ -898,6 +903,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
             expect(responseBody.data).toBeDefined();
             expect(AttendeeCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
             expect(OrganizerScheduledEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(AttendeeUpdatedEmail.prototype.getHtml).toHaveBeenCalled();
             emailsDisabledSetup.roundRobinEventType.currentHostId = reassignToId;
           });
       });
@@ -914,6 +920,7 @@ describe("Bookings Endpoints 2024-08-13 team emails", () => {
             expect(AttendeeCancelledEmail.prototype.getHtml).not.toHaveBeenCalled();
             expect(OrganizerScheduledEmail.prototype.getHtml).toHaveBeenCalled();
             expect(OrganizerReassignedEmail.prototype.getHtml).toHaveBeenCalled();
+            expect(AttendeeUpdatedEmail.prototype.getHtml).toHaveBeenCalled();
           });
       });
     });

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/recurring-bookings.e2e-spec.ts

@@ -181,6 +181,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(firstBooking.eventTypeId).toEqual(recurringEventTypeId);
             expect(firstBooking.attendees[0]).toEqual({
               name: body.attendee.name,
+              email: body.attendee.email,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,
@@ -201,6 +202,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(secondBooking.recurringBookingUid).toBeDefined();
             expect(secondBooking.attendees[0]).toEqual({
               name: body.attendee.name,
+              email: body.attendee.email,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,
@@ -256,6 +258,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(firstBooking.eventTypeId).toEqual(recurringEventTypeId);
             expect(firstBooking.attendees[0]).toEqual({
               name: body.attendee.name,
+              email: body.attendee.email,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,
@@ -277,6 +280,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(secondBooking.recurringBookingUid).toBeDefined();
             expect(secondBooking.attendees[0]).toEqual({
               name: body.attendee.name,
+              email: body.attendee.email,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,
@@ -296,6 +300,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(thirdBooking.recurringBookingUid).toBeDefined();
             expect(thirdBooking.attendees[0]).toEqual({
               name: body.attendee.name,
+              email: body.attendee.email,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/seated-bookings.e2e-spec.ts

@@ -205,6 +205,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(data.attendees.length).toEqual(1);
             expect(data.attendees[0]).toEqual({
               name: body.attendee.name,
+              email: body.attendee.email,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,
@@ -278,6 +279,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             const firstAttendee = data.attendees.find((attendee) => attendee.name === nameAttendeeOne);
             expect(firstAttendee).toEqual({
               name: createdSeatedBooking.attendees[0].name,
+              email: createdSeatedBooking.attendees[0].email,
               timeZone: createdSeatedBooking.attendees[0].timeZone,
               language: createdSeatedBooking.attendees[0].language,
               absent: false,
@@ -291,6 +293,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             const secondAttendee = data.attendees.find((attendee) => attendee.name === nameAttendeeTwo);
             expect(secondAttendee).toEqual({
               name: body.attendee.name,
+              email: body.attendee.email,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,
@@ -368,6 +371,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(firstBooking.attendees.length).toEqual(1);
             expect(firstBooking.attendees[0]).toEqual({
               name: body.attendee.name,
+              email: body.attendee.email,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,
@@ -402,6 +406,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(secondBooking.attendees.length).toEqual(1);
             expect(secondBooking.attendees[0]).toEqual({
               name: body.attendee.name,
+              email: body.attendee.email,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,
@@ -576,6 +581,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             const attendee = createdSeatedBooking.attendees.find((a) => a.seatUid === body.seatUid);
             expect(data.attendees[0]).toEqual({
               name: attendee?.name,
+              email: attendee?.email,
               timeZone: attendee?.timeZone,
               language: attendee?.language,
               absent: false,
@@ -835,6 +841,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(firstBooking.attendees.length).toEqual(1);
             expect(firstBooking.attendees[0]).toEqual({
               name: body.attendee.name,
+              email: body.attendee.email,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,
@@ -869,6 +876,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(secondBooking.attendees.length).toEqual(1);
             expect(secondBooking.attendees[0]).toEqual({
               name: body.attendee.name,
+              email: body.attendee.email,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,
@@ -946,6 +954,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(firstBooking.attendees.length).toEqual(2);
             expect(firstBooking.attendees[0]).toEqual({
               name: nameAttendeeOne,
+              email: emailAttendeeOne,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,
@@ -958,6 +967,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             });
             expect(firstBooking.attendees[1]).toEqual({
               name: nameAttendeeTwo,
+              email: emailAttendeeTwo,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,
@@ -992,6 +1002,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             expect(secondBooking.attendees.length).toEqual(2);
             expect(secondBooking.attendees[0]).toEqual({
               name: nameAttendeeOne,
+              email: emailAttendeeOne,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,
@@ -1004,6 +1015,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             });
             expect(secondBooking.attendees[1]).toEqual({
               name: nameAttendeeTwo,
+              email: emailAttendeeTwo,
               timeZone: body.attendee.timeZone,
               language: body.attendee.language,
               absent: false,

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/team-bookings.e2e-spec.ts

@@ -307,6 +307,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.attendees.length).toEqual(1);
               expect(data.attendees[0]).toEqual({
                 name: body.attendee.name,
+                email: body.attendee.email,
                 timeZone: body.attendee.timeZone,
                 language: body.attendee.language,
                 absent: false,
@@ -359,12 +360,14 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.attendees.length).toEqual(2);
               expect(data.attendees[0]).toEqual({
                 name: body.attendee.name,
+                email: body.attendee.email,
                 timeZone: body.attendee.timeZone,
                 language: body.attendee.language,
                 absent: false,
               });
               expect(data.attendees[1]).toEqual({
                 name: teamUser2.name,
+                email: teamUser2.email,
                 timeZone: teamUser2.timeZone,
                 language: teamUser2.locale,
                 absent: false,

apps/api/v2/src/ee/bookings/2024-08-13/controllers/e2e/user-bookings.e2e-spec.ts

@@ -96,6 +96,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
 
       user = await userRepositoryFixture.create({
         email: userEmail,
+        username: `bob-${Math.floor(Math.random() * 1000)}@gmail.com`,
         platformOAuthClients: {
           connect: {
             id: oAuthClient.id,
@@ -351,6 +352,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.id).toBeDefined();
               expect(data.uid).toBeDefined();
               expect(data.hosts[0].id).toEqual(user.id);
+              expect(data.hosts[0].username).toEqual(user.username);
               expect(data.status).toEqual("accepted");
               expect(data.start).toEqual(body.start);
               expect(data.end).toEqual(new Date(Date.UTC(2030, 0, 8, 14, 0, 0)).toISOString());
@@ -362,6 +364,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               });
               expect(data.attendees[0]).toEqual({
                 name: body.attendee.name,
+                email: body.attendee.email,
                 timeZone: body.attendee.timeZone,
                 language: body.attendee.language,
                 absent: false,
@@ -432,6 +435,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(firstBooking.eventTypeId).toEqual(recurringEventTypeId);
               expect(firstBooking.attendees[0]).toEqual({
                 name: body.attendee.name,
+                email: body.attendee.email,
                 timeZone: body.attendee.timeZone,
                 language: body.attendee.language,
                 absent: false,
@@ -453,6 +457,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(secondBooking.recurringBookingUid).toBeDefined();
               expect(secondBooking.attendees[0]).toEqual({
                 name: body.attendee.name,
+                email: body.attendee.email,
                 timeZone: body.attendee.timeZone,
                 language: body.attendee.language,
                 absent: false,
@@ -473,6 +478,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(thirdBooking.recurringBookingUid).toBeDefined();
               expect(thirdBooking.attendees[0]).toEqual({
                 name: body.attendee.name,
+                email: body.attendee.email,
                 timeZone: body.attendee.timeZone,
                 language: body.attendee.language,
                 absent: false,
@@ -508,6 +514,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.id).toEqual(createdBooking.id);
               expect(data.uid).toEqual(createdBooking.uid);
               expect(data.hosts[0].id).toEqual(user.id);
+              expect(data.hosts[0].username).toEqual(user.username);
               expect(data.status).toEqual(createdBooking.status);
               expect(data.start).toEqual(createdBooking.start);
               expect(data.end).toEqual(createdBooking.end);

apps/api/v2/src/ee/bookings/2024-08-13/outputs/cancel-booking.output.ts

@@ -10,7 +10,12 @@ import {
   RecurringBookingOutput_2024_08_13,
 } from "@calcom/platform-types";
 
-@ApiExtraModels(BookingOutput_2024_08_13, RecurringBookingOutput_2024_08_13)
+@ApiExtraModels(
+  BookingOutput_2024_08_13,
+  RecurringBookingOutput_2024_08_13,
+  GetSeatedBookingOutput_2024_08_13,
+  GetRecurringSeatedBookingOutput_2024_08_13
+)
 export class CancelBookingOutput_2024_08_13 {
   @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
   @IsEnum([SUCCESS_STATUS, ERROR_STATUS])

apps/api/v2/src/ee/bookings/2024-08-13/outputs/create-booking.output.ts

@@ -10,7 +10,12 @@ import {
   CreateRecurringSeatedBookingOutput_2024_08_13,
 } from "@calcom/platform-types";
 
-@ApiExtraModels(BookingOutput_2024_08_13, RecurringBookingOutput_2024_08_13)
+@ApiExtraModels(
+  BookingOutput_2024_08_13,
+  RecurringBookingOutput_2024_08_13,
+  CreateSeatedBookingOutput_2024_08_13,
+  CreateRecurringSeatedBookingOutput_2024_08_13
+)
 export class CreateBookingOutput_2024_08_13 {
   @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
   @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
@@ -21,6 +26,8 @@ export class CreateBookingOutput_2024_08_13 {
     oneOf: [
       { $ref: getSchemaPath(BookingOutput_2024_08_13) },
       { type: "array", items: { $ref: getSchemaPath(RecurringBookingOutput_2024_08_13) } },
+      { $ref: getSchemaPath(CreateSeatedBookingOutput_2024_08_13) },
+      { type: "array", items: { $ref: getSchemaPath(CreateRecurringSeatedBookingOutput_2024_08_13) } },
     ],
     description:
       "Booking data, which can be either a BookingOutput object or an array of RecurringBookingOutput objects",

apps/api/v2/src/ee/bookings/2024-08-13/outputs/reschedule-booking.output.ts

@@ -12,7 +12,12 @@ import {
   RecurringBookingOutput_2024_08_13,
 } from "@calcom/platform-types";
 
-@ApiExtraModels(BookingOutput_2024_08_13, RecurringBookingOutput_2024_08_13)
+@ApiExtraModels(
+  BookingOutput_2024_08_13,
+  RecurringBookingOutput_2024_08_13,
+  CreateSeatedBookingOutput_2024_08_13,
+  CreateRecurringSeatedBookingOutput_2024_08_13
+)
 export class RescheduleBookingOutput_2024_08_13 {
   @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
   @IsEnum([SUCCESS_STATUS, ERROR_STATUS])

apps/api/v2/src/ee/bookings/2024-08-13/services/bookings.service.ts

@@ -10,6 +10,7 @@ import { UsersRepository, UserWithProfile } from "@/modules/users/users.reposito
 import { Injectable, Logger, NotFoundException } from "@nestjs/common";
 import { BadRequestException } from "@nestjs/common";
 import { Request } from "express";
+import { z } from "zod";
 
 import {
   handleNewBooking,
@@ -38,6 +39,7 @@ import {
   CancelBookingInput,
 } from "@calcom/platform-types";
 import { PrismaClient } from "@calcom/prisma";
+import { EventType } from "@calcom/prisma/client";
 
 type CreatedBooking = {
   hosts: { id: number }[];
@@ -45,6 +47,14 @@ type CreatedBooking = {
   start: string;
 };
 
+const eventTypeBookingFieldSchema = z.object({
+  name: z.string(),
+  required: z.boolean(),
+  editable: z.string(),
+});
+
+const eventTypeBookingFieldsSchema = z.array(eventTypeBookingFieldSchema);
+
 @Injectable()
 export class BookingsService_2024_08_13 {
   private readonly logger = new Logger("BookingsService");
@@ -70,6 +80,8 @@ export class BookingsService_2024_08_13 {
       const isRecurring = !!eventType?.recurringEvent;
       const isSeated = !!eventType?.seatsPerTimeSlot;
 
+      await this.hasRequiredBookingFieldsResponses(body, eventType);
+
       if (isRecurring && isSeated) {
         return await this.createRecurringSeatedBooking(request, body);
       }
@@ -91,6 +103,28 @@ export class BookingsService_2024_08_13 {
     }
   }
 
+  async hasRequiredBookingFieldsResponses(body: CreateBookingInput, eventType: EventType | null) {
+    const bookingFields = body.bookingFieldsResponses;
+    if (!bookingFields || !eventType || !eventType.bookingFields) {
+      return true;
+    }
+
+    // note(Lauris): we filter out system fields, because some of them are set by default and name and email are passed in the body.attendee
+    const eventTypeBookingFields = eventTypeBookingFieldsSchema
+      .parse(eventType.bookingFields)
+      .filter((field) => !field.editable.startsWith("system"));
+
+    for (const field of eventTypeBookingFields) {
+      if (field.required && !(field.name in bookingFields)) {
+        throw new BadRequestException(`
+          Missing required booking field response: ${field.name} - it is required by the event type booking fields, but missing in the bookingFieldsResponses.
+          You can fetch the event type with ID ${eventType.id} to see the required fields.`);
+      }
+    }
+
+    return true;
+  }
+
   async createInstantBooking(request: Request, body: CreateInstantBookingInput_2024_08_13) {
     const bookingRequest = await this.inputService.createBookingRequest(request, body);
     const booking = await handleInstantMeeting(bookingRequest);
@@ -306,7 +340,10 @@ export class BookingsService_2024_08_13 {
     }
 
     const bookingRequest = await this.inputService.createCancelBookingRequest(request, bookingUid, body);
-    await handleCancelBooking(bookingRequest);
+    const res = await handleCancelBooking(bookingRequest);
+    if (!res.onlyRemovedAttendee) {
+      await this.billingService.cancelUsageByBookingUid(res.bookingUid);
+    }
 
     if ("cancelSubsequentBookings" in body && body.cancelSubsequentBookings) {
       return this.getAllRecurringBookingsByIndividualUid(bookingUid);
@@ -329,12 +366,17 @@ export class BookingsService_2024_08_13 {
 
   async markAbsent(bookingUid: string, bookingOwnerId: number, body: MarkAbsentBookingInput_2024_08_13) {
     const bodyTransformed = this.inputService.transformInputMarkAbsentBooking(body);
+    const bookingBefore = await this.bookingsRepository.getByUid(bookingUid);
+    const platformClientParams = bookingBefore?.eventTypeId
+      ? await this.inputService.getOAuthClientParams(bookingBefore.eventTypeId)
+      : undefined;
 
     await handleMarkNoShow({
       bookingUid,
       attendees: bodyTransformed.attendees,
       noShowHost: bodyTransformed.noShowHost,
       userId: bookingOwnerId,
+      platformClientParams,
     });
 
     const booking = await this.bookingsRepository.getByUidWithAttendeesAndUserAndEvent(bookingUid);
@@ -389,7 +431,11 @@ export class BookingsService_2024_08_13 {
       throw new NotFoundException(`Booking with uid=${bookingUid} was not found in the database`);
     }
 
-    const emailsEnabled = booking.eventTypeId ? await this.getEmailsEnabled(booking.eventTypeId) : true;
+    const platformClientParams = booking.eventTypeId
+      ? await this.inputService.getOAuthClientParams(booking.eventTypeId)
+      : undefined;
+
+    const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
 
     const profile = this.usersService.getUserMainProfile(requestUser);
 
@@ -397,6 +443,7 @@ export class BookingsService_2024_08_13 {
       bookingId: booking.id,
       orgId: profile?.organizationId || null,
       emailsEnabled,
+      platformClientParams,
     });
 
     const reassigned = await this.bookingsRepository.getByUidWithUser(bookingUid);
@@ -407,12 +454,6 @@ export class BookingsService_2024_08_13 {
     return this.outputService.getOutputReassignedBooking(reassigned);
   }
 
-  async getEmailsEnabled(eventTypeId: number) {
-    const oAuthParams = await this.inputService.getOAuthClientParams(eventTypeId);
-    const emailsEnabled = oAuthParams ? oAuthParams.arePlatformEmailsEnabled : true;
-    return emailsEnabled;
-  }
-
   async reassignBookingToUser(
     bookingUid: string,
     newUserId: number,
@@ -429,7 +470,11 @@ export class BookingsService_2024_08_13 {
       throw new NotFoundException(`User with id=${newUserId} was not found in the database`);
     }
 
-    const emailsEnabled = booking.eventTypeId ? await this.getEmailsEnabled(booking.eventTypeId) : true;
+    const platformClientParams = booking.eventTypeId
+      ? await this.inputService.getOAuthClientParams(booking.eventTypeId)
+      : undefined;
+
+    const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
 
     const profile = this.usersService.getUserMainProfile(user);
 
@@ -440,6 +485,7 @@ export class BookingsService_2024_08_13 {
       reassignReason: body.reason,
       reassignedById,
       emailsEnabled,
+      platformClientParams,
     });
 
     return this.outputService.getOutputReassignedBooking(reassigned);
@@ -451,7 +497,11 @@ export class BookingsService_2024_08_13 {
       throw new NotFoundException(`Booking with uid=${bookingUid} was not found in the database`);
     }
 
-    const emailsEnabled = booking.eventTypeId ? await this.getEmailsEnabled(booking.eventTypeId) : true;
+    const platformClientParams = booking.eventTypeId
+      ? await this.inputService.getOAuthClientParams(booking.eventTypeId)
+      : undefined;
+
+    const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
 
     await confirmBookingHandler({
       ctx: {
@@ -462,6 +512,7 @@ export class BookingsService_2024_08_13 {
         confirmed: true,
         recurringEventId: booking.recurringEventId,
         emailsEnabled,
+        platformClientParams,
       },
     });
 
@@ -474,7 +525,11 @@ export class BookingsService_2024_08_13 {
       throw new NotFoundException(`Booking with uid=${bookingUid} was not found in the database`);
     }
 
-    const emailsEnabled = booking.eventTypeId ? await this.getEmailsEnabled(booking.eventTypeId) : true;
+    const platformClientParams = booking.eventTypeId
+      ? await this.inputService.getOAuthClientParams(booking.eventTypeId)
+      : undefined;
+
+    const emailsEnabled = platformClientParams ? platformClientParams.arePlatformEmailsEnabled : true;
 
     await confirmBookingHandler({
       ctx: {
@@ -486,6 +541,7 @@ export class BookingsService_2024_08_13 {
         recurringEventId: booking.recurringEventId,
         reason,
         emailsEnabled,
+        platformClientParams,
       },
     });
 

apps/api/v2/src/ee/bookings/2024-08-13/services/input.service.ts

@@ -1,7 +1,7 @@
 import { BookingsRepository_2024_08_13 } from "@/ee/bookings/2024-08-13/bookings.repository";
 import {
   bookingResponsesSchema,
-  seatedBookingResponsesSchema,
+  seatedBookingDataSchema,
 } from "@/ee/bookings/2024-08-13/services/output.service";
 import { EventTypesRepository_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.repository";
 import { hashAPIKey, isApiKey, stripApiKey } from "@/lib/api-key";
@@ -340,7 +340,7 @@ export class InputBookingsService_2024_08_13 {
       throw new NotFoundException(`Seat with uid=${inputBooking.seatUid} does not exist.`);
     }
 
-    const { responses: bookingResponses } = seatedBookingResponsesSchema.parse(seat.data);
+    const { responses: bookingResponses } = seatedBookingDataSchema.parse(seat.data);
     const attendee = booking.attendees.find((attendee) => attendee.email === bookingResponses.email);
 
     if (!attendee) {

apps/api/v2/src/ee/bookings/2024-08-13/services/output.service.ts

@@ -1,4 +1,11 @@
 import { BookingsRepository_2024_08_13 } from "@/ee/bookings/2024-08-13/bookings.repository";
+import {
+  defaultBookingMetadata,
+  defaultBookingResponses,
+  defaultSeatedBookingData,
+  defaultSeatedBookingMetadata,
+} from "@/lib/safe-parse/default-responses-booking";
+import { safeParse } from "@/lib/safe-parse/safe-parse";
 import { Injectable } from "@nestjs/common";
 import { plainToClass } from "class-transformer";
 import { DateTime } from "luxon";
@@ -20,22 +27,40 @@ import { Booking, BookingSeat } from "@calcom/prisma/client";
 export const bookingResponsesSchema = z
   .object({
     email: z.string(),
-    name: z.string(),
+    name: z.union([
+      z.string(),
+      z.object({
+        firstName: z.string(),
+        lastName: z.string(),
+      }),
+    ]),
     guests: z.array(z.string()).optional(),
     rescheduleReason: z.string().optional(),
   })
-  .passthrough();
+  .passthrough()
+  .describe("BookingResponses");
 
-export const seatedBookingResponsesSchema = z
+export const seatedBookingDataSchema = z
   .object({
     responses: z
       .object({
         email: z.string(),
-        name: z.string(),
+        name: z.union([
+          z.string(),
+          z.object({
+            firstName: z.string(),
+            lastName: z.string(),
+          }),
+        ]),
       })
       .passthrough(),
   })
-  .passthrough();
+  .passthrough()
+  .describe("SeatedBookingData");
+
+const seatedBookingMetadataSchema = z.object({}).catchall(z.string()).describe("SeatedBookingMetadata");
+
+type DatabaseUser = { id: number; name: string | null; email: string; username: string | null };
 
 type DatabaseBooking = Booking & {
   eventType: {
@@ -50,20 +75,13 @@ type DatabaseBooking = Booking & {
     noShow: boolean | null;
     bookingSeat?: BookingSeat | null;
   }[];
-  user: { id: number; name: string | null; email: string } | null;
+  user: DatabaseUser | null;
   createdAt: Date;
 };
 
-type BookingWithUser = Booking & { user: { id: number; name: string | null; email: string } | null };
+type BookingWithUser = Booking & { user: DatabaseUser | null };
 
-const bookingUserMetadataSchema = bookingMetadataSchema.transform((data) => {
-  if (data === null) return {};
-  // note(Lauris): return only user defined metadata
-  const { videoCallUrl, ...rest } = data;
-  return rest;
-});
-
-const seatedBookingMetadataSchema = z.object({}).catchall(z.string());
+type DatabaseMetadata = z.infer<typeof bookingMetadataSchema>;
 
 @Injectable()
 export class OutputBookingsService_2024_08_13 {
@@ -73,16 +91,20 @@ export class OutputBookingsService_2024_08_13 {
     const dateStart = DateTime.fromISO(databaseBooking.startTime.toISOString());
     const dateEnd = DateTime.fromISO(databaseBooking.endTime.toISOString());
     const duration = dateEnd.diff(dateStart, "minutes").minutes;
-
-    const bookingResponses = bookingResponsesSchema.parse(databaseBooking.responses);
-    const metadata = bookingUserMetadataSchema.parse(databaseBooking.metadata);
+    const bookingResponses = safeParse(
+      bookingResponsesSchema,
+      databaseBooking.responses,
+      defaultBookingResponses
+    );
+    const metadata = safeParse(bookingMetadataSchema, databaseBooking.metadata, defaultBookingMetadata);
+    const location = metadata?.videoCallUrl || databaseBooking.location;
 
     const booking = {
       id: databaseBooking.id,
       uid: databaseBooking.uid,
       title: databaseBooking.title,
       description: databaseBooking.description,
-      hosts: [databaseBooking.user],
+      hosts: [this.getHost(databaseBooking.user)],
       status: databaseBooking.status.toLowerCase(),
       cancellationReason: databaseBooking.cancellationReason || undefined,
       reschedulingReason: bookingResponses?.rescheduledReason,
@@ -101,9 +123,9 @@ export class OutputBookingsService_2024_08_13 {
         absent: !!attendee.noShow,
       })),
       guests: bookingResponses.guests,
-      location: databaseBooking.location,
+      location,
       // note(Lauris): meetingUrl is deprecated
-      meetingUrl: databaseBooking.location,
+      meetingUrl: location,
       absentHost: !!databaseBooking.noShowHost,
       createdAt: databaseBooking.createdAt,
     };
@@ -111,10 +133,34 @@ export class OutputBookingsService_2024_08_13 {
     const bookingTransformed = plainToClass(BookingOutput_2024_08_13, booking, { strategy: "excludeAll" });
     // note(Lauris): I don't know why plainToClass erases bookings responses and metadata so attaching manually
     bookingTransformed.bookingFieldsResponses = bookingResponses;
-    bookingTransformed.metadata = metadata;
+    bookingTransformed.metadata = this.getUserDefinedMetadata(metadata);
     return bookingTransformed;
   }
 
+  getUserDefinedMetadata(databaseMetadata: DatabaseMetadata) {
+    if (databaseMetadata === null) return {};
+
+    const { videoCallUrl, ...userDefinedMetadata } = databaseMetadata;
+
+    return userDefinedMetadata;
+  }
+
+  getHost(user: DatabaseUser | null) {
+    if (!user) {
+      return {
+        id: "unknown",
+        name: "unknown",
+        email: "unknown",
+        username: "unknown",
+      };
+    }
+
+    return {
+      ...user,
+      username: user.username || "unknown",
+    };
+  }
+
   async getOutputRecurringBookings(bookingsIds: number[]) {
     const transformed = [];
 
@@ -134,16 +180,20 @@ export class OutputBookingsService_2024_08_13 {
     const dateStart = DateTime.fromISO(databaseBooking.startTime.toISOString());
     const dateEnd = DateTime.fromISO(databaseBooking.endTime.toISOString());
     const duration = dateEnd.diff(dateStart, "minutes").minutes;
-
-    const bookingResponses = bookingResponsesSchema.parse(databaseBooking.responses);
-    const metadata = bookingUserMetadataSchema.parse(databaseBooking.metadata);
+    const bookingResponses = safeParse(
+      bookingResponsesSchema,
+      databaseBooking.responses,
+      defaultBookingResponses
+    );
+    const metadata = safeParse(bookingMetadataSchema, databaseBooking.metadata, defaultBookingMetadata);
+    const location = metadata?.videoCallUrl || databaseBooking.location;
 
     const booking = {
       id: databaseBooking.id,
       uid: databaseBooking.uid,
       title: databaseBooking.title,
       description: databaseBooking.description,
-      hosts: [databaseBooking.user],
+      hosts: [this.getHost(databaseBooking.user)],
       status: databaseBooking.status.toLowerCase(),
       cancellationReason: databaseBooking.cancellationReason || undefined,
       reschedulingReason: bookingResponses?.rescheduledReason,
@@ -162,9 +212,9 @@ export class OutputBookingsService_2024_08_13 {
         absent: !!attendee.noShow,
       })),
       guests: bookingResponses.guests,
-      location: databaseBooking.location,
+      location,
       // note(Lauris): meetingUrl is deprecated
-      meetingUrl: databaseBooking.location,
+      meetingUrl: location,
       recurringBookingUid: databaseBooking.recurringEventId,
       absentHost: !!databaseBooking.noShowHost,
       bookingFieldsResponses: databaseBooking.responses,
@@ -176,7 +226,7 @@ export class OutputBookingsService_2024_08_13 {
     });
     // note(Lauris): I don't know why plainToClass erases bookings responses and metadata so attaching manually
     bookingTransformed.bookingFieldsResponses = bookingResponses;
-    bookingTransformed.metadata = metadata;
+    bookingTransformed.metadata = this.getUserDefinedMetadata(metadata);
     return bookingTransformed;
   }
 
@@ -192,13 +242,15 @@ export class OutputBookingsService_2024_08_13 {
     const dateStart = DateTime.fromISO(databaseBooking.startTime.toISOString());
     const dateEnd = DateTime.fromISO(databaseBooking.endTime.toISOString());
     const duration = dateEnd.diff(dateStart, "minutes").minutes;
+    const metadata = safeParse(bookingMetadataSchema, databaseBooking.metadata, defaultBookingMetadata);
+    const location = metadata?.videoCallUrl || databaseBooking.location;
 
     const booking = {
       id: databaseBooking.id,
       uid: databaseBooking.uid,
       title: databaseBooking.title,
       description: databaseBooking.description,
-      hosts: [databaseBooking.user],
+      hosts: [this.getHost(databaseBooking.user)],
       status: databaseBooking.status.toLowerCase(),
       rescheduledFromUid: databaseBooking.fromReschedule || undefined,
       start: databaseBooking.startTime,
@@ -208,9 +260,9 @@ export class OutputBookingsService_2024_08_13 {
       // note(Lauris): eventTypeId is deprecated
       eventTypeId: databaseBooking.eventTypeId,
       attendees: [],
-      location: databaseBooking.location,
+      location,
       // note(Lauris): meetingUrl is deprecated
-      meetingUrl: databaseBooking.location,
+      meetingUrl: location,
       absentHost: !!databaseBooking.noShowHost,
       createdAt: databaseBooking.createdAt,
     };
@@ -219,7 +271,11 @@ export class OutputBookingsService_2024_08_13 {
 
     // note(Lauris): I don't know why plainToClass erases booking.attendees[n].responses so attaching manually
     parsed.attendees = databaseBooking.attendees.map((attendee) => {
-      const { responses } = seatedBookingResponsesSchema.parse(attendee.bookingSeat?.data);
+      const { responses } = safeParse(
+        seatedBookingDataSchema,
+        attendee.bookingSeat?.data,
+        defaultSeatedBookingData
+      );
 
       const attendeeData = {
         name: attendee.name,
@@ -232,7 +288,11 @@ export class OutputBookingsService_2024_08_13 {
       };
       const attendeeParsed = plainToClass(SeatedAttendee, attendeeData, { strategy: "excludeAll" });
       attendeeParsed.bookingFieldsResponses = responses || {};
-      attendeeParsed.metadata = seatedBookingMetadataSchema.parse(attendee.bookingSeat?.metadata);
+      attendeeParsed.metadata = safeParse(
+        seatedBookingMetadataSchema,
+        attendee.bookingSeat?.metadata,
+        defaultSeatedBookingMetadata
+      );
       // note(Lauris): as of now email is not returned for privacy
       delete attendeeParsed.bookingFieldsResponses.email;
 
@@ -285,13 +345,15 @@ export class OutputBookingsService_2024_08_13 {
     const dateStart = DateTime.fromISO(databaseBooking.startTime.toISOString());
     const dateEnd = DateTime.fromISO(databaseBooking.endTime.toISOString());
     const duration = dateEnd.diff(dateStart, "minutes").minutes;
+    const metadata = safeParse(bookingMetadataSchema, databaseBooking.metadata, defaultBookingMetadata);
+    const location = metadata?.videoCallUrl || databaseBooking.location;
 
     const booking = {
       id: databaseBooking.id,
       uid: databaseBooking.uid,
       title: databaseBooking.title,
       description: databaseBooking.description,
-      hosts: [databaseBooking.user],
+      hosts: [this.getHost(databaseBooking.user)],
       status: databaseBooking.status.toLowerCase(),
       cancellationReason: databaseBooking.cancellationReason || undefined,
       rescheduledFromUid: databaseBooking.fromReschedule || undefined,
@@ -302,9 +364,9 @@ export class OutputBookingsService_2024_08_13 {
       // note(Lauris): eventTypeId is deprecated
       eventTypeId: databaseBooking.eventTypeId,
       attendees: [],
-      location: databaseBooking.location,
+      location,
       // note(Lauris): meetingUrl is deprecated
-      meetingUrl: databaseBooking.location,
+      meetingUrl: location,
       recurringBookingUid: databaseBooking.recurringEventId,
       absentHost: !!databaseBooking.noShowHost,
       createdAt: databaseBooking.createdAt,
@@ -316,7 +378,11 @@ export class OutputBookingsService_2024_08_13 {
 
     // note(Lauris): I don't know why plainToClass erases booking.attendees[n].responses so attaching manually
     parsed.attendees = databaseBooking.attendees.map((attendee) => {
-      const { responses } = seatedBookingResponsesSchema.parse(attendee.bookingSeat?.data);
+      const { responses } = safeParse(
+        seatedBookingDataSchema,
+        attendee.bookingSeat?.data,
+        defaultSeatedBookingData
+      );
 
       const attendeeData = {
         name: attendee.name,
@@ -329,7 +395,11 @@ export class OutputBookingsService_2024_08_13 {
       };
       const attendeeParsed = plainToClass(SeatedAttendee, attendeeData, { strategy: "excludeAll" });
       attendeeParsed.bookingFieldsResponses = responses || {};
-      attendeeParsed.metadata = seatedBookingMetadataSchema.parse(attendee.bookingSeat?.metadata);
+      attendeeParsed.metadata = safeParse(
+        seatedBookingMetadataSchema,
+        attendee.bookingSeat?.metadata,
+        defaultSeatedBookingMetadata
+      );
       // note(Lauris): as of now email is not returned for privacy
       delete attendeeParsed.bookingFieldsResponses.email;
       return attendeeParsed;

apps/api/v2/src/ee/calendars/controllers/calendars.controller.e2e-spec.ts

@@ -113,7 +113,7 @@ describe("Platform Calendars Endpoints", () => {
   });
 
   // TODO: Uncomment this once CI is ready to run proper Office365 tests
-  // it(`/GET/v2/calendars/${OFFICE_365_CALENDAR}/connect: it should redirect to auth-url for office 365 calendar oauth with valid access token `, async () => {
+  // it(`/GET/v2/calendars/${OFFICE_365_CALENDAR}/connect: it should redirect to auth-url for office 365 calendar OAuth with valid access token `, async () => {
   //   const response = await request(app.getHttpServer())
   //     .get(`/v2/calendars/${OFFICE_365_CALENDAR}/connect`)
   //     .set("Authorization", `Bearer ${accessTokenSecret}`)
@@ -123,7 +123,7 @@ describe("Platform Calendars Endpoints", () => {
   //   expect(data.authUrl).toBeDefined();
   // });
 
-  it(`/GET/v2/calendars/${GOOGLE_CALENDAR}/connect: it should redirect to auth-url for google calendar oauth with valid access token `, async () => {
+  it(`/GET/v2/calendars/${GOOGLE_CALENDAR}/connect: it should redirect to auth-url for google calendar OAuth with valid access token `, async () => {
     const response = await request(app.getHttpServer())
       .get(`/v2/calendars/${GOOGLE_CALENDAR}/connect`)
       .set("Authorization", `Bearer ${accessTokenSecret}`)

apps/api/v2/src/ee/calendars/controllers/calendars.controller.ts

@@ -86,18 +86,16 @@ export class CalendarsController {
 
   @UseGuards(ApiAuthGuard)
   @Get("/busy-times")
-  @ApiOperation({ summary: "Get busy times" })
+  @ApiOperation({
+    summary: "Get busy times",
+    description:
+      "Get busy times from a calendar. Example request URL is `https://api.cal.com/v2/calendars/busy-times?loggedInUsersTz=Europe%2FMadrid&dateFrom=2024-12-18&dateTo=2024-12-18&calendarsToLoad[0][credentialId]=135&calendarsToLoad[0][externalId]=skrauciz%40gmail.com`",
+  })
   async getBusyTimes(
     @Query() queryParams: CalendarBusyTimesInput,
     @GetUser() user: UserWithProfile
   ): Promise<GetBusyTimesOutput> {
     const { loggedInUsersTz, dateFrom, dateTo, calendarsToLoad } = queryParams;
-    if (!dateFrom || !dateTo) {
-      return {
-        status: SUCCESS_STATUS,
-        data: [],
-      };
-    }
 
     const busyTimes = await this.calendarsService.getBusyTimes(
       calendarsToLoad,

apps/api/v2/src/ee/calendars/input/create-ics.input.ts

@@ -1,4 +1,4 @@
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import {
   ArrayNotEmpty,
   IsBoolean,
@@ -50,11 +50,10 @@ export class CreateIcsFeedInputDto {
   urls!: string[];
 
   @IsBoolean()
-  @ApiProperty({
+  @ApiPropertyOptional({
     example: false,
     description: "Whether to allowing writing to the calendar or not",
     type: "boolean",
-    required: false,
     default: true,
   })
   @IsOptional()

apps/api/v2/src/ee/calendars/outputs/busy-times.output.ts

@@ -1,4 +1,4 @@
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsArray, IsDate, IsEnum, IsOptional, IsString, ValidateNested } from "class-validator";
 
@@ -6,13 +6,16 @@ import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
 
 export class BusyTimesOutput {
   @IsDate()
+  @ApiProperty({ type: Date })
   start!: Date;
 
   @IsDate()
+  @ApiProperty({ type: Date })
   end!: Date;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional({ type: String, nullable: true })
   source?: string | null;
 }
 
@@ -24,5 +27,6 @@ export class GetBusyTimesOutput {
   @ValidateNested()
   @Type(() => BusyTimesOutput)
   @IsArray()
+  @ApiProperty({ type: [BusyTimesOutput] })
   data!: BusyTimesOutput[];
 }

apps/api/v2/src/ee/calendars/outputs/connected-calendars.output.ts

@@ -1,4 +1,4 @@
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import {
   IsArray,
@@ -18,195 +18,246 @@ import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
 class Integration {
   @IsOptional()
   @IsObject()
+  @ApiPropertyOptional({ type: Object, nullable: true })
   appData?: object | null;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   dirName?: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   __template?: string;
 
   @IsString()
+  @ApiProperty()
   name!: string;
 
   @IsString()
+  @ApiProperty()
   description!: string;
 
   @IsOptional()
   @IsBoolean()
+  @ApiPropertyOptional()
   installed?: boolean;
 
   @IsString()
+  @ApiProperty()
   type!: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   title?: string;
 
   @IsString()
+  @ApiProperty()
   variant!: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   category?: string;
 
   @IsArray()
   @IsString({ each: true })
+  @ApiProperty({ type: [String] })
   categories!: string[];
 
   @IsString()
+  @ApiProperty()
   logo!: string;
 
   @IsString()
+  @ApiProperty()
   publisher!: string;
 
   @IsString()
+  @ApiProperty()
   slug!: string;
 
   @IsUrl()
+  @ApiProperty()
   url!: string;
 
   @IsEmail()
+  @ApiProperty()
   email!: string;
 
-  @IsOptional()
   @IsObject()
+  @ApiProperty({ type: Object, nullable: true })
   locationOption!: object | null;
 }
 
 class Primary {
   @IsEmail()
+  @ApiProperty()
   externalId!: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   integration?: string;
 
   @IsOptional()
   @IsEmail()
+  @ApiPropertyOptional()
   name?: string;
 
   @IsBoolean()
+  @ApiProperty({ type: Boolean, nullable: true })
   primary!: boolean | null;
 
   @IsBoolean()
+  @ApiProperty()
   readOnly!: boolean;
 
   @IsEmail()
   @IsOptional()
+  @ApiPropertyOptional()
   email?: string;
 
   @IsBoolean()
+  @ApiProperty()
   isSelected!: boolean;
 
   @IsInt()
+  @ApiProperty()
   credentialId!: number;
 }
 
 export class Calendar {
   @IsEmail()
+  @ApiProperty()
   externalId!: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   integration?: string;
 
   @IsEmail()
   @IsOptional()
+  @ApiPropertyOptional()
   name?: string;
 
   @IsOptional()
   @IsBoolean()
+  @ApiPropertyOptional({ type: Boolean, nullable: true })
   primary?: boolean | null;
 
   @IsBoolean()
+  @ApiProperty()
   readOnly!: boolean;
 
   @IsEmail()
   @IsOptional()
+  @ApiPropertyOptional()
   email?: string;
 
   @IsBoolean()
+  @ApiProperty()
   isSelected!: boolean;
 
   @IsInt()
+  @ApiProperty()
   credentialId!: number;
 }
 
 export class ConnectedCalendar {
   @ValidateNested()
   @IsObject()
+  @ApiProperty({ type: Integration })
   integration!: Integration;
 
   @IsInt()
+  @ApiProperty()
   credentialId!: number;
 
   @ValidateNested()
   @IsObject()
   @IsOptional()
+  @ApiPropertyOptional({ type: Primary })
   primary?: Primary;
 
   @ValidateNested({ each: true })
   @IsArray()
   @IsOptional()
+  @ApiPropertyOptional({ type: [Calendar] })
   calendars?: Calendar[];
 }
 
 class DestinationCalendar {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsString()
+  @ApiProperty()
   integration!: string;
 
   @IsEmail()
+  @ApiProperty()
   externalId!: string;
 
   @IsEmail()
+  @ApiProperty({ type: String, nullable: true })
   primaryEmail!: string | null;
 
   @IsInt()
+  @ApiProperty({ nullable: true })
   userId!: number | null;
 
   @IsOptional()
   @IsInt()
+  @ApiProperty({ type: Number, nullable: true })
   eventTypeId!: number | null;
 
   @IsInt()
+  @ApiProperty({ type: Number, nullable: true })
   credentialId!: number | null;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional({ type: String, nullable: true })
   name?: string | null;
 
   @IsBoolean()
   @IsOptional()
+  @ApiPropertyOptional()
   primary?: boolean;
 
   @IsBoolean()
   @IsOptional()
+  @ApiPropertyOptional()
   readOnly?: boolean;
 
   @IsEmail()
   @IsOptional()
+  @ApiPropertyOptional()
   email?: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   integrationTitle?: string;
 }
 
 export class ConnectedCalendarsData {
   @ValidateNested({ each: true })
   @IsArray()
+  @ApiProperty({ type: [ConnectedCalendar] })
   connectedCalendars!: ConnectedCalendar[];
 
   @ValidateNested()
   @IsObject()
+  @ApiProperty({ type: DestinationCalendar })
   destinationCalendar!: DestinationCalendar;
 }
+
 export class ConnectedCalendarsOutput {
   @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
   @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
@@ -214,5 +265,6 @@ export class ConnectedCalendarsOutput {
 
   @ValidateNested()
   @Type(() => ConnectedCalendarsData)
+  @ApiProperty({ type: ConnectedCalendarsData })
   data!: ConnectedCalendarsData;
 }

apps/api/v2/src/ee/calendars/services/calendars.service.ts

@@ -64,7 +64,6 @@ export class CalendarsService {
     );
     try {
       const calendarBusyTimes = await getBusyCalendarTimes(
-        "",
         credentials,
         dateFrom,
         dateTo,

apps/api/v2/src/ee/calendars/services/gcal.service.ts

@@ -4,13 +4,14 @@ import { AppsRepository } from "@/modules/apps/apps.repository";
 import { CredentialsRepository } from "@/modules/credentials/credentials.repository";
 import { SelectedCalendarsRepository } from "@/modules/selected-calendars/selected-calendars.repository";
 import { TokensRepository } from "@/modules/tokens/tokens.repository";
+import { calendar_v3 } from "@googleapis/calendar";
 import { Logger, NotFoundException } from "@nestjs/common";
 import { BadRequestException, UnauthorizedException } from "@nestjs/common";
 import { Injectable } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { Prisma } from "@prisma/client";
 import { Request } from "express";
-import { google } from "googleapis";
+import { OAuth2Client } from "googleapis-common";
 import { z } from "zod";
 
 import { SUCCESS_STATUS, GOOGLE_CALENDAR_TYPE } from "@calcom/platform-constants";
@@ -78,7 +79,7 @@ export class GoogleCalendarService implements OAuthCalendarApp {
 
     const { client_id, client_secret } = this.gcalResponseSchema.parse(app.keys);
 
-    const oAuth2Client = new google.auth.OAuth2(client_id, client_secret, redirectUri);
+    const oAuth2Client = new OAuth2Client(client_id, client_secret, redirectUri);
     return oAuth2Client;
   }
 
@@ -90,7 +91,7 @@ export class GoogleCalendarService implements OAuthCalendarApp {
     }
 
     if (gcalCredentials.invalid) {
-      throw new BadRequestException("Invalid google oauth credentials.");
+      throw new BadRequestException("Invalid google OAuth credentials.");
     }
 
     const { connectedCalendars } = await this.calendarsService.getCalendars(userId);
@@ -115,7 +116,7 @@ export class GoogleCalendarService implements OAuthCalendarApp {
   ) {
     // User chose not to authorize your app or didn't authorize your app
     // redirect directly without oauth code
-    if (!code) {
+    if (!code || code === "undefined") {
       return { url: redir || origin };
     }
 
@@ -134,8 +135,7 @@ export class GoogleCalendarService implements OAuthCalendarApp {
 
     oAuth2Client.setCredentials(key);
 
-    const calendar = google.calendar({
-      version: "v3",
+    const calendar = new calendar_v3.Calendar({
       auth: oAuth2Client,
     });
 

apps/api/v2/src/ee/calendars/services/outlook.service.ts

@@ -151,7 +151,7 @@ export class OutlookService implements OAuthCalendarApp {
     redir?: string
   ) {
     // if code is not defined, user denied to authorize office 365 app, just redirect straight away
-    if (!code) {
+    if (!code || code === "undefined") {
       return { url: redir || origin };
     }
 

apps/api/v2/src/ee/event-types/event-types_2024_04_15/event-types.repository.ts

@@ -78,4 +78,11 @@ export class EventTypesRepository_2024_04_15 {
   async deleteEventType(eventTypeId: number) {
     return this.dbWrite.prisma.eventType.delete({ where: { id: eventTypeId } });
   }
+
+  async getEventTypeWithDuration(eventTypeId: number) {
+    return this.dbRead.prisma.eventType.findUnique({
+      where: { id: eventTypeId },
+      select: { length: true },
+    });
+  }
 }

apps/api/v2/src/ee/event-types/event-types_2024_04_15/inputs/create-event-type.input.ts

@@ -1,5 +1,5 @@
 import { EventTypeLocation_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/event-type-location.input";
-import { ApiProperty as DocsProperty, ApiHideProperty } from "@nestjs/swagger";
+import { ApiProperty as DocsProperty, ApiPropertyOptional, ApiHideProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import {
   IsString,
@@ -36,7 +36,10 @@ export class CreateEventTypeInput_2024_04_15 {
 
   @IsOptional()
   @IsString()
-  @DocsProperty({ example: CREATE_EVENT_DESCRIPTION_EXAMPLE })
+  @ApiPropertyOptional({
+    type: String,
+    example: CREATE_EVENT_DESCRIPTION_EXAMPLE,
+  })
   description?: string;
 
   @IsOptional()
@@ -48,30 +51,38 @@ export class CreateEventTypeInput_2024_04_15 {
   @ValidateNested({ each: true })
   @Type(() => EventTypeLocation_2024_04_15)
   @IsArray()
+  @ApiPropertyOptional({
+    type: [EventTypeLocation_2024_04_15],
+  })
   locations?: EventTypeLocation_2024_04_15[];
 
-  @IsBoolean()
   @IsOptional()
+  @IsBoolean()
+  @ApiPropertyOptional()
   disableGuests?: boolean;
 
+  @IsOptional()
   @IsInt()
   @Min(0)
-  @IsOptional()
+  @ApiPropertyOptional()
   slotInterval?: number;
 
+  @IsOptional()
   @IsInt()
   @Min(0)
-  @IsOptional()
+  @ApiPropertyOptional()
   minimumBookingNotice?: number;
 
+  @IsOptional()
   @IsInt()
   @Min(0)
-  @IsOptional()
+  @ApiPropertyOptional()
   beforeEventBuffer?: number;
 
+  @IsOptional()
   @IsInt()
   @Min(0)
-  @IsOptional()
+  @ApiPropertyOptional()
   afterEventBuffer?: number;
 
   // @ApiHideProperty()

apps/api/v2/src/ee/event-types/event-types_2024_04_15/inputs/event-type-location.input.ts

@@ -1,4 +1,4 @@
-import { ApiProperty as DocsProperty, ApiHideProperty } from "@nestjs/swagger";
+import { ApiProperty, ApiHideProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { IsString, IsNumber, IsBoolean, IsOptional, IsUrl } from "class-validator";
 
 // note(Lauris): We will gradually expose more properties if any customer needs them.
@@ -6,7 +6,7 @@ import { IsString, IsNumber, IsBoolean, IsOptional, IsUrl } from "class-validato
 
 export class EventTypeLocation_2024_04_15 {
   @IsString()
-  @DocsProperty({ example: "link" })
+  @ApiProperty({ example: "link" })
   type!: string;
 
   @IsOptional()
@@ -16,7 +16,7 @@ export class EventTypeLocation_2024_04_15 {
 
   @IsOptional()
   @IsUrl()
-  @DocsProperty({ example: "https://masterchief.com/argentina/flan/video/9129412" })
+  @ApiPropertyOptional({ example: "https://masterchief.com/argentina/flan/video/9129412" })
   link?: string;
 
   @IsOptional()

apps/api/v2/src/ee/event-types/event-types_2024_04_15/inputs/get-public-event-type-query-params.input.ts

@@ -1,4 +1,4 @@
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiPropertyOptional } from "@nestjs/swagger";
 import { Transform } from "class-transformer";
 import { IsBoolean, IsOptional, IsString } from "class-validator";
 
@@ -6,11 +6,11 @@ export class GetPublicEventTypeQueryParams_2024_04_15 {
   @Transform(({ value }: { value: string }) => value === "true")
   @IsBoolean()
   @IsOptional()
-  @ApiProperty({ required: false })
+  @ApiPropertyOptional()
   isTeamEvent?: boolean;
 
-  @ApiProperty({ required: false })
-  @IsString()
   @IsOptional()
+  @IsString()
+  @ApiPropertyOptional({ type: String, nullable: true })
   org?: string | null;
 }

apps/api/v2/src/ee/event-types/event-types_2024_04_15/inputs/update-event-type.input.ts

@@ -2,6 +2,7 @@ import { Editable } from "@/ee/event-types/event-types_2024_04_15/inputs/enums/e
 import { BaseField } from "@/ee/event-types/event-types_2024_04_15/inputs/enums/field-type";
 import { Frequency } from "@/ee/event-types/event-types_2024_04_15/inputs/enums/frequency";
 import { EventTypeLocation_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/inputs/event-type-location.input";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import {
   IsString,
@@ -21,206 +22,259 @@ import {
 
 class Option {
   @IsString()
+  @ApiProperty()
   value!: string;
 
   @IsString()
+  @ApiProperty()
   label!: string;
 }
 
 class Source {
   @IsString()
+  @ApiProperty()
   id!: string;
 
   @IsString()
+  @ApiProperty()
   type!: string;
 
   @IsString()
+  @ApiProperty()
   label!: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   editUrl?: string;
 
   @IsOptional()
   @IsBoolean()
+  @ApiPropertyOptional()
   fieldRequired?: boolean;
 }
 
 class View {
   @IsString()
+  @ApiProperty()
   id!: string;
 
   @IsString()
+  @ApiProperty()
   label!: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   description?: string;
 }
 
 class OptionsInput {
   @IsString()
+  @ApiProperty({
+    description: 'Type of the field, can be one of "address", "text", or "phone".',
+    enum: ["address", "text", "phone"],
+    example: "text",
+  })
   type!: "address" | "text" | "phone";
 
   @IsOptional()
   @IsBoolean()
+  @ApiPropertyOptional()
   required?: boolean;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   placeholder?: string;
 }
 
 class VariantField {
   @IsString()
+  @ApiProperty()
   type!: BaseField;
 
   @IsString()
+  @ApiProperty()
   name!: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   label?: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   labelAsSafeHtml?: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   placeholder?: string;
 
   @IsOptional()
   @IsBoolean()
+  @ApiPropertyOptional()
   required?: boolean;
 }
 
 class Variant {
   @ValidateNested({ each: true })
   @Type(() => VariantField)
+  @ApiProperty({ type: [VariantField] })
   fields!: VariantField[];
 }
 
 class VariantsConfig {
+  @ApiProperty({ type: Object })
   variants!: Record<string, Variant>;
 }
 
 export class BookingField_2024_04_15 {
   @IsEnum(BaseField)
+  @ApiProperty({ enum: BaseField })
   type!: BaseField;
 
   @IsString()
+  @ApiProperty()
   name!: string;
 
   @IsOptional()
   @ValidateNested({ each: true })
   @Type(() => Option)
+  @ApiPropertyOptional({ type: [Option] })
   options?: Option[];
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   label?: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   labelAsSafeHtml?: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   defaultLabel?: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   placeholder?: string;
 
   @IsOptional()
   @IsBoolean()
+  @ApiPropertyOptional()
   required?: boolean;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   getOptionsAt?: string;
 
   @IsOptional()
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => OptionsInput)
+  @ApiPropertyOptional()
   optionsInputs?: Record<string, OptionsInput>;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   variant?: string;
 
   @IsOptional()
   @ValidateNested()
   @Type(() => VariantsConfig)
+  @ApiPropertyOptional({ type: VariantsConfig })
   variantsConfig?: VariantsConfig;
 
   @IsOptional()
   @ValidateNested({ each: true })
   @Type(() => View)
+  @ApiPropertyOptional({ type: [View] })
   views?: View[];
 
   @IsOptional()
   @IsBoolean()
+  @ApiPropertyOptional()
   hideWhenJustOneOption?: boolean;
 
   @IsOptional()
   @IsBoolean()
+  @ApiPropertyOptional()
   hidden?: boolean;
 
   @IsOptional()
   @IsEnum(Editable)
+  @ApiPropertyOptional()
   editable?: Editable;
 
   @IsOptional()
   @ValidateNested({ each: true })
   @Type(() => Source)
+  @ApiPropertyOptional({ type: [Source] })
   sources?: Source[];
 
   @IsOptional()
   @IsBoolean()
+  @ApiPropertyOptional()
   disableOnPrefill?: boolean;
 }
 
 export class RecurringEvent_2024_04_15 {
   @IsDate()
   @IsOptional()
+  @ApiPropertyOptional({ type: Date })
   dtstart?: Date;
 
   @IsInt()
+  @ApiProperty()
   interval!: number;
 
   @IsInt()
+  @ApiProperty()
   count!: number;
 
   @IsEnum(Frequency)
+  @ApiProperty({ enum: Frequency })
   freq!: Frequency;
 
   @IsDate()
   @IsOptional()
+  @ApiPropertyOptional({ type: Date })
   until?: Date;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   tzid?: string;
 }
 
 export class IntervalLimits_2024_04_15 {
   @IsNumber()
   @IsOptional()
+  @ApiPropertyOptional()
   PER_DAY?: number;
 
   @IsNumber()
   @IsOptional()
+  @ApiPropertyOptional()
   PER_WEEK?: number;
 
   @IsNumber()
   @IsOptional()
+  @ApiPropertyOptional()
   PER_MONTH?: number;
 
   @IsNumber()
   @IsOptional()
+  @ApiPropertyOptional()
   PER_YEAR?: number;
 }
 
@@ -228,27 +282,33 @@ export class UpdateEventTypeInput_2024_04_15 {
   @IsInt()
   @Min(1)
   @IsOptional()
+  @ApiPropertyOptional()
   length?: number;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   slug?: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   title?: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   description?: string;
 
   @IsBoolean()
   @IsOptional()
+  @ApiPropertyOptional()
   hidden?: boolean;
 
   @ValidateNested({ each: true })
   @Type(() => EventTypeLocation_2024_04_15)
   @IsOptional()
+  @ApiPropertyOptional({ type: [EventTypeLocation_2024_04_15] })
   locations?: EventTypeLocation_2024_04_15[];
 
   // @IsInt()
@@ -283,6 +343,7 @@ export class UpdateEventTypeInput_2024_04_15 {
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => BookingField_2024_04_15)
+  @ApiPropertyOptional({ type: [BookingField_2024_04_15] })
   bookingFields?: BookingField_2024_04_15[];
 
   // @IsString()
@@ -328,6 +389,7 @@ export class UpdateEventTypeInput_2024_04_15 {
 
   @IsBoolean()
   @IsOptional()
+  @ApiPropertyOptional()
   disableGuests?: boolean;
 
   // @IsBoolean()
@@ -337,16 +399,19 @@ export class UpdateEventTypeInput_2024_04_15 {
   @IsInt()
   @Min(0)
   @IsOptional()
+  @ApiPropertyOptional()
   minimumBookingNotice?: number;
 
   @IsInt()
   @Min(0)
   @IsOptional()
+  @ApiPropertyOptional()
   beforeEventBuffer?: number;
 
   @IsInt()
   @Min(0)
   @IsOptional()
+  @ApiPropertyOptional()
   afterEventBuffer?: number;
 
   // @IsInt()
@@ -384,6 +449,7 @@ export class UpdateEventTypeInput_2024_04_15 {
   @IsInt()
   @Min(0)
   @IsOptional()
+  @ApiPropertyOptional()
   slotInterval?: number;
 
   // @IsString()

apps/api/v2/src/ee/event-types/event-types_2024_04_15/outputs/event-type.output.ts

@@ -12,7 +12,7 @@ import {
   IntervalLimits_2024_04_15,
   RecurringEvent_2024_04_15,
 } from "@/ee/event-types/event-types_2024_04_15/inputs/update-event-type.input";
-import { ApiProperty as DocsProperty, ApiHideProperty } from "@nestjs/swagger";
+import { ApiHideProperty, ApiProperty } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import {
   IsArray,
@@ -29,23 +29,23 @@ import {
 
 export class EventTypeOutput {
   @IsInt()
-  @DocsProperty({ example: 1 })
+  @ApiProperty({ example: 1 })
   id!: number;
 
   @IsInt()
-  @DocsProperty({ example: CREATE_EVENT_LENGTH_EXAMPLE })
+  @ApiProperty({ example: CREATE_EVENT_LENGTH_EXAMPLE })
   length!: number;
 
   @IsString()
-  @DocsProperty({ example: CREATE_EVENT_SLUG_EXAMPLE })
+  @ApiProperty({ example: CREATE_EVENT_SLUG_EXAMPLE })
   slug!: string;
 
   @IsString()
-  @DocsProperty({ example: CREATE_EVENT_TITLE_EXAMPLE })
+  @ApiProperty({ example: CREATE_EVENT_TITLE_EXAMPLE })
   title!: string;
 
   @IsString()
-  @DocsProperty({ example: CREATE_EVENT_DESCRIPTION_EXAMPLE })
+  @ApiProperty({ example: CREATE_EVENT_DESCRIPTION_EXAMPLE, nullable: true })
   description!: string | null;
 
   @IsBoolean()
@@ -55,6 +55,7 @@ export class EventTypeOutput {
   @ValidateNested({ each: true })
   @Type(() => EventTypeLocation_2024_04_15)
   @IsArray()
+  @ApiProperty({ type: [EventTypeLocation_2024_04_15], nullable: true })
   locations!: EventTypeLocation_2024_04_15[] | null;
 
   @IsInt()

apps/api/v2/src/ee/event-types/event-types_2024_04_15/outputs/get-event-type-public.output.ts

@@ -1,4 +1,4 @@
-import { ApiProperty } from "@nestjs/swagger";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import {
   IsBoolean,
@@ -17,330 +17,421 @@ import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
 
 class Location {
   @IsString()
+  @ApiProperty()
   type!: string;
 }
 
 class Source {
   @IsString()
+  @ApiProperty()
   id!: string;
 
   @IsString()
+  @ApiProperty()
   type!: string;
 
   @IsString()
+  @ApiProperty()
   label!: string;
 }
 
 class OptionInput {
   @IsString()
+  @ApiProperty()
   type!: string;
 
   @IsBoolean()
   @IsOptional()
+  @ApiPropertyOptional()
   required?: boolean;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   placeholder?: string;
 }
 
 class BookingField {
   @IsString()
+  @ApiProperty()
   name!: string;
 
   @IsString()
+  @ApiProperty()
   type!: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   defaultLabel?: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   label?: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   placeholder?: string;
 
   @IsBoolean()
   @IsOptional()
+  @ApiPropertyOptional()
   required?: boolean;
 
   @IsOptional()
+  @ApiPropertyOptional()
   getOptionsAt?: string;
 
   @IsObject()
   @IsOptional()
+  @ApiPropertyOptional()
   optionsInputs?: { [key: string]: OptionInput };
 
   @IsBoolean()
   @IsOptional()
+  @ApiPropertyOptional()
   hideWhenJustOneOption?: boolean;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   editable?: string;
 
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => Source)
   @IsOptional()
+  @ApiPropertyOptional({ type: [Source] })
   sources?: Source[];
 
   @IsOptional()
   @IsBoolean()
+  @ApiPropertyOptional()
   disableOnPrefill?: boolean;
 }
 
 class Organization {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional({ type: String, nullable: true })
   slug?: string | null;
 
   @IsString()
+  @ApiProperty()
   name!: string;
 
   @IsOptional()
-  metadata!: Record<string, any>;
+  @ApiPropertyOptional({ type: Object })
+  metadata?: Record<string, any>;
 }
 
 class Profile {
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   username!: string | null;
 
   @IsInt()
+  @ApiProperty({ type: Number, nullable: true })
   id!: number | null;
 
   @IsInt()
   @IsOptional()
+  @ApiPropertyOptional()
   userId?: number;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   uid?: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   name?: string;
 
   @IsInt()
+  @ApiProperty({ type: Number, nullable: true })
   organizationId!: number | null;
 
   @ValidateNested()
   @Type(() => Organization)
+  @ApiPropertyOptional({ type: Organization, nullable: true })
   organization?: Organization | null;
 
   @IsString()
+  @ApiProperty()
   upId!: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   image?: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   brandColor?: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   darkBrandColor?: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional()
   theme?: string;
 
   @IsOptional()
+  @ApiPropertyOptional()
   bookerLayouts?: any;
 }
 
 class Owner {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional({ type: String, nullable: true })
   avatarUrl?: string | null;
 
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   username!: string | null;
 
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   name!: string | null;
 
   @IsString()
+  @ApiProperty()
   weekStart!: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional({ type: String, nullable: true })
   brandColor?: string | null;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional({ type: String, nullable: true })
   darkBrandColor?: string | null;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional({ type: String, nullable: true })
   theme?: string | null;
 
   @IsOptional()
-  metadata!: any;
+  @ApiPropertyOptional()
+  metadata?: any;
 
   @IsInt()
   @IsOptional()
+  @ApiPropertyOptional({ type: Number, nullable: true })
   defaultScheduleId?: number | null;
 
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   nonProfileUsername!: string | null;
 
   @ValidateNested()
   @Type(() => Profile)
+  @ApiProperty({ type: Profile })
   profile!: Profile;
 }
 
 class User {
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   username!: string | null;
 
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   name!: string | null;
 
   @IsString()
+  @ApiProperty()
   weekStart!: string;
 
   @IsInt()
+  @IsOptional()
+  @ApiPropertyOptional()
   organizationId?: number;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional({ type: String, nullable: true })
   avatarUrl?: string | null;
 
   @ValidateNested()
+  @ApiProperty({ type: Profile })
   profile!: Profile;
 
   @IsString()
+  @ApiProperty()
   bookerUrl!: string;
 }
 
 class Schedule {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsString()
+  @ApiProperty({ type: String, nullable: true })
   timeZone!: string | null;
 }
 
 class PublicEventTypeOutput {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsString()
+  @ApiProperty()
   title!: string;
 
   @IsString()
+  @ApiProperty()
   description!: string;
 
   @IsString()
   @IsOptional()
+  @ApiPropertyOptional({ type: String, nullable: true })
   eventName?: string | null;
 
   @IsString()
+  @ApiProperty()
   slug!: string;
 
   @IsBoolean()
+  @ApiProperty()
   isInstantEvent!: boolean;
 
   @IsOptional()
+  @ApiPropertyOptional()
   aiPhoneCallConfig?: any;
 
   @IsOptional()
+  @ApiPropertyOptional()
   schedulingType?: any;
 
   @IsInt()
+  @ApiProperty()
   length!: number;
 
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => Location)
+  @ApiProperty({ type: [Location] })
   locations!: Location[];
 
   @IsArray()
+  @ApiProperty({ type: [Object] })
   customInputs!: any[];
 
   @IsBoolean()
+  @ApiProperty()
   disableGuests!: boolean;
 
   @IsObject()
+  @ApiProperty({ type: Object, nullable: true })
   metadata!: object | null;
 
   @IsBoolean()
+  @ApiProperty()
   lockTimeZoneToggleOnBookingPage!: boolean;
 
   @IsBoolean()
+  @ApiProperty()
   requiresConfirmation!: boolean;
 
   @IsBoolean()
+  @ApiProperty()
   requiresBookerEmailVerification!: boolean;
 
   @IsOptional()
+  @ApiPropertyOptional()
   recurringEvent?: any;
 
   @IsNumber()
+  @ApiProperty()
   price!: number;
 
   @IsString()
+  @ApiProperty()
   currency!: string;
 
   @IsOptional()
+  @ApiPropertyOptional({ type: Number, nullable: true })
   seatsPerTimeSlot?: number | null;
 
   @IsBoolean()
+  @ApiProperty({ type: Boolean, nullable: true })
   seatsShowAvailabilityCount!: boolean | null;
 
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => BookingField)
+  @ApiProperty({ type: [BookingField] })
   bookingFields!: BookingField[];
 
   @IsOptional()
+  @ApiPropertyOptional()
   team?: any;
 
   @IsOptional()
   @IsUrl()
+  @ApiPropertyOptional({ type: String, nullable: true })
   successRedirectUrl?: string | null;
 
   @IsArray()
+  @ApiProperty()
   workflows!: any[];
 
   @IsArray()
+  @ApiProperty()
   hosts!: any[];
 
   @ValidateNested()
   @Type(() => Owner)
+  @ApiProperty({ type: Owner, nullable: true })
   owner!: Owner | null;
 
   @ValidateNested()
   @Type(() => Schedule)
+  @ApiProperty({ type: Schedule, nullable: true })
   schedule!: Schedule | null;
 
   @IsBoolean()
+  @ApiProperty()
   hidden!: boolean;
 
   @IsBoolean()
+  @ApiProperty()
   assignAllTeamMembers!: boolean;
 
   @IsOptional()
+  @ApiPropertyOptional()
   bookerLayouts?: any;
 
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => User)
+  @ApiProperty({ type: [User] })
   users!: User[];
 
   @IsObject()
+  @ApiProperty({ type: Object })
   entity!: object;
 
   @IsBoolean()

apps/api/v2/src/ee/event-types/event-types_2024_06_14/controllers/event-types.controller.e2e-spec.ts

@@ -10,10 +10,12 @@ import { UsersModule } from "@/modules/users/users.module";
 import { INestApplication } from "@nestjs/common";
 import { NestExpressApplication } from "@nestjs/platform-express";
 import { Test } from "@nestjs/testing";
-import { PlatformOAuthClient, Team, User, Schedule } from "@prisma/client";
+import { PlatformOAuthClient, Team, User, Schedule, EventType } from "@prisma/client";
 import * as request from "supertest";
 import { EventTypesRepositoryFixture } from "test/fixtures/repository/event-types.repository.fixture";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
 import { OAuthClientRepositoryFixture } from "test/fixtures/repository/oauth-client.repository.fixture";
+import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { SchedulesRepositoryFixture } from "test/fixtures/repository/schedules.repository.fixture";
 import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
@@ -75,18 +77,22 @@ describe("Event types Endpoints", () => {
     let teamRepositoryFixture: TeamRepositoryFixture;
     let eventTypesRepositoryFixture: EventTypesRepositoryFixture;
     let schedulesRepostoryFixture: SchedulesRepositoryFixture;
-
+    let profileRepositoryFixture: ProfileRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
     const userEmail = "event-types-test-e2e@api.com";
     const falseTestEmail = "false-event-types@api.com";
     const name = "bob-the-builder";
     const username = name;
     let eventType: EventTypeOutput_2024_06_14;
     let user: User;
+    let orgUser: User;
     let falseTestUser: User;
     let firstSchedule: Schedule;
     let secondSchedule: Schedule;
     let falseTestSchedule: Schedule;
-
+    let orgUserEventType1: EventType;
+    let orgUserEventType2: EventType;
+    let orgUserEventType3: EventType;
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
         userEmail,
@@ -109,8 +115,12 @@ describe("Event types Endpoints", () => {
       teamRepositoryFixture = new TeamRepositoryFixture(moduleRef);
       eventTypesRepositoryFixture = new EventTypesRepositoryFixture(moduleRef);
       schedulesRepostoryFixture = new SchedulesRepositoryFixture(moduleRef);
-
-      organization = await teamRepositoryFixture.create({ name: "organization" });
+      profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+      organization = await teamRepositoryFixture.create({
+        name: "organization",
+        slug: "event-type-2024-06-14-org-slug",
+      });
       oAuthClient = await createOAuthClient(organization.id);
       user = await userRepositoryFixture.create({
         email: userEmail,
@@ -118,6 +128,49 @@ describe("Event types Endpoints", () => {
         username,
       });
 
+      orgUser = await userRepositoryFixture.create({
+        email: "event-types-2024-06-14-org-user@example.com",
+        name: "event-types-2024-06-14-org-user",
+        username: "event-types-2024-06-14-org-user",
+      });
+
+      profileRepositoryFixture.create({
+        uid: `usr-${orgUser.id}`,
+        username: orgUser.username as string,
+        organization: {
+          connect: {
+            id: organization.id,
+          },
+        },
+        user: {
+          connect: {
+            id: orgUser.id,
+          },
+        },
+      });
+
+      orgUserEventType1 = await eventTypesRepositoryFixture.create(
+        { title: "orgUserEventType1", slug: "org-event-type-1", length: 60, locations: [] },
+        orgUser.id
+      );
+
+      orgUserEventType2 = await eventTypesRepositoryFixture.create(
+        { title: "orgUserEventType2", slug: "org-event-type-2", length: 60, locations: [] },
+        orgUser.id
+      );
+
+      orgUserEventType3 = await eventTypesRepositoryFixture.create(
+        { title: "orgUserEventType3", slug: "org-event-type-3", length: 60, locations: [] },
+        orgUser.id
+      );
+
+      await membershipsRepositoryFixture.create({
+        role: "MEMBER",
+        user: { connect: { id: orgUser.id } },
+        team: { connect: { id: organization.id } },
+        accepted: true,
+      });
+
       falseTestUser = await userRepositoryFixture.create({
         email: falseTestEmail,
         name: "false-test",
@@ -342,7 +395,7 @@ describe("Event types Endpoints", () => {
         });
     });
 
-    it(`/GET/even-types by username`, async () => {
+    it(`/GET/event-types by username`, async () => {
       const response = await request(app.getHttpServer())
         .get(`/api/v2/event-types?username=${username}`)
         .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
@@ -386,6 +439,61 @@ describe("Event types Endpoints", () => {
       expect(fetchedEventType.color).toEqual(eventType.color);
     });
 
+    it(`/GET/event-types by username and orgSlug`, async () => {
+      console.log(organization);
+      const response = await request(app.getHttpServer())
+        .get(`/api/v2/event-types?username=${orgUser.username}&orgSlug=${organization.slug}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+        // note: bearer token value mocked using "withAccessTokenAuth" for user which id is used when creating event type above
+        .set("Authorization", `Bearer whatever`)
+        .expect(200);
+
+      const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14[]> = response.body;
+
+      expect(responseBody.status).toEqual(SUCCESS_STATUS);
+      expect(responseBody.data).toBeDefined();
+      expect(responseBody.data?.length).toEqual(3);
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType1.id)?.id).toBeDefined();
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType2.id)?.id).toBeDefined();
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType3.id)?.id).toBeDefined();
+    });
+
+    it(`/GET/event-types by username and orgSlug and eventSlug`, async () => {
+      const response = await request(app.getHttpServer())
+        .get(
+          `/api/v2/event-types?username=${orgUser.username}&orgSlug=${organization.slug}&eventSlug=${orgUserEventType1.slug}`
+        )
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+        // note: bearer token value mocked using "withAccessTokenAuth" for user which id is used when creating event type above
+        .set("Authorization", `Bearer whatever`)
+        .expect(200);
+
+      const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14[]> = response.body;
+
+      expect(responseBody.status).toEqual(SUCCESS_STATUS);
+      expect(responseBody.data).toBeDefined();
+      expect(responseBody.data?.length).toEqual(1);
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType1.id)?.id).toBeDefined();
+    });
+
+    it(`/GET/event-types by username and orgId`, async () => {
+      const response = await request(app.getHttpServer())
+        .get(`/api/v2/event-types?username=${orgUser.username}&orgId=${organization.id}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+        // note: bearer token value mocked using "withAccessTokenAuth" for user which id is used when creating event type above
+        .set("Authorization", `Bearer whatever`)
+        .expect(200);
+
+      const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14[]> = response.body;
+
+      expect(responseBody.status).toEqual(SUCCESS_STATUS);
+      expect(responseBody.data).toBeDefined();
+      expect(responseBody.data?.length).toEqual(3);
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType1.id)?.id).toBeDefined();
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType2.id)?.id).toBeDefined();
+      expect(responseBody.data?.find((e) => e.id === orgUserEventType3.id)?.id).toBeDefined();
+    });
+
     it("should return an error when creating an event type with seats enabled and multiple locations", async () => {
       const body: CreateEventTypeInput_2024_06_14 = {
         title: "Coding class 2",
@@ -919,6 +1027,12 @@ describe("Event types Endpoints", () => {
       } catch (e) {
         // User might have been deleted by the test
       }
+
+      try {
+        await userRepositoryFixture.delete(orgUser.id);
+      } catch (e) {
+        // User might have been deleted by the test
+      }
       await app.close();
     });
   });
@@ -1321,6 +1435,73 @@ describe("Event types Endpoints", () => {
         });
     });
 
+    it("should return event type with default bookingFields if they are not defined", async () => {
+      const eventTypeInput = {
+        title: "undefined booking fields",
+        description: "undefined booking fields",
+        length: 40,
+        hidden: false,
+        slug: "undefined-booking-fields",
+        locations: [],
+        schedulingType: SchedulingType.ROUND_ROBIN,
+      };
+      const eventType = await eventTypesRepositoryFixture.create(eventTypeInput, user.id);
+
+      return request(app.getHttpServer())
+        .get(`/api/v2/event-types/${eventType.id}`)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+        .expect(200)
+        .then(async (response) => {
+          const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+          const fetchedEventType = responseBody.data;
+
+          expect(fetchedEventType.bookingFields).toEqual([
+            {
+              isDefault: true,
+              type: "name",
+              slug: "name",
+              required: true,
+            },
+            {
+              isDefault: true,
+              type: "email",
+              slug: "email",
+              required: true,
+            },
+            {
+              isDefault: true,
+              type: "radioInput",
+              slug: "location",
+              required: false,
+            },
+            {
+              isDefault: true,
+              type: "text",
+              slug: "title",
+              required: true,
+            },
+            {
+              isDefault: true,
+              type: "textarea",
+              slug: "notes",
+              required: false,
+            },
+            {
+              isDefault: true,
+              type: "multiemail",
+              slug: "guests",
+              required: false,
+            },
+            {
+              isDefault: true,
+              type: "textarea",
+              slug: "rescheduleReason",
+              required: false,
+            },
+          ]);
+        });
+    });
+
     afterAll(async () => {
       await oauthClientRepositoryFixture.delete(oAuthClient.id);
       await teamRepositoryFixture.delete(organization.id);

apps/api/v2/src/ee/event-types/event-types_2024_06_14/inputs/create-phone-call.input.ts

@@ -1,4 +1,4 @@
-import { ApiProperty as DocsProperty } from "@nestjs/swagger";
+import { ApiProperty as DocsProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Transform } from "class-transformer";
 import { IsString, IsBoolean, IsOptional, IsEnum, Matches } from "class-validator";
 
@@ -38,34 +38,34 @@ export class CreatePhoneCallInput {
 
   @IsOptional()
   @IsString()
-  @DocsProperty({ description: "Scheduler name" })
+  @ApiPropertyOptional({ description: "Scheduler name" })
   schedulerName?: string;
 
   @IsOptional()
   @IsString()
   @Transform(({ value }) => (value ? value : undefined))
-  @DocsProperty({ description: "Guest name" })
+  @ApiPropertyOptional({ description: "Guest name" })
   guestName?: string;
 
   @IsOptional()
   @IsString()
   @Transform(({ value }) => (value ? value : undefined))
-  @DocsProperty({ description: "Guest email" })
+  @ApiPropertyOptional({ description: "Guest email" })
   guestEmail?: string;
 
   @IsOptional()
   @IsString()
   @Transform(({ value }) => (value ? value : undefined))
-  @DocsProperty({ description: "Guest company" })
+  @ApiPropertyOptional({ description: "Guest company" })
   guestCompany?: string;
 
   @IsOptional()
   @IsString()
-  @DocsProperty({ description: "Begin message" })
+  @ApiPropertyOptional({ description: "Begin message" })
   beginMessage?: string;
 
   @IsOptional()
   @IsString()
-  @DocsProperty({ description: "General prompt" })
+  @ApiPropertyOptional({ description: "General prompt" })
   generalPrompt?: string;
 }

apps/api/v2/src/ee/event-types/event-types_2024_06_14/pipes/event-type-response.transformer.ts

@@ -17,7 +17,7 @@ export class EventTypeResponseTransformPipe implements PipeTransform {
   private transformEventType(eventType: EventTypeResponse): EventTypeOutput_2024_06_14 {
     return plainToClass(
       EventTypeOutput_2024_06_14,
-      this.outputEventTypesService.getResponseEventType(eventType.ownerId, eventType),
+      this.outputEventTypesService.getResponseEventType(eventType.ownerId, eventType, false),
       { strategy: "exposeAll" }
     );
   }

apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/event-types.service.ts

@@ -74,8 +74,13 @@ export class EventTypesService_2024_06_14 {
     await this.checkUserOwnsSchedule(userId, body.scheduleId);
   }
 
-  async getEventTypeByUsernameAndSlug(username: string, eventTypeSlug: string) {
-    const user = await this.usersRepository.findByUsername(username);
+  async getEventTypeByUsernameAndSlug(
+    username: string,
+    eventTypeSlug: string,
+    orgSlug?: string,
+    orgId?: number
+  ) {
+    const user = await this.usersRepository.findByUsername(username, orgSlug, orgId);
     if (!user) {
       return null;
     }
@@ -92,8 +97,8 @@ export class EventTypesService_2024_06_14 {
     };
   }
 
-  async getEventTypesByUsername(username: string) {
-    const user = await this.usersRepository.findByUsername(username);
+  async getEventTypesByUsername(username: string, orgSlug?: string, orgId?: number) {
+    const user = await this.usersRepository.findByUsername(username, orgSlug, orgId);
     if (!user) {
       return [];
     }
@@ -152,27 +157,26 @@ export class EventTypesService_2024_06_14 {
   }
 
   async getEventTypes(queryParams: GetEventTypesQuery_2024_06_14) {
-    const { username, eventSlug, usernames } = queryParams;
-
+    const { username, eventSlug, usernames, orgSlug, orgId } = queryParams;
     if (username && eventSlug) {
-      const eventType = await this.getEventTypeByUsernameAndSlug(username, eventSlug);
+      const eventType = await this.getEventTypeByUsernameAndSlug(username, eventSlug, orgSlug, orgId);
       return eventType ? [eventType] : [];
     }
 
     if (username) {
-      return await this.getEventTypesByUsername(username);
+      return await this.getEventTypesByUsername(username, orgSlug, orgId);
     }
 
     if (usernames) {
-      const dynamicEventType = await this.getDynamicEventType(usernames);
+      const dynamicEventType = await this.getDynamicEventType(usernames, orgSlug, orgId);
       return [dynamicEventType];
     }
 
     return [];
   }
 
-  async getDynamicEventType(usernames: string[]) {
-    const users = await this.usersService.getByUsernames(usernames);
+  async getDynamicEventType(usernames: string[], orgSlug?: string, orgId?: number) {
+    const users = await this.usersService.getByUsernames(usernames, orgSlug, orgId);
     const usersFiltered: UserWithProfile[] = [];
     for (const user of users) {
       if (user) {

apps/api/v2/src/ee/event-types/event-types_2024_06_14/services/output-event-types.service.ts

@@ -21,6 +21,7 @@ import {
   transformSeatsInternalToApi,
   InternalLocation,
   BookingFieldSchema,
+  getBookingFieldsWithSystemFields,
 } from "@calcom/platform-libraries";
 import {
   TransformFutureBookingsLimitSchema_2024_06_14,
@@ -88,7 +89,11 @@ type Input = Pick<
 
 @Injectable()
 export class OutputEventTypesService_2024_06_14 {
-  getResponseEventType(ownerId: number, databaseEventType: Input): EventTypeOutput_2024_06_14 {
+  getResponseEventType(
+    ownerId: number,
+    databaseEventType: Input,
+    isOrgTeamEvent: boolean
+  ): EventTypeOutput_2024_06_14 {
     const {
       id,
       length,
@@ -122,7 +127,7 @@ export class OutputEventTypesService_2024_06_14 {
     const customName = databaseEventType?.eventName ?? undefined;
     const bookingFields = databaseEventType.bookingFields
       ? this.transformBookingFields(databaseEventType.bookingFields)
-      : [];
+      : this.getDefaultBookingFields(isOrgTeamEvent);
     const recurrence = this.transformRecurringEvent(databaseEventType.recurringEvent);
     const metadata = this.transformMetadata(databaseEventType.metadata) || {};
     const users = this.transformUsers(databaseEventType.users || []);
@@ -240,6 +245,18 @@ export class OutputEventTypesService_2024_06_14 {
     return [...transformBookingFieldsInternalToApi(knownBookingFields), ...unknownBookingFields];
   }
 
+  getDefaultBookingFields(isOrgTeamEvent: boolean) {
+    const defaultBookingFields = getBookingFieldsWithSystemFields({
+      disableGuests: false,
+      bookingFields: null,
+      customInputs: [],
+      metadata: null,
+      workflows: [],
+      isOrgTeamEvent,
+    });
+    return this.transformBookingFields(defaultBookingFields);
+  }
+
   transformRecurringEvent(recurringEvent: any) {
     if (!recurringEvent) return null;
     const recurringEventParsed = parseRecurringEvent(recurringEvent);

apps/api/v2/src/ee/gcal/gcal.controller.e2e-spec.ts

@@ -95,7 +95,7 @@ describe("Platform Gcal Endpoints", () => {
       .expect(401);
   });
 
-  it(`/GET/gcal/oauth/auth-url: it should auth-url to google oauth with valid access token `, async () => {
+  it(`/GET/gcal/oauth/auth-url: it should auth-url to google OAuth with valid access token `, async () => {
     const response = await request(app.getHttpServer())
       .get(`/v2/gcal/oauth/auth-url`)
       .set("Authorization", `Bearer ${accessTokenSecret}`)
@@ -105,7 +105,7 @@ describe("Platform Gcal Endpoints", () => {
     expect(data.authUrl).toBeDefined();
   });
 
-  it(`/GET/gcal/oauth/save: without oauth code`, async () => {
+  it(`/GET/gcal/oauth/save: without OAuth code`, async () => {
     await request(app.getHttpServer())
       .get(
         `/v2/gcal/oauth/save?state=accessToken=${accessTokenSecret}&origin%3D${CLIENT_REDIRECT_URI}&scope=https://www.googleapis.com/auth/calendar.readonly%20https://www.googleapis.com/auth/calendar.events`

apps/api/v2/src/ee/gcal/gcal.controller.ts

@@ -27,10 +27,7 @@ import {
 } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";
-import { Prisma } from "@prisma/client";
 import { Request } from "express";
-import { google } from "googleapis";
-import { z } from "zod";
 
 import { APPS_READ, GOOGLE_CALENDAR_TYPE, SUCCESS_STATUS } from "@calcom/platform-constants";
 
@@ -103,7 +100,7 @@ export class GcalController {
     }
 
     if (gcalCredentials.invalid) {
-      throw new BadRequestException("Invalid google oauth credentials.");
+      throw new BadRequestException("Invalid google OAuth credentials.");
     }
 
     const { connectedCalendars } = await this.calendarsService.getCalendars(userId);

apps/api/v2/src/ee/me/outputs/me.output.ts

@@ -1,39 +1,51 @@
+import { ApiProperty as DocsProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
-import { IsInt, IsEmail, IsOptional, IsString, ValidateNested } from "class-validator";
+import { IsString, IsOptional, IsInt, IsEmail, ValidateNested } from "class-validator";
 
 export class MeOrgOutput {
+  @DocsProperty()
   isPlatform!: boolean;
 
+  @DocsProperty()
   id!: number;
 }
+
 export class MeOutput {
   @IsInt()
+  @DocsProperty()
   id!: number;
 
   @IsString()
+  @DocsProperty()
   username!: string;
 
   @IsEmail()
+  @DocsProperty()
   email!: string;
 
   @IsInt()
+  @DocsProperty()
   timeFormat!: number;
 
   @IsInt()
-  @IsOptional()
+  @DocsProperty({ type: Number, nullable: true })
   defaultScheduleId!: number | null;
 
   @IsString()
+  @DocsProperty()
   weekStart!: string;
 
   @IsString()
+  @DocsProperty()
   timeZone!: string;
 
   @IsInt()
+  @DocsProperty({ type: Number, nullable: true })
   organizationId!: number | null;
 
   @IsOptional()
   @ValidateNested()
   @Type(() => MeOrgOutput)
+  @ApiPropertyOptional({ type: MeOrgOutput })
   organization?: MeOrgOutput;
 }

apps/api/v2/src/ee/platform-endpoints-module.ts

@@ -9,6 +9,9 @@ import { ProviderModule } from "@/ee/provider/provider.module";
 import { SchedulesModule_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.module";
 import { SchedulesModule_2024_06_11 } from "@/ee/schedules/schedules_2024_06_11/schedules.module";
 import { SlotsModule } from "@/modules/slots/slots.module";
+import { TeamsEventTypesModule } from "@/modules/teams/event-types/teams-event-types.module";
+import { TeamsModule } from "@/modules/teams/teams/teams.module";
+import { TeamsMembershipsModule } from "@/modules/teams/memberships/teams-memberships.module";
 import type { MiddlewareConsumer, NestModule } from "@nestjs/common";
 import { Module } from "@nestjs/common";
 
@@ -18,13 +21,16 @@ import { Module } from "@nestjs/common";
     ProviderModule,
     SchedulesModule_2024_04_15,
     SchedulesModule_2024_06_11,
+    TeamsEventTypesModule,
     MeModule,
     EventTypesModule_2024_04_15,
     EventTypesModule_2024_06_14,
     CalendarsModule,
     BookingsModule_2024_04_15,
     BookingsModule_2024_08_13,
+    TeamsMembershipsModule,
     SlotsModule,
+    TeamsModule,
   ],
 })
 export class PlatformEndpointsModule implements NestModule {

apps/api/v2/src/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input.ts

@@ -1,20 +1,25 @@
 import { CreateAvailabilityInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-availability.input";
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsArray, IsBoolean, IsTimeZone, IsOptional, IsString, ValidateNested } from "class-validator";
 
 export class CreateScheduleInput_2024_04_15 {
   @IsString()
+  @ApiProperty()
   name!: string;
 
   @IsTimeZone()
+  @ApiProperty()
   timeZone!: string;
 
   @IsArray()
   @ValidateNested({ each: true })
   @Type(() => CreateAvailabilityInput_2024_04_15)
   @IsOptional()
+  @ApiPropertyOptional({ type: [CreateAvailabilityInput_2024_04_15] })
   availabilities?: CreateAvailabilityInput_2024_04_15[];
 
   @IsBoolean()
+  @ApiProperty()
   isDefault!: boolean;
 }

apps/api/v2/src/ee/schedules/schedules_2024_04_15/outputs/schedule-updated.output.ts

@@ -1,95 +1,117 @@
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsBoolean, IsInt, IsOptional, IsString, ValidateNested, IsArray } from "class-validator";
 
 class EventTypeModel_2024_04_15 {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional({ type: String, nullable: true })
   eventName?: string | null;
 }
 
 class AvailabilityModel_2024_04_15 {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsOptional()
   @IsInt()
+  @ApiPropertyOptional({ type: Number, nullable: true })
   userId?: number | null;
 
   @IsOptional()
   @IsInt()
+  @ApiPropertyOptional({ type: Number, nullable: true })
   scheduleId?: number | null;
 
   @IsOptional()
   @IsInt()
+  @ApiPropertyOptional({ type: Number, nullable: true })
   eventTypeId?: number | null;
 
   @IsArray()
   @IsInt({ each: true })
+  @ApiProperty({ type: [Number] })
   days!: number[];
 
   @IsOptional()
   @Type(() => Date)
-  @IsString() // Assuming date is serialized/deserialized appropriately
+  @IsString()
+  @ApiPropertyOptional()
   startTime?: Date;
 
   @IsOptional()
   @Type(() => Date)
-  @IsString() // Assuming date is serialized/deserialized appropriately
+  @IsString()
+  @ApiPropertyOptional()
   endTime?: Date;
 
   @IsOptional()
   @Type(() => Date)
-  @IsString() // Assuming date is serialized/deserialized appropriately
+  @IsString()
+  @ApiPropertyOptional({ type: String, nullable: true })
   date?: Date | null;
 }
 
 class ScheduleModel_2024_04_15 {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsInt()
+  @ApiProperty()
   userId!: number;
 
   @IsString()
+  @ApiProperty()
   name!: string;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional({ type: String, nullable: true })
   timeZone?: string | null;
 
   @IsOptional()
   @ValidateNested({ each: true })
   @Type(() => EventTypeModel_2024_04_15)
   @IsArray()
+  @ApiPropertyOptional({ type: [EventTypeModel_2024_04_15] })
   eventType?: EventTypeModel_2024_04_15[];
 
   @IsOptional()
   @ValidateNested({ each: true })
   @Type(() => AvailabilityModel_2024_04_15)
   @IsArray()
+  @ApiPropertyOptional({ type: [AvailabilityModel_2024_04_15] })
   availability?: AvailabilityModel_2024_04_15[];
 }
 
 export class UpdatedScheduleOutput_2024_04_15 {
   @ValidateNested()
   @Type(() => ScheduleModel_2024_04_15)
+  @ApiProperty({ type: ScheduleModel_2024_04_15 })
   schedule!: ScheduleModel_2024_04_15;
 
   @IsBoolean()
+  @ApiProperty()
   isDefault!: boolean;
 
   @IsOptional()
   @IsString()
+  @ApiPropertyOptional()
   timeZone?: string;
 
   @IsOptional()
   @IsInt()
+  @ApiPropertyOptional({ type: Number, nullable: true })
   prevDefaultId?: number | null;
 
   @IsOptional()
   @IsInt()
+  @ApiPropertyOptional({ type: Number, nullable: true })
   currentDefaultId?: number | null;
 }

apps/api/v2/src/ee/schedules/schedules_2024_04_15/outputs/schedule.output.ts

@@ -1,105 +1,132 @@
+import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsDate, IsOptional, IsArray, IsBoolean, IsInt, IsString, ValidateNested } from "class-validator";
 
 class AvailabilityModel {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsOptional()
   @IsInt()
+  @ApiPropertyOptional({ type: Number, nullable: true })
   userId?: number | null;
 
   @IsOptional()
   @IsInt()
+  @ApiPropertyOptional({ type: Number, nullable: true })
   eventTypeId?: number | null;
 
   @IsArray()
   @IsInt({ each: true })
+  @ApiProperty({ type: [Number] })
   days!: number[];
 
   @IsDate()
   @Type(() => Date)
+  @ApiProperty({ type: Date })
   startTime!: Date;
 
   @IsDate()
   @Type(() => Date)
+  @ApiProperty({ type: Date })
   endTime!: Date;
 
   @IsOptional()
   @IsDate()
   @Type(() => Date)
+  @ApiPropertyOptional({ type: Date, nullable: true })
   date?: Date | null;
 
   @IsOptional()
   @IsInt()
+  @ApiPropertyOptional({ type: Number, nullable: true })
   scheduleId?: number | null;
 }
 
 class WorkingHours {
   @IsArray()
   @IsInt({ each: true })
+  @ApiProperty({ type: [Number] })
   days!: number[];
 
   @IsInt()
+  @ApiProperty()
   startTime!: number;
 
   @IsInt()
+  @ApiProperty()
   endTime!: number;
 
   @IsOptional()
   @IsInt()
+  @ApiPropertyOptional({ type: Number, nullable: true })
   userId?: number | null;
 }
 
 class TimeRange {
   @IsOptional()
   @IsInt()
+  @ApiPropertyOptional({ type: Number, nullable: true })
   userId?: number | null;
 
   @IsDate()
+  @ApiProperty({ type: Date })
   start!: Date;
 
   @IsDate()
+  @ApiProperty({ type: Date })
   end!: Date;
 }
 
 export class ScheduleOutput {
   @IsInt()
+  @ApiProperty()
   id!: number;
 
   @IsString()
+  @ApiProperty()
   name!: string;
 
   @IsBoolean()
+  @ApiProperty()
   isManaged!: boolean;
 
   @ValidateNested({ each: true })
   @Type(() => WorkingHours)
+  @ApiProperty({ type: [WorkingHours] })
   workingHours!: WorkingHours[];
 
   @ValidateNested({ each: true })
   @Type(() => AvailabilityModel)
   @IsArray()
+  @ApiProperty({ type: [AvailabilityModel] })
   schedule!: AvailabilityModel[];
 
+  @ApiProperty({ type: [[TimeRange]] })
   availability!: TimeRange[][];
 
   @IsString()
+  @ApiProperty()
   timeZone!: string;
 
   @ValidateNested({ each: true })
   @IsArray()
+  @ApiPropertyOptional({ type: [Object] })
   // note(Lauris) it should be
   // dateOverrides!: { ranges: TimeRange[] }[];
   // but docs aren't generating correctly it results in array of strings
   dateOverrides!: unknown[];
 
   @IsBoolean()
+  @ApiProperty()
   isDefault!: boolean;
 
   @IsBoolean()
+  @ApiProperty()
   isLastSchedule!: boolean;
 
   @IsBoolean()
+  @ApiProperty()
   readOnly!: boolean;
 }

apps/api/v2/src/env.ts

@@ -30,12 +30,14 @@ export type Environment = {
   RATE_LIMIT_DEFAULT_BLOCK_DURATION_MS: number;
   AXIOM_DATASET: string;
   AXIOM_TOKEN: string;
+  STRIPE_TEAM_MONTHLY_PRICE_ID: string;
+  IS_TEAM_BILLING_ENABLED: boolean;
 };
 
 export const getEnv = <K extends keyof Environment>(key: K, fallback?: Environment[K]): Environment[K] => {
   const value = process.env[key] as Environment[K] | undefined;
 
-  if (!value) {
+  if (value === undefined) {
     if (fallback) {
       return fallback;
     }

apps/api/v2/src/filters/prisma-exception.filter.ts

@@ -9,7 +9,13 @@ import {
 } from "@prisma/client/runtime/library";
 import { Request } from "express";
 
-import { ERROR_STATUS, INTERNAL_SERVER_ERROR } from "@calcom/platform-constants";
+import {
+  BAD_REQUEST,
+  CONFLICT,
+  ERROR_STATUS,
+  INTERNAL_SERVER_ERROR,
+  NOT_FOUND,
+} from "@calcom/platform-constants";
 import { Response } from "@calcom/platform-types";
 
 type PrismaError =
@@ -43,11 +49,37 @@ export class PrismaExceptionFilter implements ExceptionFilter {
       method: request.method,
       requestId,
     });
-    response.status(HttpStatus.INTERNAL_SERVER_ERROR).json({
+
+    let message = "There was an error, please try again later.";
+    let statusCode = HttpStatus.INTERNAL_SERVER_ERROR;
+    let errorCode = INTERNAL_SERVER_ERROR;
+    if (error instanceof PrismaClientKnownRequestError) {
+      switch (error.code) {
+        case "P2002": // Unique constraint failed
+          errorCode = CONFLICT;
+          statusCode = HttpStatus.CONFLICT;
+          message = "Invalid Input: Trying to create a record that already exists.";
+          break;
+        case "P2025": // Record not found
+          errorCode = NOT_FOUND;
+          statusCode = HttpStatus.NOT_FOUND;
+          message = "Invalid Query: The requested record was not found.";
+          break;
+        case "P2003": // Foreign key constraint failed
+          errorCode = BAD_REQUEST;
+          statusCode = HttpStatus.BAD_REQUEST;
+          message = "Invalid input: The referenced data does not exist.";
+          break;
+        default:
+          break;
+      }
+    }
+
+    response.status(statusCode).json({
       status: ERROR_STATUS,
       timestamp: new Date().toISOString(),
       path: request.url,
-      error: { code: INTERNAL_SERVER_ERROR, message: "There was an error, please try again later." },
+      error: { code: errorCode, message: message },
     });
   }
 }

apps/api/v2/src/lib/is-origin-allowed/is-origin-allowed.spec.ts

@@ -0,0 +1,65 @@
+import { isOriginAllowed } from "@/lib/is-origin-allowed/is-origin-allowed";
+
+describe("isOriginAllowed", () => {
+  describe("is allowed", () => {
+    it("should return true for exact match without wildcard", () => {
+      const allowedOrigins = ["https://app.cal.com/callback"];
+      const origin = "https://app.cal.com/callback";
+      expect(isOriginAllowed(origin, allowedOrigins)).toBe(true);
+    });
+
+    it("should return true for wildcard domain match", () => {
+      const allowedOrigins = ["*.multiscreen.d1test.biz"];
+      const origin = "https://sub.multiscreen.d1test.biz";
+      expect(isOriginAllowed(origin, allowedOrigins)).toBe(true);
+    });
+
+    it("should return true for wildcard pattern matching any domain", () => {
+      const allowedOrigins = ["*/callback"];
+      const origin = "https://another.com/callback";
+      expect(isOriginAllowed(origin, allowedOrigins)).toBe(true);
+    });
+
+    it("should handle a wildcard only pattern", () => {
+      const allowedOrigins = ["*"];
+      const origin = "https://any.domain.com/anypath";
+      expect(isOriginAllowed(origin, allowedOrigins)).toBe(true);
+    });
+
+    it("should handle multiple allowed URIs where only one matches", () => {
+      const allowedOrigins = [
+        "https://app.cal.com/other",
+        "*.notthisone.com",
+        "https://app.cal.com/callback",
+      ];
+      const origin = "https://app.cal.com/callback";
+      expect(isOriginAllowed(origin, allowedOrigins)).toBe(true);
+    });
+
+    it("should handle patterns with multiple wildcards correctly", () => {
+      const allowedOrigins = ["https://*.mydomain.com/*"];
+      const origin = "https://sub.mydomain.com/path/to/resource";
+      expect(isOriginAllowed(origin, allowedOrigins)).toBe(true);
+    });
+  });
+
+  describe("is not allowed", () => {
+    it("should return false if no allowed patterns match", () => {
+      const allowedOrigins = ["https://app.cal.com/callback", "*.multiscreen.d1test.biz", "*/callback"];
+      const origin = "https://unknown.com";
+      expect(isOriginAllowed(origin, allowedOrigins)).toBe(false);
+    });
+
+    it("should return false if wildcard pattern doesn't match the given origin", () => {
+      const allowedOrigins = ["*.example.com"];
+      const origin = "https://notexample.org";
+      expect(isOriginAllowed(origin, allowedOrigins)).toBe(false);
+    });
+
+    it("should handle empty allowedUris array correctly", () => {
+      const allowedOrigins: string[] = [];
+      const origin = "https://app.cal.com/callback";
+      expect(isOriginAllowed(origin, allowedOrigins)).toBe(false);
+    });
+  });
+});

apps/api/v2/src/lib/is-origin-allowed/is-origin-allowed.ts

@@ -0,0 +1,18 @@
+export function isOriginAllowed(origin: string, allowedOrigins: string[]): boolean {
+  return allowedOrigins.some((allowedOrigin) => {
+    if (allowedOrigin.includes("*")) {
+      return wildcardToRegex(allowedOrigin).test(origin);
+    }
+    return origin === allowedOrigin;
+  });
+}
+
+function wildcardToRegex(pattern: string): RegExp {
+  const escaped = escapeRegex(pattern);
+  const regexPattern = "^" + escaped.replace(/\\\*/g, ".*") + "$";
+  return new RegExp(regexPattern);
+}
+
+function escapeRegex(str: string): string {
+  return str.replace(/[.+*?^${}()|[\]\\]/g, "\\$&");
+}

apps/api/v2/src/lib/logger.ts

@@ -1,6 +1,6 @@
 import { WinstonTransport as AxiomTransport } from "@axiomhq/winston";
 import type { LoggerOptions } from "winston";
-import { format, transports as Transports } from "winston";
+import { format, transports as Transports, config } from "winston";
 import type Transport from "winston-transport";
 
 const formattedTimestamp = format.timestamp({
@@ -8,14 +8,7 @@ const formattedTimestamp = format.timestamp({
 });
 
 const colorizer = format.colorize({
-  colors: {
-    fatal: "red",
-    error: "red",
-    warn: "yellow",
-    info: "blue",
-    debug: "white",
-    trace: "grey",
-  },
+  colors: config.npm.colors,
 });
 
 const WINSTON_DEV_FORMAT = format.combine(
@@ -26,14 +19,7 @@ const WINSTON_DEV_FORMAT = format.combine(
 );
 const WINSTON_PROD_FORMAT = format.combine(format.errors({ stack: true }), formattedTimestamp, format.json());
 
-export const logLevels = {
-  fatal: 0,
-  error: 1,
-  warn: 2,
-  info: 3,
-  debug: 4,
-  trace: 5,
-} as const;
+export const logLevels = config.npm.levels;
 
 export const loggerConfig = (): LoggerOptions => {
   const isProduction = process.env.NODE_ENV === "production";

apps/api/v2/src/lib/safe-parse/default-responses-booking.ts

@@ -0,0 +1,12 @@
+export const defaultBookingResponses = {
+  name: "unknown",
+  email: "unknown",
+  guests: [],
+  rescheduleReason: "unknown",
+};
+
+export const defaultBookingMetadata = { videoCallUrl: "unknown" };
+
+export const defaultSeatedBookingData = { responses: { name: "unknown", email: "unknown" } };
+
+export const defaultSeatedBookingMetadata = {};

apps/api/v2/src/lib/safe-parse/safe-parse.ts

@@ -0,0 +1,23 @@
+import { Logger } from "@nestjs/common";
+import { ZodSchema } from "zod";
+
+const logger = new Logger("safeParse");
+
+export function safeParse<T>(schema: ZodSchema<T>, value: unknown, defaultValue: T): T {
+  const result = schema.safeParse(value);
+  if (result.success) {
+    return result.data;
+  } else {
+    const errorStack = new Error().stack;
+
+    logger.error(
+      `Zod parsing failed.\n` +
+        `1. Schema: ${schema.description || "UnnamedSchema"}\n` +
+        `2. Input: ${JSON.stringify(value, null, 2)}\n` +
+        `3. Zod Error: ${result.error}\n` +
+        `4. Call Stack: ${errorStack}`
+    );
+
+    return defaultValue;
+  }
+}

apps/api/v2/src/lib/throttler-guard.ts

@@ -56,7 +56,7 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
     const request = context.switchToHttp().getRequest<Request>();
     const response = context.switchToHttp().getResponse<Response>();
     const tracker = await this.getTracker(request);
-    this.logger.log(
+    this.logger.verbose(
       `Tracker "${tracker}" generated based on: Bearer token "${request.get(
         "Authorization"
       )}", OAuth client ID "${request.get(X_CAL_CLIENT_ID)}" and IP "${request.ip}"`
@@ -89,7 +89,7 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
 
   private async handleNonApiKeyRequest(tracker: string, response: Response): Promise<boolean> {
     const rateLimit = this.getDefaultRateLimit(tracker);
-    this.logger.log(`Tracker "${tracker}" uses default rate limits because it is not tracking api key:
+    this.logger.verbose(`Tracker "${tracker}" uses default rate limits because it is not tracking api key:
       ${JSON.stringify(rateLimit, null, 2)}
     `);
 
@@ -135,7 +135,7 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
 
     const cachedRateLimits = await this.storageService.redis.get(cacheKey);
     if (cachedRateLimits) {
-      this.logger.log(`Tracker "${tracker}" rate limits retrieved from redis cache:
+      this.logger.verbose(`Tracker "${tracker}" rate limits retrieved from redis cache:
         ${cachedRateLimits}
       `);
       return rateLimitsSchema.parse(JSON.parse(cachedRateLimits));
@@ -158,13 +158,13 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
     });
 
     if (rateLimits) {
-      this.logger.log(`Tracker "${tracker}" rate limits retrieved from database:
+      this.logger.verbose(`Tracker "${tracker}" rate limits retrieved from database:
         ${JSON.stringify(rateLimits, null, 2)}`);
     }
 
     if (!rateLimits || rateLimits.length === 0) {
       rateLimits = [this.getDefaultRateLimit(tracker)];
-      this.logger.log(`Tracker "${tracker}" rate limits not found in database. Using default rate limits:
+      this.logger.verbose(`Tracker "${tracker}" rate limits not found in database. Using default rate limits:
         ${JSON.stringify(rateLimits, null, 2)}`);
     }
 
@@ -194,10 +194,10 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
     );
     response.setHeader(`X-RateLimit-Reset-${nameFirstUpper}`, timeToBlockExpire || timeToExpire);
 
-    this.logger.log(
+    this.logger.verbose(
       `Tracker "${tracker}" rate limit "${name}" incremented. isBlocked ${isBlocked}, totalHits ${totalHits}, timeToExpire ${timeToExpire}, timeToBlockExpire ${timeToBlockExpire}`
     );
-    this.logger.log(
+    this.logger.verbose(
       `Tracker "${tracker}" rate limit "${name}" response headers:
         X-RateLimit-Limit-${nameFirstUpper}: ${limit},
         X-RateLimit-Remaining-${nameFirstUpper}: ${timeToBlockExpire ? 0 : Math.max(0, limit - totalHits)},
@@ -227,7 +227,7 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
       return `ip_${request.ip}`;
     }
 
-    this.logger.log(`no tracker found: ${request.url}`);
+    this.logger.verbose(`no tracker found: ${request.url}`);
     return "unknown";
   }
 }

apps/api/v2/src/modules/apps/apps.repository.ts

@@ -22,6 +22,15 @@ export class AppsRepository {
     });
   }
 
+  async deleteAppCredentials(credentialIdsToDelete: number[], userId: number) {
+    return this.dbWrite.prisma.credential.deleteMany({
+      where: {
+        id: { in: credentialIdsToDelete },
+        userId,
+      },
+    });
+  }
+
   async createTeamAppCredential(type: string, key: Prisma.InputJsonValue, teamId: number, appId: string) {
     return this.dbWrite.prisma.credential.create({
       data: {
@@ -32,4 +41,28 @@ export class AppsRepository {
       },
     });
   }
+
+  async findAppCredential({
+    type,
+    appId,
+    userId,
+    teamId,
+  }: {
+    type: string;
+    appId: string;
+    userId?: number;
+    teamId?: number;
+  }) {
+    return this.dbWrite.prisma.credential.findMany({
+      select: {
+        id: true,
+      },
+      where: {
+        type,
+        userId,
+        teamId,
+        appId,
+      },
+    });
+  }
 }