chore: release v5.7.8

* watchlist schema update

* changes addressed

* no backfill audit

* fix type

* fix flow of migration

* fix err

* type err fix

* add if exists check in migration

.env.example

@@ -144,6 +144,12 @@ GOOGLE_WEBHOOK_TOKEN=
 # Optional URL to override for tunelling webhooks. Defaults to NEXT_PUBLIC_WEBAPP_URL.
 GOOGLE_WEBHOOK_URL=
 
+# Token to verify incoming webhooks from Microsoft Calendar
+MICROSOFT_WEBHOOK_TOKEN=
+
+# Optional URL to override for tunelling webhooks. Defaults to NEXT_PUBLIC_WEBAPP_URL.
+MICROSOFT_WEBHOOK_URL=
+
 # Inbox to send user feedback
 SEND_FEEDBACK_EMAIL=
 

.eslintignore

@@ -1,9 +0,0 @@
-node_modules
-apps/api/v2/dist
-packages/platform/**/dist/*
-**/**/node_modules
-**/**/.next
-**/**/public
-packages/prisma/zod
-apps/web/public/embed
-packages/ui/components/icon/dynamicIconImports.tsx

.eslintrc.js

@@ -1,115 +0,0 @@
-/** @type {import("eslint").Linter.Config} */
-module.exports = {
-  extends: ["./packages/config/eslint-preset.js"],
-  plugins: ["import"],
-  rules: {
-    "import/no-cycle": ["warn", { maxDepth: Infinity }],
-  },
-  overrides: [
-    // WARN: features must not be imported by app-store or lib
-    {
-      files: ["packages/app-store/**/*.{ts,tsx,js,jsx}", "packages/lib/**/*.{ts,tsx,js,jsx}"],
-      rules: {
-        "no-restricted-imports": [
-          "warn",
-          {
-            patterns: [
-              {
-                group: [
-                  // Catch all relative paths into features
-                  "**/features",
-                  "**/features/*",
-                  // Catch all alias imports
-                  "@calcom/features",
-                  "@calcom/features/*",
-                ],
-                message: "Avoid importing @calcom/features from @calcom/app-store or @calcom/lib.",
-              },
-            ],
-          },
-        ],
-      },
-    },
-    // WARN: lib must not import app-store or features
-    {
-      files: ["packages/lib/**/*.{ts,tsx,js,jsx}"],
-      rules: {
-        "no-restricted-imports": [
-          "warn",
-          {
-            patterns: [
-              {
-                group: [
-                  // Catch all relative paths into app-store
-                  "**/app-store",
-                  "**/app-store/*",
-                  // Catch all relative paths into features
-                  "**/features",
-                  "**/features/*",
-                  // Catch alias imports
-                  "@calcom/app-store",
-                  "@calcom/app-store/*",
-                  "@calcom/features",
-                  "@calcom/features/*",
-                ],
-                message: "@calcom/lib should not import @calcom/app-store or @calcom/features.",
-              },
-            ],
-          },
-        ],
-      },
-    },
-    // ERROR: app-store must not import trpc
-    {
-      files: ["packages/app-store/**/*.{ts,tsx,js,jsx}"],
-      rules: {
-        "no-restricted-imports": [
-          "error",
-          {
-            patterns: [
-              {
-                group: [
-                  // Catch all relative paths into trpc
-                  "**/trpc",
-                  "**/trpc/*",
-                  // Catch alias imports
-                  "@calcom/trpc",
-                  "@calcom/trpc/*",
-                  "@trpc",
-                  "@trpc/*",
-                ],
-                message:
-                  "@calcom/app-store must not import trpc. Move UI to apps/web/components/apps or introduce an API boundary.",
-              },
-            ],
-          },
-        ],
-      },
-    },
-
-    // ERROR: prisma must not import `features` package
-    {
-      files: ["packages/prisma/**/*.{ts,tsx,js,jsx}"],
-      rules: {
-        "no-restricted-imports": [
-          "error",
-          {
-            patterns: [
-              {
-                group: [
-                  // Catch all relative paths into features
-                  "**/features",
-                  "**/features/*",
-                  // Catch all alias imports
-                  "@calcom/features",
-                  "@calcom/features/*",
-                ],
-                message: "Avoid importing @calcom/features from @calcom/prisma.",
-              },
-            ],
-          },
-        ],
-      },
-    },
-  ],
-};

.github/CODEOWNERS

@@ -1,5 +1,5 @@
 /**/package.json @calcom/Foundation
-/apps/api/**/* @calcom/Platform @calcom/Foundation
+/apps/api/**/* @calcom/API
 /apps/ui-playground/**/* @calcom/Consumer @calcom/Foundation
 /apps/web/**/layout.tsx @calcom/Consumer @calcom/Foundation
 /apps/web/lib/csp.ts @calcom/Foundation

.github/workflows/all-checks.yml

@@ -74,14 +74,8 @@ jobs:
     uses: ./.github/workflows/e2e-embed-react.yml
     secrets: inherit
 
-  e2e-atoms:
-    name: Tests
-    needs: [lint, build, build-atoms, build-api-v2]
-    uses: ./.github/workflows/e2e-atoms.yml
-    secrets: inherit
-
   required:
-    needs: [lint, type-check, unit-test, integration-test, build, build-api-v1, build-api-v2, e2e, e2e-embed, e2e-embed-react, e2e-app-store, e2e-atoms]
+    needs: [lint, type-check, unit-test, integration-test, build, build-api-v1, build-api-v2, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
     if: always()
     runs-on: buildjet-2vcpu-ubuntu-2204
     steps:

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

@@ -1,4 +1,4 @@
-name: E2E
+name: Check breaking changes and run E2E
 on:
   workflow_call:
 env:
@@ -23,6 +23,10 @@ env:
   STRIPE_CLIENT_ID: ${{ secrets.CI_STRIPE_CLIENT_ID }}
   STRIPE_WEBHOOK_SECRET: ${{ secrets.CI_STRIPE_WEBHOOK_SECRET }}
   SLOTS_CACHE_TTL: ${{ secrets.CI_SLOTS_CACHE_TTL }}
+  NEXT_PUBLIC_VAPID_PUBLIC_KEY: ${{ secrets.NEXT_PUBLIC_VAPID_PUBLIC_KEY }}
+  VAPID_PRIVATE_KEY: ${{ secrets.VAPID_PRIVATE_KEY }}
+  JWT_SECRET: ${{ secrets.CI_JWT_SECRET }}
+  NODE_ENV: ${{ vars.CI_NODE_ENV }}
 jobs:
   e2e:
     timeout-minutes: 20
@@ -68,6 +72,18 @@ jobs:
       - uses: ./.github/actions/dangerous-git-checkout
       - uses: ./.github/actions/yarn-install
       - uses: ./.github/actions/cache-db
+      
+      - name: Generate Swagger
+        working-directory: apps/api/v2
+        run: yarn generate-swagger
+
+      - name: Check breaking changes
+        uses: oasdiff/oasdiff-action/breaking@main
+        with:
+          base: https://raw.githubusercontent.com/calcom/cal.com/refs/heads/main/docs/api-reference/v2/openapi.json
+          revision: docs/api-reference/v2/openapi.json
+          fail-on: ERR
+          
       - name: Run Tests
         working-directory: apps/api/v2
         run: |
@@ -75,6 +91,7 @@ jobs:
           EXIT_CODE=$?
           echo "yarn workspace @calcom/platform-libraries build && yarn test:e2e command exit code: $EXIT_CODE"
           exit $EXIT_CODE
+          
       - name: Upload Test Results
         if: ${{ always() }}
         uses: actions/upload-artifact@v4

.github/workflows/labeler.yml

@@ -26,7 +26,7 @@ jobs:
         with:
           repo-token: ${{ secrets.EQUITY_BEE_TEAM_LABELER_ACTION_TOKEN }}
           organization-name: calcom
-          ignore-labels: "admin, app-store, ai, authentication, automated-testing, billing, bookings, caldav, calendar-apps, ci, console, crm-apps, dba, devops, docs, documentation, emails, embeds, event-types, i18n, impersonation, manual-testing, ui, performance, ops-stack, organizations, public-api, routing-forms, seats, self-hosted, teams, webhooks, workflows, zapier"
+          ignore-labels: "admin, app-store, ai, api, authentication, automated-testing, billing, bookings, caldav, calendar-apps, ci, console, crm-apps, dba, devops, docs, documentation, emails, embeds, event-types, i18n, impersonation, manual-testing, ui, performance, ops-stack, organizations, public-api, routing-forms, seats, self-hosted, sre, teams, webhooks, workflows, zapier"
   apply-labels-from-issue:
     runs-on: ubuntu-latest
 

.github/workflows/pr.yml

@@ -195,13 +195,6 @@ jobs:
     uses: ./.github/workflows/e2e-embed-react.yml
     secrets: inherit
 
-  e2e-atoms:
-    name: Tests
-    needs: [changes, check-label, build, build-atoms, build-api-v2]
-    if: ${{ needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
-    uses: ./.github/workflows/e2e-atoms.yml
-    secrets: inherit
-
   analyze:
     name: Analyze Build
     needs: [build]
@@ -211,7 +204,7 @@ jobs:
   merge-reports:
     name: Merge reports
     if: ${{ !cancelled() && needs.check-label.outputs.run-e2e == 'true' && needs.changes.outputs.has-files-requiring-all-checks == 'true' }}
-    needs: [changes, check-label, e2e, e2e-embed, e2e-embed-react, e2e-app-store, e2e-atoms]
+    needs: [changes, check-label, e2e, e2e-embed, e2e-embed-react, e2e-app-store]
     uses: ./.github/workflows/merge-reports.yml
     secrets: inherit
 
@@ -255,8 +248,7 @@ jobs:
         e2e-api-v2,
         e2e-embed,
         e2e-embed-react,
-        e2e-app-store,
+        e2e-app-store
-        e2e-atoms,
       ]
     if: always()
     runs-on: buildjet-2vcpu-ubuntu-2204

.nvmrc

@@ -1 +0,0 @@
-20

.prettierignore

@@ -16,5 +16,4 @@ public
 packages/prisma/zod
 packages/prisma/enums
 apps/web/public/embed
-apps/api/v2/swagger/documentation.json
 packages/ui/components/icon/dynamicIconImports.tsx

apps/api/package.json

@@ -13,5 +13,8 @@
     "connect": "^3.7.0",
     "http": "^0.0.1-security",
     "http-proxy-middleware": "^2.0.6"
+  },
+  "devDependencies": {
+    "@calcom/eslint-config": "workspace:*"
   }
 }

apps/api/v1/eslint.config.mjs

@@ -0,0 +1,3 @@
+import { nextJsConfig } from "@calcom/eslint-config/next-js";
+
+export default nextJsConfig;

apps/api/v1/package.json

@@ -10,7 +10,7 @@
     "build": "next build",
     "clean": "rm -rf .turbo && rm -rf node_modules && rm -rf .next",
     "dev": "PORT=3003 next dev",
-    "lint": "eslint . --ignore-path .gitignore",
+    "lint": "eslint .",
     "lint:fix": "eslint . --ext .ts,.js,.tsx,.jsx --fix",
     "start": "PORT=3003 next start",
     "docker-start-api": "PORT=80 next start",
@@ -18,18 +18,19 @@
     "type-check:ci": "tsc-absolute --pretty --noEmit"
   },
   "devDependencies": {
-    "@calcom/tsconfig": "*",
+    "@calcom/eslint-config": "workspace:*",
-    "@calcom/types": "*",
+    "@calcom/tsconfig": "workspace:*",
+    "@calcom/types": "workspace:*",
     "node-mocks-http": "^1.11.0"
   },
   "dependencies": {
-    "@calcom/app-store": "*",
+    "@calcom/app-store": "workspace:*",
-    "@calcom/dayjs": "*",
+    "@calcom/dayjs": "workspace:*",
-    "@calcom/emails": "*",
+    "@calcom/emails": "workspace:*",
-    "@calcom/features": "*",
+    "@calcom/features": "workspace:*",
-    "@calcom/lib": "*",
+    "@calcom/lib": "workspace:*",
-    "@calcom/prisma": "*",
+    "@calcom/prisma": "workspace:*",
-    "@calcom/trpc": "*",
+    "@calcom/trpc": "workspace:*",
     "@prisma/nextjs-monorepo-workaround-plugin": "^6.16.1",
     "@sentry/nextjs": "^9.15.0",
     "bcryptjs": "^2.4.3",

apps/api/v1/pages/api/availability/_get.ts

@@ -1,7 +1,7 @@
 import type { NextApiRequest } from "next";
 import { z } from "zod";
 
-import { getUserAvailabilityService } from "@calcom/lib/di/containers/GetUserAvailability";
+import { getUserAvailabilityService } from "@calcom/features/di/containers/GetUserAvailability";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import prisma from "@calcom/prisma";

apps/api/v1/pages/api/slots/_get.ts

@@ -4,7 +4,7 @@ import type { NextApiRequest, NextApiResponse } from "next";
 
 import dayjs from "@calcom/dayjs";
 import { isSupportedTimeZone } from "@calcom/lib/dayjs";
-import { getAvailableSlotsService } from "@calcom/lib/di/containers/AvailableSlots";
+import { getAvailableSlotsService } from "@calcom/features/di/containers/AvailableSlots";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import { createContext } from "@calcom/trpc/server/createContext";

apps/api/v1/pages/api/teams/[teamId]/_patch.ts

@@ -4,6 +4,7 @@ import { purchaseTeamOrOrgSubscription } from "@calcom/features/ee/teams/lib/pay
 import { IS_TEAM_BILLING_ENABLED } from "@calcom/lib/constants";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
+import { TeamRepository } from "@calcom/lib/server/repository/team";
 import prisma from "@calcom/prisma";
 import type { Prisma } from "@calcom/prisma/client";
 
@@ -61,24 +62,24 @@ export async function patchHandler(req: NextApiRequest) {
   const { teamId } = schemaQueryTeamId.parse(req.query);
 
   /** Only OWNERS and ADMINS can edit teams */
-  const _team = await prisma.team.findFirst({
+  const team = await prisma.team.findFirst({
     // eslint-disable-next-line @calcom/eslint/no-prisma-include-true
     include: { members: true },
     where: { id: teamId, members: { some: { userId, role: { in: ["OWNER", "ADMIN"] } } } },
   });
-  if (!_team) throw new HttpError({ statusCode: 401, message: "Unauthorized: OWNER or ADMIN required" });
+  if (!team) throw new HttpError({ statusCode: 401, message: "Unauthorized: OWNER or ADMIN required" });
 
-  const slugAlreadyExists = await prisma.team.findFirst({
+  if (data.slug) {
-    where: {
+    const teamRepository = new TeamRepository(prisma);
-      slug: {
+    const isSlugAvailable = await teamRepository.isSlugAvailableForUpdate({
-        mode: "insensitive",
+      slug: data.slug,
-        equals: data.slug,
+      teamId: team.id,
-      },
+      parentId: team.parentId,
-    },
     });
-
+    if (!isSlugAvailable) {
-  if (slugAlreadyExists && data.slug !== _team.slug)
       throw new HttpError({ statusCode: 409, message: "Team slug already exists" });
+    }
+  }
 
   // Check if parentId is related to this user
   if (data.parentId && data.parentId === teamId) {
@@ -99,16 +100,16 @@ export async function patchHandler(req: NextApiRequest) {
   }
 
   let paymentUrl;
-  if (_team.slug === null && data.slug) {
+  if (team.slug === null && data.slug) {
     data.metadata = {
-      ...(_team.metadata as Prisma.JsonObject),
+      ...(team.metadata as Prisma.JsonObject),
       requestedSlug: data.slug,
     };
     delete data.slug;
     if (IS_TEAM_BILLING_ENABLED) {
       const checkoutSession = await purchaseTeamOrOrgSubscription({
-        teamId: _team.id,
+        teamId: team.id,
-        seatsUsed: _team.members.length,
+        seatsUsed: team.members.length,
         userId,
         pricePerSeat: null,
       });
@@ -131,9 +132,9 @@ export async function patchHandler(req: NextApiRequest) {
     bookingLimits: data.bookingLimits === null ? {} : data.bookingLimits,
     metadata: data.metadata === null ? {} : data.metadata || undefined,
   };
-  const team = await prisma.team.update({ where: { id: teamId }, data: cloneData });
+  const updatedTeam = await prisma.team.update({ where: { id: teamId }, data: cloneData });
   const result = {
-    team: schemaTeamReadPublic.parse(team),
+    team: schemaTeamReadPublic.parse(updatedTeam),
     paymentUrl,
   };
   if (!paymentUrl) {

apps/api/v1/pages/api/users/_get.ts

@@ -59,7 +59,7 @@ export async function getHandler(req: NextApiRequest) {
     };
   }
 
-  const [total, data] = await prisma.$transaction([
+  const [total, data] = await Promise.all([
     prisma.user.count({ where }),
     prisma.user.findMany({ where, take, skip }),
   ]);

apps/api/v1/test/lib/bookings/_post.test.ts

@@ -76,7 +76,7 @@ vi.mock("@calcom/features/watchlist/operations/check-if-users-are-blocked.contro
   checkIfUsersAreBlocked: vi.fn().mockResolvedValue(false),
 }));
 
-vi.mock("@calcom/lib/di/containers/QualifiedHosts", () => ({
+vi.mock("@calcom/features/di/containers/QualifiedHosts", () => ({
   getQualifiedHostsService: vi.fn().mockReturnValue({
     findQualifiedHostsWithDelegationCredentials: vi.fn().mockResolvedValue({
       qualifiedRRHosts: [],

apps/api/v1/test/lib/selected-calendars/_post.test.ts

@@ -6,6 +6,7 @@ import { createMocks } from "node-mocks-http";
 import { describe, expect, test } from "vitest";
 
 import { HttpError } from "@calcom/lib/http-error";
+import type { User } from "@calcom/prisma/client";
 
 import handler from "../../../pages/api/selected-calendars/_post";
 
@@ -72,7 +73,7 @@ describe("POST /api/selected-calendars", () => {
 
       prismaMock.user.findFirstOrThrow.mockResolvedValue({
         id: 444444,
-      } as any);
+      } as User);
 
       prismaMock.selectedCalendar.create.mockResolvedValue({
         credentialId: 1,
@@ -95,6 +96,16 @@ describe("POST /api/selected-calendars", () => {
         unwatchAttempts: 0,
         createdAt: new Date(),
         updatedAt: new Date(),
+        channelId: null,
+        channelKind: null,
+        channelResourceId: null,
+        channelResourceUri: null,
+        channelExpiration: null,
+        syncSubscribedAt: null,
+        syncToken: null,
+        syncedAt: null,
+        syncErrorAt: null,
+        syncErrorCount: null,
       });
 
       await handler(req, res);
@@ -140,6 +151,16 @@ describe("POST /api/selected-calendars", () => {
         unwatchAttempts: 0,
         createdAt: new Date(),
         updatedAt: new Date(),
+        channelId: null,
+        channelKind: null,
+        channelResourceId: null,
+        channelResourceUri: null,
+        channelExpiration: null,
+        syncSubscribedAt: null,
+        syncToken: null,
+        syncedAt: null,
+        syncErrorAt: null,
+        syncErrorCount: null,
       });
 
       await handler(req, res);

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

@@ -1,9 +1,8 @@
 import prismock from "../../../../../../tests/libs/__mocks__/prisma";
 
+import type { NextApiRequest } from "next";
 import { describe, expect, it, beforeEach } from "vitest";
 
-import { WatchlistSeverity } from "@calcom/prisma/enums";
-
 import { isLockedOrBlocked } from "../../../lib/utils/isLockedOrBlocked";
 
 describe("isLockedOrBlocked", () => {
@@ -18,7 +17,6 @@ describe("isLockedOrBlocked", () => {
         {
           type: "DOMAIN",
           value: "blocked.com",
-          severity: WatchlistSeverity.CRITICAL,
           createdById: 1,
         },
       ],
@@ -26,13 +24,13 @@ describe("isLockedOrBlocked", () => {
   });
 
   it("should return false if no user in request", async () => {
-    const req = { userId: null, user: null } as any;
+    const req = { userId: null, user: null } as unknown as NextApiRequest;
     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 req = { userId: 123, user: { email: null } } as unknown as NextApiRequest;
     const result = await isLockedOrBlocked(req);
     expect(result).toBe(false);
   });
@@ -44,7 +42,7 @@ describe("isLockedOrBlocked", () => {
         locked: true,
         email: "test@example.com",
       },
-    } as any;
+    } as unknown as NextApiRequest;
 
     const result = await isLockedOrBlocked(req);
     expect(result).toBe(true);
@@ -57,7 +55,7 @@ describe("isLockedOrBlocked", () => {
         locked: false,
         email: "test@blocked.com",
       },
-    } as any;
+    } as unknown as NextApiRequest;
 
     const result = await isLockedOrBlocked(req);
     expect(result).toBe(true);
@@ -70,7 +68,7 @@ describe("isLockedOrBlocked", () => {
         locked: false,
         email: "test@example.com",
       },
-    } as any;
+    } as unknown as NextApiRequest;
 
     const result = await isLockedOrBlocked(req);
     expect(result).toBe(false);
@@ -83,7 +81,7 @@ describe("isLockedOrBlocked", () => {
         locked: false,
         email: "test@BLOCKED.COM",
       },
-    } as any;
+    } as unknown as NextApiRequest;
 
     const result = await isLockedOrBlocked(req);
     expect(result).toBe(true);

apps/api/v2/.eslintrc.js

@@ -1,31 +0,0 @@
-module.exports = {
-  parser: "@typescript-eslint/parser",
-  parserOptions: {
-    project: "tsconfig.json",
-    tsconfigRootDir: __dirname,
-    sourceType: "module",
-  },
-  plugins: ["@typescript-eslint/eslint-plugin"],
-  extends: ["plugin:@typescript-eslint/recommended"],
-  root: true,
-  env: {
-    node: true,
-    jest: true,
-  },
-  ignorePatterns: [".eslintrc.js", "next-i18next.config.js"],
-  rules: {
-    "@typescript-eslint/interface-name-prefix": "off",
-    "@typescript-eslint/explicit-function-return-type": "off",
-    "@typescript-eslint/explicit-module-boundary-types": "off",
-    "@typescript-eslint/no-explicit-any": "off",
-  },
-  overrides: [
-    {
-      files: ["./src/**/*.controller.ts"],
-      excludedFiles: "*.spec.js",
-      rules: {
-        "@typescript-eslint/explicit-function-return-type": "error",
-      },
-    },
-  ],
-};

apps/api/v2/package.json

@@ -16,7 +16,7 @@
     "_dev:build:watch:enums": "yarn workspace @calcom/platform-enums build:watch",
     "_dev:build:watch:utils": "yarn workspace @calcom/platform-utils build:watch",
     "_dev:build:watch:types": "yarn workspace @calcom/platform-types build:watch",
-    "dev:build": "yarn workspace @calcom/platform-constants build && yarn workspace @calcom/platform-enums build && yarn workspace @calcom/platform-utils build && yarn workspace @calcom/platform-types build",
+    "dev:build": "yarn workspace @calcom/platform-constants build && yarn workspace @calcom/platform-enums build && yarn workspace @calcom/platform-utils build && yarn workspace @calcom/platform-types build && yarn workspace @calcom/platform-libraries build",
     "dev": "yarn dev:build && ts-node scripts/docker-start.ts && yarn copy-swagger-module && yarn start --watch",
     "dev:no-docker": "yarn dev:build && yarn copy-swagger-module && yarn start --watch",
     "start:debug": "nest start --debug --watch",
@@ -30,18 +30,19 @@
     "test:e2e:watch": "yarn dev:build && jest --runInBand --detectOpenHandles --forceExit --config ./jest-e2e.ts --watch",
     "prisma": "yarn workspace @calcom/prisma prisma",
     "generate-schemas": "yarn prisma generate && yarn prisma format",
-    "copy-swagger-module": "ts-node -r tsconfig-paths/register swagger/copy-swagger-module.ts",
+    "copy-swagger-module": "ts-node -r tsconfig-paths/register src/swagger/copy-swagger-module.ts",
+    "generate-swagger": "yarn copy-swagger-module && yarn build && node ./dist/apps/api/v2/src/swagger/generate-swagger-script.js",
     "prepare": "yarn run snyk-protect",
     "snyk-protect": "snyk-protect"
   },
   "dependencies": {
     "@axiomhq/winston": "^1.2.0",
-    "@calcom/platform-constants": "*",
+    "@calcom/platform-constants": "workspace:*",
-    "@calcom/platform-enums": "*",
+    "@calcom/platform-enums": "workspace:*",
-    "@calcom/platform-libraries": "*",
+    "@calcom/platform-libraries": "workspace:*",
-    "@calcom/platform-types": "*",
+    "@calcom/platform-types": "workspace:*",
-    "@calcom/platform-utils": "*",
+    "@calcom/platform-utils": "workspace:*",
-    "@calcom/prisma": "*",
+    "@calcom/prisma": "workspace:*",
     "@golevelup/ts-jest": "^0.4.0",
     "@microsoft/microsoft-graph-types-beta": "^0.42.0-preview",
     "@nest-lab/throttler-storage-redis": "1.0.0",
@@ -88,6 +89,7 @@
     "zod": "^3.22.4"
   },
   "devDependencies": {
+    "@calcom/eslint-config": "workspace:*",
     "@nestjs/cli": "^10.0.0",
     "@nestjs/schematics": "^10.0.0",
     "@nestjs/testing": "^10.0.0",

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

@@ -65,6 +65,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
     let team1EventTypeId: number;
     let team2EventTypeId: number;
     let phoneOnlyEventTypeId: number;
+    let collectiveEventWithoutHostsId: number;
+    let roundRobinEventWithoutHostsId: number;
 
     const team1EventTypeSlug = `team-bookings-event-type-${randomString()}`;
     const team2EventTypeSlug = `team-bookings-event-type-${randomString()}`;
@@ -223,6 +225,28 @@ describe("Bookings Endpoints 2024-08-13", () => {
 
       team1EventTypeId = team1EventType.id;
 
+      const team1CollectiveEventTypeWithoutHosts = await eventTypesRepositoryFixture.createTeamEventType({
+        schedulingType: "COLLECTIVE",
+        team: {
+          connect: { id: team1.id },
+        },
+        title: `team-bookings-2024-08-13-collective-event-type-without-hosts-${randomString()}`,
+        slug: `team-bookings-2024-08-13-collective-event-type-without-hosts-${randomString()}`,
+        length: 60,
+      });
+      collectiveEventWithoutHostsId = team1CollectiveEventTypeWithoutHosts.id;
+
+      const team1RoundRobinEventTypeWithoutHosts = await eventTypesRepositoryFixture.createTeamEventType({
+        schedulingType: "ROUND_ROBIN",
+        team: {
+          connect: { id: team1.id },
+        },
+        title: `team-bookings-2024-08-13-round-robin-event-type-without-hosts-${randomString()}`,
+        slug: `team-bookings-2024-08-13-round-robin-event-type-without-hosts-${randomString()}`,
+        length: 60,
+      });
+      roundRobinEventWithoutHostsId = team1RoundRobinEventTypeWithoutHosts.id;
+
       const phoneOnlyEventType = await eventTypesRepositoryFixture.createTeamEventType({
         schedulingType: "ROUND_ROBIN",
         team: {
@@ -363,6 +387,52 @@ describe("Bookings Endpoints 2024-08-13", () => {
       await app.init();
     });
 
+    describe("cant book event types without hosts", () => {
+      it("should fail to book a collective event type without hosts", async () => {
+        const body: CreateBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+          eventTypeId: collectiveEventWithoutHostsId,
+          attendee: {
+            name: "alice",
+            timeZone: "Europe/Madrid",
+            email: "alice@gmail.com",
+          },
+        };
+
+        const response = await request(app.getHttpServer())
+          .post("/v2/bookings")
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13);
+
+        expect(response.status).toBe(422);
+        expect(response.body.error.message).toBe(
+          `Can't book this team event type because it has no hosts. Please, add at least 1 host to event type with id=${collectiveEventWithoutHostsId} belonging to team with id=${team1.id} and try again.`
+        );
+      });
+
+      it("should fail to book a round robin event type without hosts", async () => {
+        const body: CreateBookingInput_2024_08_13 = {
+          start: new Date(Date.UTC(2030, 0, 8, 13, 0, 0)).toISOString(),
+          eventTypeId: roundRobinEventWithoutHostsId,
+          attendee: {
+            name: "alice",
+            timeZone: "Europe/Madrid",
+            email: "alice@gmail.com",
+          },
+        };
+
+        const response = await request(app.getHttpServer())
+          .post("/v2/bookings")
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13);
+
+        expect(response.status).toBe(422);
+        expect(response.body.error.message).toBe(
+          `Can't book this team event type because it has no hosts. Please, add at least 1 host to event type with id=${roundRobinEventWithoutHostsId} belonging to team with id=${team1.id} and try again.`
+        );
+      });
+    });
+
     describe("create team bookings", () => {
       it("should create a team 1 booking", async () => {
         const body: CreateBookingInput_2024_08_13 = {
@@ -765,8 +835,8 @@ describe("Bookings Endpoints 2024-08-13", () => {
       return client;
     }
 
-    function responseDataIsBooking(data: any): data is BookingOutput_2024_08_13 {
+    function responseDataIsBooking(data: unknown): data is BookingOutput_2024_08_13 {
-      return !Array.isArray(data) && typeof data === "object" && data && "id" in data;
+      return !Array.isArray(data) && typeof data === "object" && data !== null && data && "id" in data;
     }
 
     afterAll(async () => {

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

@@ -1,10 +1,11 @@
-import { ApiProperty, getSchemaPath } from "@nestjs/swagger";
+import { ApiExtraModels, ApiProperty, getSchemaPath } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsEnum, ValidateNested } from "class-validator";
 
 import { SUCCESS_STATUS, ERROR_STATUS } from "@calcom/platform-constants";
 import { ReassignBookingOutput_2024_08_13 as ReassignBookingOutputData_2024_08_13 } from "@calcom/platform-types";
 
+@ApiExtraModels(ReassignBookingOutputData_2024_08_13)
 export class ReassignBookingOutput_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/reschedule-booking.output.ts

@@ -7,8 +7,6 @@ import {
   BookingOutput_2024_08_13,
   CreateRecurringSeatedBookingOutput_2024_08_13,
   CreateSeatedBookingOutput_2024_08_13,
-  GetRecurringSeatedBookingOutput_2024_08_13,
-  GetSeatedBookingOutput_2024_08_13,
   RecurringBookingOutput_2024_08_13,
 } from "@calcom/platform-types";
 

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

@@ -29,6 +29,7 @@ import {
   Logger,
   NotFoundException,
   UnauthorizedException,
+  UnprocessableEntityException,
 } from "@nestjs/common";
 import { BadRequestException } from "@nestjs/common";
 import { Request } from "express";
@@ -132,6 +133,10 @@ export class BookingsService_2024_08_13 {
         );
       }
 
+      if (eventType.schedulingType === "COLLECTIVE" || eventType.schedulingType === "ROUND_ROBIN") {
+        await this.checkEventTypeHasHosts(eventType.id);
+      }
+
       body.eventTypeId = eventType.id;
 
       if ("instant" in body && body.instant) {
@@ -159,6 +164,15 @@ export class BookingsService_2024_08_13 {
     }
   }
 
+  async checkEventTypeHasHosts(eventTypeId: number) {
+    const eventType = await this.eventTypesRepository.getEventTypeWithHosts(eventTypeId);
+    if (!eventType?.hosts?.length) {
+      throw new UnprocessableEntityException(
+        `Can't book this team event type because it has no hosts. Please, add at least 1 host to event type with id=${eventTypeId} belonging to team with id=${eventType?.teamId} and try again.`
+      );
+    }
+  }
+
   async checkBookingRequiresAuthenticationSetting(
     eventType: EventTypeWithOwnerAndTeam,
     authUser: AuthOptionalUser,

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

@@ -38,6 +38,7 @@ import type {
   GuestsDefaultFieldOutput_2024_06_14,
   NameDefaultFieldInput_2024_06_14,
   NotesDefaultFieldInput_2024_06_14,
+  SplitNameDefaultFieldOutput_2024_06_14,
   UpdateEventTypeInput_2024_06_14,
 } from "@calcom/platform-types";
 import type { PlatformOAuthClient, Team, User, Schedule, EventType } from "@calcom/prisma/client";
@@ -1447,23 +1448,23 @@ describe("Event types Endpoints", () => {
       try {
         await eventTypesRepositoryFixture.delete(eventType.id);
       } catch (e) {
-        // Event type might have been deleted by the test
+        console.log(e);
       }
       try {
         await userRepositoryFixture.delete(user.id);
       } catch (e) {
-        // User might have been deleted by the test
+        console.log(e);
       }
       try {
         await userRepositoryFixture.delete(falseTestUser.id);
       } catch (e) {
-        // User might have been deleted by the test
+        console.log(e);
       }
 
       try {
         await userRepositoryFixture.delete(orgUser.id);
       } catch (e) {
-        // User might have been deleted by the test
+        console.log(e);
       }
       await app.close();
     });
@@ -2187,6 +2188,47 @@ describe("Event types Endpoints", () => {
       });
     });
 
+    describe("split name booking field", () => {
+      it("should create an event type with split name booking field", async () => {
+        const splitNameBookingField: SplitNameDefaultFieldOutput_2024_06_14 = {
+          isDefault: true,
+          type: "splitName",
+          slug: "splitName",
+          firstNameLabel: "First name",
+          firstNamePlaceholder: "",
+          lastNameLabel: "last name",
+          lastNamePlaceholder: "",
+          lastNameRequired: false,
+          disableOnPrefill: false,
+        };
+
+        const body: CreateEventTypeInput_2024_06_14 = {
+          title: "Coding class 9",
+          slug: "coding-class-9",
+          description: "Let's learn how to code like a pro.",
+          lengthInMinutes: 60,
+          bookingFields: [splitNameBookingField],
+        };
+
+        return request(app.getHttpServer())
+          .post("/api/v2/event-types")
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
+          .send(body)
+          .expect(201)
+          .then(async (response) => {
+            const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
+            const createdEventType = responseBody.data;
+
+            const splitNameBookingFieldResponse = createdEventType.bookingFields.find(
+              (field) => field.type === "splitName"
+            ) as SplitNameDefaultFieldOutput_2024_06_14 | undefined;
+            expect(splitNameBookingFieldResponse).toEqual(splitNameBookingField);
+
+            await eventTypesRepositoryFixture.delete(createdEventType.id);
+          });
+      });
+    });
+
     afterAll(async () => {
       await oauthClientRepositoryFixture.delete(oAuthClient.id);
       await teamRepositoryFixture.delete(organization.id);
@@ -2194,12 +2236,12 @@ describe("Event types Endpoints", () => {
         await eventTypesRepositoryFixture.delete(legacyEventTypeId1);
         await eventTypesRepositoryFixture.delete(legacyEventTypeId2);
       } catch (e) {
-        // Event type might have been deleted by the test
+        console.log(e);
       }
       try {
         await userRepositoryFixture.delete(user.id);
       } catch (e) {
-        // User might have been deleted by the test
+        console.log(e);
       }
       await app.close();
     });
@@ -2379,7 +2421,7 @@ describe("Event types Endpoints", () => {
 
         const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
         const updatedEventType = responseBody.data;
-        +expect(updatedEventType.hidden).toBe(false);
+        expect(updatedEventType.hidden).toBe(false);
       });
     });
 
@@ -2389,12 +2431,12 @@ describe("Event types Endpoints", () => {
       try {
         await eventTypesRepositoryFixture.delete(legacyEventTypeId1);
       } catch (e) {
-        // Event type might have been deleted by the test
+        console.log(e);
       }
       try {
         await userRepositoryFixture.delete(user.id);
       } catch (e) {
-        // User might have been deleted by the test
+        console.log(e);
       }
       await app.close();
     });

apps/api/v2/src/main.ts

@@ -1,39 +1,29 @@
 import type { AppConfig } from "@/config/type";
-import { getEnv } from "@/env";
 import { Logger } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { NestFactory } from "@nestjs/core";
 import type { NestExpressApplication } from "@nestjs/platform-express";
-import { SwaggerModule, DocumentBuilder } from "@nestjs/swagger";
-import {
-  PathItemObject,
-  PathsObject,
-  OperationObject,
-  TagObject,
-} from "@nestjs/swagger/dist/interfaces/open-api-spec.interface";
 import "dotenv/config";
-import * as fs from "fs";
-import { Server } from "http";
 import { WinstonModule } from "nest-winston";
 
 import { bootstrap } from "./app";
 import { AppModule } from "./app.module";
 import { loggerConfig } from "./lib/logger";
+import { generateSwaggerForApp } from "./swagger/generate-swagger";
 
-const HttpMethods: (keyof PathItemObject)[] = ["get", "post", "put", "delete", "patch", "options", "head"];
+run().catch((error: Error) => {
-
+  console.error("Failed to start Cal Platform API", { error: error.stack });
-const run = async () => {
+  process.exit(1);
-  const app = await NestFactory.create<NestExpressApplication>(AppModule, {
-    logger: WinstonModule.createLogger(loggerConfig()),
-    bodyParser: false,
 });
 
+async function run() {
+  const app = await createNestApp();
   const logger = new Logger("App");
 
   try {
     bootstrap(app);
     const port = app.get(ConfigService<AppConfig, true>).get("api.port", { infer: true });
-    void generateSwagger(app);
+    generateSwaggerForApp(app);
     await app.listen(port);
     logger.log(`Application started on port: ${port}`);
   } catch (error) {
@@ -42,97 +32,11 @@ const run = async () => {
       error,
     });
   }
-};
-
-function customTagSort(a: string, b: string): number {
-  const platformPrefix = "Platform";
-  const orgsPrefix = "Orgs";
-
-  if (a.startsWith(platformPrefix) && !b.startsWith(platformPrefix)) {
-    return -1;
-  }
-  if (!a.startsWith(platformPrefix) && b.startsWith(platformPrefix)) {
-    return 1;
 }
 
-  if (a.startsWith(orgsPrefix) && !b.startsWith(orgsPrefix)) {
+export async function createNestApp() {
-    return -1;
+  return NestFactory.create<NestExpressApplication>(AppModule, {
-  }
+    logger: WinstonModule.createLogger(loggerConfig()),
-  if (!a.startsWith(orgsPrefix) && b.startsWith(orgsPrefix)) {
+    bodyParser: false,
-    return 1;
-  }
-
-  return a.localeCompare(b);
-}
-
-function isOperationObject(obj: any): obj is OperationObject {
-  return obj && typeof obj === "object" && "tags" in obj;
-}
-
-function groupAndSortPathsByFirstTag(paths: PathsObject): PathsObject {
-  const groupedPaths: { [key: string]: PathsObject } = {};
-
-  Object.keys(paths).forEach((pathKey) => {
-    const pathItem = paths[pathKey];
-
-    HttpMethods.forEach((method) => {
-      const operation = pathItem[method];
-
-      if (isOperationObject(operation) && operation.tags && operation.tags.length > 0) {
-        const firstTag = operation.tags[0];
-
-        if (!groupedPaths[firstTag]) {
-          groupedPaths[firstTag] = {};
-        }
-
-        groupedPaths[firstTag][pathKey] = pathItem;
-      }
   });
-  });
-
-  const sortedTags = Object.keys(groupedPaths).sort(customTagSort);
-  const sortedPaths: PathsObject = {};
-
-  sortedTags.forEach((tag) => {
-    Object.assign(sortedPaths, groupedPaths[tag]);
-  });
-
-  return sortedPaths;
 }
-
-async function generateSwagger(app: NestExpressApplication<Server>) {
-  const logger = new Logger("App");
-  logger.log(`Generating Swagger documentation...\n`);
-
-  const config = new DocumentBuilder().setTitle("Cal.com API v2").build();
-  const document = SwaggerModule.createDocument(app, config);
-  document.paths = groupAndSortPathsByFirstTag(document.paths);
-
-  const swaggerOutputFile = "./swagger/documentation.json";
-  const docsOutputFile = "../../../docs/api-reference/v2/openapi.json";
-  const stringifiedContents = JSON.stringify(document, null, 2);
-
-  if (fs.existsSync(swaggerOutputFile)) {
-    fs.unlinkSync(swaggerOutputFile);
-  }
-
-  fs.writeFileSync(swaggerOutputFile, stringifiedContents, { encoding: "utf8" });
-
-  if (fs.existsSync(docsOutputFile) && getEnv("NODE_ENV") === "development") {
-    fs.unlinkSync(docsOutputFile);
-    fs.writeFileSync(docsOutputFile, stringifiedContents, { encoding: "utf8" });
-  }
-
-  if (!process.env.DOCS_URL) {
-    SwaggerModule.setup("docs", app, document, {
-      customCss: ".swagger-ui .topbar { display: none }",
-    });
-
-    logger.log(`Swagger documentation available in the "/docs" endpoint\n`);
-  }
-}
-
-run().catch((error: Error) => {
-  console.error("Failed to start Cal Platform API", { error: error.stack });
-  process.exit(1);
-});

apps/api/v2/src/modules/atoms/atoms-secondary-emails.repository.ts

@@ -0,0 +1,51 @@
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+@Injectable()
+export class AtomsSecondaryEmailsRepository {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  async getSecondaryEmailsVerified(userId: number) {
+    return await this.dbRead.prisma.secondaryEmail.findMany({
+      where: {
+        userId,
+        emailVerified: {
+          not: null,
+        },
+      },
+    });
+  }
+
+  async getExistingSecondaryEmailByUserAndEmail(userId: number, email: string) {
+    const existingSecondaryEmailRecord = await this.dbRead.prisma.secondaryEmail.findUnique({
+      where: {
+        userId_email: { userId, email },
+      },
+    });
+
+    return existingSecondaryEmailRecord?.email;
+  }
+
+  async getExistingSecondaryEmail(email: string) {
+    const existingSecondaryEmailRecord = await this.dbRead.prisma.secondaryEmail.findUnique({
+      where: {
+        email,
+      },
+    });
+
+    return existingSecondaryEmailRecord?.email;
+  }
+
+  async addSecondaryEmailVerified(userId: number, email: string) {
+    const existingSecondaryEmailRecord = await this.dbWrite.prisma.secondaryEmail.create({
+      data: {
+        userId,
+        email,
+        emailVerified: new Date(),
+      },
+    });
+
+    return existingSecondaryEmailRecord?.email;
+  }
+}

apps/api/v2/src/modules/atoms/atoms.module.ts

@@ -1,4 +1,5 @@
 import { EventTypesModule_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.module";
+import { AtomsSecondaryEmailsRepository } from "@/modules/atoms/atoms-secondary-emails.repository";
 import { AtomsRepository } from "@/modules/atoms/atoms.repository";
 import { AtomsConferencingAppsController } from "@/modules/atoms/controllers/atoms.conferencing-apps.controller";
 import { AtomsController } from "@/modules/atoms/controllers/atoms.controller";
@@ -33,6 +34,7 @@ import { Module } from "@nestjs/common";
     CredentialsRepository,
     UsersRepository,
     AtomsRepository,
+    AtomsSecondaryEmailsRepository,
     UsersService,
     SchedulesAtomsService,
     VerificationAtomsService,

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

@@ -64,47 +64,4 @@ export class AtomsRepository {
 
     return userTeams;
   }
-
-  async getSecondaryEmails(userId: number) {
-    return await this.dbRead.prisma.secondaryEmail.findMany({
-      where: {
-        userId,
-        emailVerified: {
-          not: null,
-        },
-      },
-    });
-  }
-
-  async getExistingSecondaryEmailByUserAndEmail(userId: number, email: string) {
-    const existingSecondaryEmailRecord = await this.dbRead.prisma.secondaryEmail.findUnique({
-      where: {
-        userId_email: { userId, email },
-      },
-    });
-
-    return existingSecondaryEmailRecord?.email;
-  }
-
-  async getExistingSecondaryEmail(email: string) {
-    const existingSecondaryEmailRecord = await this.dbRead.prisma.secondaryEmail.findUnique({
-      where: {
-        email,
-      },
-    });
-
-    return existingSecondaryEmailRecord?.email;
-  }
-
-  async addSecondaryEmail(userId: number, email: string) {
-    const existingSecondaryEmailRecord = await this.dbWrite.prisma.secondaryEmail.create({
-      data: {
-        userId,
-        email,
-        emailVerified: new Date(),
-      },
-    });
-
-    return existingSecondaryEmailRecord?.email;
-  }
 }

apps/api/v2/src/modules/atoms/services/verification-atom.service.ts

@@ -1,10 +1,10 @@
-import { AtomsRepository } from "@/modules/atoms/atoms.repository";
+import { AtomsSecondaryEmailsRepository } from "@/modules/atoms/atoms-secondary-emails.repository";
 import { CheckEmailVerificationRequiredParams } from "@/modules/atoms/inputs/check-email-verification-required-params";
 import { GetVerifiedEmailsInput } from "@/modules/atoms/inputs/get-verified-emails-params";
 import { SendVerificationEmailInput } from "@/modules/atoms/inputs/send-verification-email.input";
 import { VerifyEmailCodeInput } from "@/modules/atoms/inputs/verify-email-code.input";
-import { TeamsRepository } from "@/modules/teams/teams/teams.repository";
 import { UserWithProfile } from "@/modules/users/users.repository";
+import { UsersRepository } from "@/modules/users/users.repository";
 import { Injectable, BadRequestException, UnauthorizedException } from "@nestjs/common";
 
 import {
@@ -17,8 +17,8 @@ import {
 @Injectable()
 export class VerificationAtomsService {
   constructor(
-    private readonly atomsRepository: AtomsRepository,
+    private readonly atomsSecondaryEmailsRepository: AtomsSecondaryEmailsRepository,
-    private readonly teamsRepository: TeamsRepository
+    private readonly usersRepository: UsersRepository
   ) {}
 
   async checkEmailVerificationRequired(input: CheckEmailVerificationRequiredParams) {
@@ -76,7 +76,8 @@ export class VerificationAtomsService {
 
     if (teamId) {
       const verifiedEmails: string[] = [];
-      const teamMembers = await this.teamsRepository.getTeamMemberEmails(teamId);
+
+      const teamMembers = await this.usersRepository.getUserEmailsVerifiedForTeam(teamId);
 
       if (teamMembers.length === 0) {
         return verifiedEmails;
@@ -96,7 +97,7 @@ export class VerificationAtomsService {
 
     let verifiedEmails = [userEmailWithoutOauthClientId];
 
-    const secondaryEmails = await this.atomsRepository.getSecondaryEmails(userId);
+    const secondaryEmails = await this.atomsSecondaryEmailsRepository.getSecondaryEmailsVerified(userId);
     verifiedEmails = verifiedEmails.concat(
       secondaryEmails.map((secondaryEmail) => this.removeClientIdFromEmail(secondaryEmail.email))
     );
@@ -113,11 +114,9 @@ export class VerificationAtomsService {
     existingPrimaryEmail: string;
     email: string;
   }): Promise<boolean> {
-    const existingSecondaryEmail = await this.atomsRepository.getExistingSecondaryEmailByUserAndEmail(
+    const existingSecondaryEmail =
-      userId,
+      await this.atomsSecondaryEmailsRepository.getExistingSecondaryEmailByUserAndEmail(userId, email);
-      email
+    const alreadyExistingEmail = await this.atomsSecondaryEmailsRepository.getExistingSecondaryEmail(email);
-    );
-    const alreadyExistingEmail = await this.atomsRepository.getExistingSecondaryEmail(email);
 
     if (alreadyExistingEmail) {
       throw new BadRequestException("Email already exists");
@@ -127,7 +126,7 @@ export class VerificationAtomsService {
       return true;
     }
 
-    await this.atomsRepository.addSecondaryEmail(userId, email);
+    await this.atomsSecondaryEmailsRepository.addSecondaryEmailVerified(userId, email);
 
     return true;
   }

apps/api/v2/src/modules/auth/guards/optional-api-auth/optional-api-auth.guard.ts

@@ -2,6 +2,7 @@ import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
 import {
   NO_AUTH_PROVIDED_MESSAGE,
   ONLY_CLIENT_ID_PROVIDED_MESSAGE,
+  ONLY_CLIENT_SECRET_PROVIDED_MESSAGE,
 } from "@/modules/auth/strategies/api-auth/api-auth.strategy";
 
 export class OptionalApiAuthGuard extends ApiAuthGuard {
@@ -9,11 +10,16 @@ export class OptionalApiAuthGuard extends ApiAuthGuard {
     // note(Lauris): optional means that auth is not required but if it is invalid then still throw error.
     const noAuthProvided = error && error.message.includes(NO_AUTH_PROVIDED_MESSAGE);
     const onlyClientIdProvided = error && error.message.includes(ONLY_CLIENT_ID_PROVIDED_MESSAGE);
+    const onlyClientSecretProvided = error && error.message.includes(ONLY_CLIENT_SECRET_PROVIDED_MESSAGE);
 
     if (onlyClientIdProvided) {
       return null;
     }
 
+    if (onlyClientSecretProvided) {
+      return null;
+    }
+
     if (user || noAuthProvided || !error) {
       return user || null;
     } else {

apps/api/v2/src/modules/auth/strategies/api-auth/api-auth.strategy.e2e-spec.ts

@@ -32,7 +32,11 @@ import { randomString } from "test/utils/randomString";
 import { X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants";
 import type { PlatformOAuthClient, Team, User } from "@calcom/prisma/client";
 
-import { ApiAuthGuardRequest, ONLY_CLIENT_ID_PROVIDED_MESSAGE } from "./api-auth.strategy";
+import {
+  ApiAuthGuardRequest,
+  ONLY_CLIENT_ID_PROVIDED_MESSAGE,
+  ONLY_CLIENT_SECRET_PROVIDED_MESSAGE,
+} from "./api-auth.strategy";
 import { ApiAuthStrategy } from "./api-auth.strategy";
 
 describe("ApiAuthStrategy", () => {
@@ -267,6 +271,29 @@ describe("ApiAuthStrategy", () => {
       }
     });
 
+    it("should throw 401 if only OAuth Client Secret is provided", async () => {
+      const context: ExecutionContext = {
+        switchToHttp: () => ({
+          getRequest: () => ({
+            headers: {
+              [X_CAL_SECRET_KEY]: `${oAuthClient.secret}gibberish`,
+            },
+            get: (key: string) => ({ origin: "http://localhost:3000" }[key]),
+          }),
+        }),
+      } as ExecutionContext;
+      const request = context.switchToHttp().getRequest();
+
+      try {
+        await strategy.authenticate(request);
+      } catch (error) {
+        if (error instanceof HttpException) {
+          expect(error.getStatus()).toEqual(401);
+          expect(error.message).toContain(ONLY_CLIENT_SECRET_PROVIDED_MESSAGE);
+        }
+      }
+    });
+
     it("should throw 401 if OAuth ID is invalid", async () => {
       const context: ExecutionContext = {
         switchToHttp: () => ({

apps/api/v2/src/modules/auth/strategies/api-auth/api-auth.strategy.ts

@@ -29,11 +29,11 @@ export type ApiAuthGuardRequest = Request & {
   user: ApiAuthGuardUser;
   allowedAuthMethods?: AllowedAuthMethod[];
 };
-export const NO_AUTH_PROVIDED_MESSAGE =
+export const NO_AUTH_PROVIDED_MESSAGE = `No authentication method provided. Either pass an API key as 'Bearer' header or OAuth client credentials as '${X_CAL_SECRET_KEY}' and '${X_CAL_CLIENT_ID}' headers`;
-  "No authentication method provided. Either pass an API key as 'Bearer' header or OAuth client credentials as 'x-cal-secret-key' and 'x-cal-client-id' headers";
 
-export const ONLY_CLIENT_ID_PROVIDED_MESSAGE =
+export const ONLY_CLIENT_ID_PROVIDED_MESSAGE = `Only '${X_CAL_CLIENT_ID}' header provided. Please also provide '${X_CAL_SECRET_KEY}' header or Auth bearer token as 'Authentication' header`;
-  "Only 'x-cal-client-id' header provided. Please also provide 'x-cal-secret-key' header or Auth bearer token as 'Authentication' header";
+
+export const ONLY_CLIENT_SECRET_PROVIDED_MESSAGE = `Only '${X_CAL_SECRET_KEY}' header provided. Please also provide '${X_CAL_CLIENT_ID}' header or Auth bearer token as 'Authentication' header`;
 
 @Injectable()
 export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth") {
@@ -121,6 +121,9 @@ export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth")
 
       const noAuthProvided = !oAuthClientId && !oAuthClientSecret && !bearerToken && !nextAuthToken;
       const onlyClientIdProvided = !!oAuthClientId && !oAuthClientSecret && !bearerToken && !nextAuthToken;
+      const onlyClientSecretProvided =
+        !oAuthClientId && !!oAuthClientSecret && !bearerToken && !nextAuthToken;
+
       if (noAuthProvided) {
         throw new UnauthorizedException(`ApiAuthStrategy - ${NO_AUTH_PROVIDED_MESSAGE}`);
       }
@@ -129,6 +132,10 @@ export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth")
         throw new UnauthorizedException(`ApiAuthStrategy - ${ONLY_CLIENT_ID_PROVIDED_MESSAGE}`);
       }
 
+      if (onlyClientSecretProvided) {
+        throw new UnauthorizedException(`ApiAuthStrategy - ${ONLY_CLIENT_SECRET_PROVIDED_MESSAGE}`);
+      }
+
       throw new UnauthorizedException(
         `ApiAuthStrategy - Invalid authentication method. Please provide one of the allowed methods: ${
           allowedMethods && allowedMethods.length > 0 ? allowedMethods.join(", ") : "Any supported method"

apps/api/v2/src/modules/billing/billing.module.ts

@@ -2,6 +2,7 @@ import { BookingsRepository_2024_08_13 } from "@/ee/bookings/2024-08-13/bookings
 import { BillingProcessor } from "@/modules/billing/billing.processor";
 import { BillingRepository } from "@/modules/billing/billing.repository";
 import { BillingController } from "@/modules/billing/controllers/billing.controller";
+import { BillingServiceCachingProxy } from "@/modules/billing/services/billing-service-caching-proxy";
 import { BillingConfigService } from "@/modules/billing/services/billing.config.service";
 import { BillingService } from "@/modules/billing/services/billing.service";
 import { ManagedOrganizationsBillingService } from "@/modules/billing/services/managed-organizations.billing.service";
@@ -9,6 +10,7 @@ import { MembershipsModule } from "@/modules/memberships/memberships.module";
 import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
 import { OrganizationsModule } from "@/modules/organizations/organizations.module";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { RedisModule } from "@/modules/redis/redis.module";
 import { StripeModule } from "@/modules/stripe/stripe.module";
 import { UsersModule } from "@/modules/users/users.module";
 import { BullModule } from "@nestjs/bull";
@@ -18,6 +20,7 @@ import { Module } from "@nestjs/common";
   imports: [
     PrismaModule,
     StripeModule,
+    RedisModule,
     MembershipsModule,
     OrganizationsModule,
     BullModule.registerQueue({
@@ -32,6 +35,10 @@ import { Module } from "@nestjs/common";
   providers: [
     BillingConfigService,
     BillingService,
+    {
+      provide: "IBillingService",
+      useClass: BillingServiceCachingProxy,
+    },
     BillingRepository,
     BillingProcessor,
     ManagedOrganizationsBillingService,

apps/api/v2/src/modules/billing/controllers/billing.controller.e2e-spec.ts

@@ -1,5 +1,6 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
+import { CheckPlatformBillingResponseDto } from "@/modules/billing/controllers/outputs/CheckPlatformBillingResponse.dto";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { StripeService } from "@/modules/stripe/stripe.service";
 import { TokensModule } from "@/modules/tokens/tokens.module";
@@ -16,7 +17,7 @@ import { OrganizationRepositoryFixture } from "test/fixtures/repository/organiza
 import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
 import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
 import { randomString } from "test/utils/randomString";
-import { withApiAuth } from "test/utils/withApiAuth";
+import { withNextAuth } from "test/utils/withNextAuth";
 
 import type { Team, PlatformBilling } from "@calcom/prisma/client";
 
@@ -31,9 +32,8 @@ describe("Platform Billing Controller (e2e)", () => {
   let membershipsRepositoryFixture: MembershipRepositoryFixture;
   let platformBillingRepositoryFixture: PlatformBillingRepositoryFixture;
   let organization: Team;
-
   beforeAll(async () => {
-    const moduleRef = await withApiAuth(
+    const moduleRef = await withNextAuth(
       userEmail,
       Test.createTestingModule({
         imports: [AppModule, PrismaModule, UsersModule, TokensModule],
@@ -44,8 +44,10 @@ describe("Platform Billing Controller (e2e)", () => {
     profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
     membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
     platformBillingRepositoryFixture = new PlatformBillingRepositoryFixture(moduleRef);
+
     organization = await organizationsRepositoryFixture.create({
       name: `billing-organization-${randomString()}`,
+      isPlatform: true,
     });
 
     user = await userRepositoryFixture.create({
@@ -87,6 +89,17 @@ describe("Platform Billing Controller (e2e)", () => {
     await app.close();
   });
 
+  it("/billing/webhook (GET) should not get billing plan for org since it's not set yet", () => {
+    return request(app.getHttpServer())
+      .get(`/v2/billing/${organization.id}/check`)
+
+      .expect(200)
+      .then(async (res) => {
+        const data = res.body.data as CheckPlatformBillingResponseDto;
+        expect(data?.plan).toEqual("FREE");
+      });
+  });
+
   it("/billing/webhook (POST) should set billing free plan for org", () => {
     jest.spyOn(StripeService.prototype, "getStripe").mockImplementation(
       () =>
@@ -119,6 +132,17 @@ describe("Platform Billing Controller (e2e)", () => {
         expect(billing?.plan).toEqual("FREE");
       });
   });
+
+  it("/billing/webhook (GET) should  get billing plan for org", () => {
+    return request(app.getHttpServer())
+      .get(`/v2/billing/${organization.id}/check`)
+      .expect(200)
+      .then(async (res) => {
+        const data = res.body.data as CheckPlatformBillingResponseDto;
+        expect(data?.plan).toEqual("FREE");
+      });
+  });
+
   it("/billing/webhook (POST) failed payment should set billing free plan to overdue", () => {
     jest.spyOn(StripeService.prototype, "getStripe").mockImplementation(
       () =>

apps/api/v2/src/modules/billing/controllers/billing.controller.ts

@@ -6,7 +6,7 @@ import { OrganizationRolesGuard } from "@/modules/auth/guards/organization-roles
 import { SubscribeToPlanInput } from "@/modules/billing/controllers/inputs/subscribe-to-plan.input";
 import { CheckPlatformBillingResponseDto } from "@/modules/billing/controllers/outputs/CheckPlatformBillingResponse.dto";
 import { SubscribeTeamToBillingResponseDto } from "@/modules/billing/controllers/outputs/SubscribeTeamToBillingResponse.dto";
-import { BillingService } from "@/modules/billing/services/billing.service";
+import { IBillingService } from "@/modules/billing/interfaces/billing-service.interface";
 import { StripeService } from "@/modules/stripe/stripe.service";
 import {
   Body,
@@ -19,6 +19,7 @@ import {
   Headers,
   HttpCode,
   HttpStatus,
+  Inject,
   Logger,
   Delete,
   ParseIntPipe,
@@ -40,7 +41,7 @@ export class BillingController {
   private logger = new Logger("Billing Controller");
 
   constructor(
-    private readonly billingService: BillingService,
+    @Inject("IBillingService") private readonly billingService: IBillingService,
     public readonly stripeService: StripeService,
     private readonly configService: ConfigService<AppConfig>
   ) {

apps/api/v2/src/modules/billing/interfaces/billing-service.interface.ts

@@ -0,0 +1,27 @@
+import { PlatformPlan } from "@/modules/billing/types";
+import type { StripeService } from "@/modules/stripe/stripe.service";
+import Stripe from "stripe";
+import { PlatformBilling, Team } from "@calcom/prisma/client";
+
+export type BillingData = {
+  team: (Team & { platformBilling: PlatformBilling | null }) | null;
+  status: "valid" | "no_subscription" | "no_billing";
+  plan: string;
+};
+
+export interface IBillingService {
+  getBillingData(teamId: number): Promise<BillingData>;
+  createTeamBilling(teamId: number): Promise<string>;
+  redirectToSubscribeCheckout(teamId: number, plan: PlatformPlan, customerId?: string): Promise<string>;
+  updateSubscriptionForTeam(teamId: number, plan: PlatformPlan): Promise<string>;
+  cancelTeamSubscription(teamId: number): Promise<void>;
+  handleStripeSubscriptionDeleted(event: Stripe.Event): Promise<void>;
+  handleStripePaymentSuccess(event: Stripe.Event): Promise<void>;
+  handleStripePaymentFailed(event: Stripe.Event): Promise<void>;
+  handleStripePaymentPastDue(event: Stripe.Event): Promise<void>;
+  handleStripeCheckoutEvents(event: Stripe.Event): Promise<void>;
+  handleStripeSubscriptionForActiveManagedUsers(event: Stripe.Event): Promise<void>;
+  getSubscriptionIdFromInvoice(invoice: Stripe.Invoice): string | null;
+  getCustomerIdFromInvoice(invoice: Stripe.Invoice): string | null;
+  stripeService: StripeService;
+}

apps/api/v2/src/modules/billing/services/billing-service-caching-proxy.ts

@@ -0,0 +1,137 @@
+import { IBillingService, BillingData } from "@/modules/billing/interfaces/billing-service.interface";
+import { BillingService } from "@/modules/billing/services/billing.service";
+import { PlatformPlan } from "@/modules/billing/types";
+import { RedisService } from "@/modules/redis/redis.service";
+import { Injectable } from "@nestjs/common";
+import Stripe from "stripe";
+
+export const REDIS_BILLING_CACHE_KEY = (teamId: number) => `apiv2:team:${teamId}:billing`;
+export const BILLING_CACHE_TTL_MS = 3_600_000; // 1 hour
+
+@Injectable()
+export class BillingServiceCachingProxy implements IBillingService {
+  constructor(private readonly billingService: BillingService, private readonly redisService: RedisService) {}
+
+  async getBillingData(teamId: number) {
+    const cachedBillingData = await this.getBillingCache(teamId);
+    if (cachedBillingData) {
+      return cachedBillingData;
+    }
+
+    const billingData = await this.billingService.getBillingData(teamId);
+    await this.setBillingCache(teamId, billingData);
+    return billingData;
+  }
+
+  private async deleteBillingCache(teamId: number) {
+    await this.redisService.del(REDIS_BILLING_CACHE_KEY(teamId));
+  }
+
+  private async getBillingCache(teamId: number) {
+    const cachedResult = await this.redisService.get<BillingData>(REDIS_BILLING_CACHE_KEY(teamId));
+    return cachedResult;
+  }
+
+  private async setBillingCache(teamId: number, billingData: BillingData): Promise<void> {
+    await this.redisService.set<BillingData>(REDIS_BILLING_CACHE_KEY(teamId), billingData, {
+      ttl: BILLING_CACHE_TTL_MS,
+    });
+  }
+
+  async createTeamBilling(teamId: number): Promise<string> {
+    return this.billingService.createTeamBilling(teamId);
+  }
+
+  async redirectToSubscribeCheckout(
+    teamId: number,
+    plan: PlatformPlan,
+    customerId?: string
+  ): Promise<string> {
+    return this.billingService.redirectToSubscribeCheckout(teamId, plan, customerId);
+  }
+
+  async updateSubscriptionForTeam(teamId: number, plan: PlatformPlan): Promise<string> {
+    return this.billingService.updateSubscriptionForTeam(teamId, plan);
+  }
+
+  async cancelTeamSubscription(teamId: number): Promise<void> {
+    await this.billingService.cancelTeamSubscription(teamId);
+    await this.deleteBillingCache(teamId);
+  }
+
+  async handleStripeSubscriptionDeleted(event: Stripe.Event): Promise<void> {
+    await this.billingService.handleStripeSubscriptionDeleted(event);
+    const subscription = event.data.object as Stripe.Subscription;
+    const teamId = subscription?.metadata?.teamId;
+    if (teamId) {
+      await this.deleteBillingCache(Number.parseInt(teamId));
+    }
+  }
+
+  async handleStripePaymentSuccess(event: Stripe.Event): Promise<void> {
+    await this.billingService.handleStripePaymentSuccess(event);
+    const invoice = event.data.object as Stripe.Invoice;
+    const subscriptionId = this.getSubscriptionIdFromInvoice(invoice);
+    if (subscriptionId) {
+      const teamBilling = await this.billingService.billingRepository.getBillingForTeamBySubscriptionId(
+        subscriptionId
+      );
+      if (teamBilling?.id) {
+        await this.deleteBillingCache(teamBilling.id);
+      }
+    }
+  }
+
+  async handleStripePaymentFailed(event: Stripe.Event): Promise<void> {
+    await this.billingService.handleStripePaymentFailed(event);
+    const invoice = event.data.object as Stripe.Invoice;
+    const subscriptionId = this.getSubscriptionIdFromInvoice(invoice);
+    if (subscriptionId) {
+      const teamBilling = await this.billingService.billingRepository.getBillingForTeamBySubscriptionId(
+        subscriptionId
+      );
+      if (teamBilling?.id) {
+        await this.deleteBillingCache(teamBilling.id);
+      }
+    }
+  }
+
+  async handleStripePaymentPastDue(event: Stripe.Event): Promise<void> {
+    await this.billingService.handleStripePaymentPastDue(event);
+    const subscription = event.data.object as Stripe.Subscription;
+    const subscriptionId = subscription.id;
+    if (subscriptionId) {
+      const teamBilling = await this.billingService.billingRepository.getBillingForTeamBySubscriptionId(
+        subscriptionId
+      );
+      if (teamBilling?.id) {
+        await this.deleteBillingCache(teamBilling.id);
+      }
+    }
+  }
+
+  async handleStripeCheckoutEvents(event: Stripe.Event): Promise<void> {
+    await this.billingService.handleStripeCheckoutEvents(event);
+    const checkoutSession = event.data.object as Stripe.Checkout.Session;
+    const teamId = checkoutSession.metadata?.teamId;
+    if (teamId) {
+      await this.deleteBillingCache(Number.parseInt(teamId));
+    }
+  }
+
+  async handleStripeSubscriptionForActiveManagedUsers(event: Stripe.Event): Promise<void> {
+    return this.billingService.handleStripeSubscriptionForActiveManagedUsers(event);
+  }
+
+  getSubscriptionIdFromInvoice(invoice: Stripe.Invoice): string | null {
+    return this.billingService.getSubscriptionIdFromInvoice(invoice);
+  }
+
+  getCustomerIdFromInvoice(invoice: Stripe.Invoice): string | null {
+    return this.billingService.getCustomerIdFromInvoice(invoice);
+  }
+
+  get stripeService() {
+    return this.billingService.stripeService;
+  }
+}

apps/api/v2/src/modules/billing/services/billing.service.ts

@@ -2,6 +2,7 @@ import { AppConfig } from "@/config/type";
 import { BookingsRepository_2024_08_13 } from "@/ee/bookings/2024-08-13/bookings.repository";
 import { BILLING_QUEUE, INCREMENT_JOB, IncrementJobDataType } from "@/modules/billing/billing.processor";
 import { BillingRepository } from "@/modules/billing/billing.repository";
+import { IBillingService } from "@/modules/billing/interfaces/billing-service.interface";
 import { BillingConfigService } from "@/modules/billing/services/billing.config.service";
 import { PlatformPlan } from "@/modules/billing/types";
 import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
@@ -23,14 +24,14 @@ import { DateTime } from "luxon";
 import Stripe from "stripe";
 
 @Injectable()
-export class BillingService implements OnModuleDestroy {
+export class BillingService implements IBillingService, OnModuleDestroy {
   private logger = new Logger("BillingService");
   private readonly webAppUrl: string;
 
   constructor(
     private readonly teamsRepository: OrganizationsRepository,
     public readonly stripeService: StripeService,
-    private readonly billingRepository: BillingRepository,
+    public readonly billingRepository: BillingRepository,
     private readonly configService: ConfigService<AppConfig>,
     private readonly billingConfigService: BillingConfigService,
     private readonly usersRepository: UsersRepository,
@@ -43,18 +44,23 @@ export class BillingService implements OnModuleDestroy {
 
   async getBillingData(teamId: number) {
     const teamWithBilling = await this.teamsRepository.findByIdIncludeBilling(teamId);
+
     if (teamWithBilling?.platformBilling) {
       if (!teamWithBilling?.platformBilling.subscriptionId) {
-        return { team: teamWithBilling, status: "no_subscription", plan: "none" };
+        return { team: teamWithBilling, status: "no_subscription" as const, plan: "none" };
-      }
-
-      return { team: teamWithBilling, status: "valid", plan: teamWithBilling.platformBilling.plan };
       } else {
-      return { team: teamWithBilling, status: "no_billing", plan: "none" };
+        return {
+          team: teamWithBilling,
+          status: "valid" as const,
+          plan: teamWithBilling.platformBilling.plan,
+        };
+      }
+    } else {
+      return { team: teamWithBilling, status: "no_billing" as const, plan: "none" };
     }
   }
 
-  async createTeamBilling(teamId: number) {
+  async createTeamBilling(teamId: number): Promise<string> {
     const teamWithBilling = await this.teamsRepository.findByIdIncludeBilling(teamId);
     let customerId = teamWithBilling?.platformBilling?.customerId;
 
@@ -67,7 +73,7 @@ export class BillingService implements OnModuleDestroy {
       });
     }
 
-    return customerId;
+    return customerId!;
   }
 
   async redirectToSubscribeCheckout(teamId: number, plan: PlatformPlan, customerId?: string) {

apps/api/v2/src/modules/cal-unified-calendars/outputs/get-unified-calendar-event.output.ts

@@ -1,4 +1,4 @@
-import { ApiProperty, ApiPropertyOptional, getSchemaPath } from "@nestjs/swagger";
+import { ApiExtraModels, ApiProperty, ApiPropertyOptional, getSchemaPath } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsEnum, IsISO8601, IsOptional, IsString, ValidateNested } from "class-validator";
 
@@ -297,6 +297,12 @@ export class DateTimeWithZone {
   timeZone!: string;
 }
 
+@ApiExtraModels(
+  CalendarEventVideoLocation,
+  CalendarEventPhoneLocation,
+  CalendarEventSipLocation,
+  CalendarEventMoreLocation
+)
 export class UnifiedCalendarEventOutput {
   @ValidateNested()
   @Type(() => DateTimeWithZone)

apps/api/v2/src/modules/oauth-clients/controllers/oauth-client-users/oauth-client-users.controller.e2e-spec.ts

@@ -705,6 +705,111 @@ describe("OAuth Client Users Endpoints", () => {
         .expect(200);
     });
 
+    describe("managed user time zone", () => {
+      describe("negative tests", () => {
+        it("should not allow '' time zone", async () => {
+          const requestBody = {
+            email: "whatever2@gmail.com",
+            timeZone: "",
+            name: "Bob Smithson",
+          };
+
+          await request(app.getHttpServer())
+            .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+            .set("x-cal-secret-key", oAuthClient.secret)
+            .send(requestBody)
+            .expect(400);
+        });
+
+        it("should not allow 'invalid-timezone' time zone", async () => {
+          const requestBody = {
+            email: "whatever2@gmail.com",
+            timeZone: "invalid-timezone",
+            name: "Bob Smithson",
+          };
+
+          await request(app.getHttpServer())
+            .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+            .set("x-cal-secret-key", oAuthClient.secret)
+            .send(requestBody)
+            .expect(400);
+        });
+      });
+
+      describe("positive tests", () => {
+        it("should allow null timezone", async () => {
+          const requestBody = {
+            email: "whatever1@gmail.com",
+            timeZone: null,
+            name: "Bob Smithson",
+          };
+
+          const response = await request(app.getHttpServer())
+            .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+            .set("x-cal-secret-key", oAuthClient.secret)
+            .send(requestBody)
+            .expect(201);
+
+          const responseBody: CreateManagedUserOutput = response.body;
+          expect(responseBody.data.user.timeZone).toEqual("Europe/London");
+          await userRepositoryFixture.delete(responseBody.data.user.id);
+        });
+
+        it("should allow undefined time zone", async () => {
+          const requestBody = {
+            email: "whatever3@gmail.com",
+            timeZone: undefined,
+            name: "Bob Smithson",
+          };
+
+          const response = await request(app.getHttpServer())
+            .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+            .set("x-cal-secret-key", oAuthClient.secret)
+            .send(requestBody)
+            .expect(201);
+
+          const responseBody: CreateManagedUserOutput = response.body;
+          expect(responseBody.data.user.timeZone).toEqual("Europe/London");
+          await userRepositoryFixture.delete(responseBody.data.user.id);
+        });
+
+        it("should allow valid time zone", async () => {
+          const requestBody = {
+            email: "whatever4@gmail.com",
+            timeZone: "Europe/Rome",
+            name: "Bob Smithson",
+          };
+
+          const response = await request(app.getHttpServer())
+            .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+            .set("x-cal-secret-key", oAuthClient.secret)
+            .send(requestBody)
+            .expect(201);
+
+          const responseBody: CreateManagedUserOutput = response.body;
+          expect(responseBody.data.user.timeZone).toBe("Europe/Rome");
+          await userRepositoryFixture.delete(responseBody.data.user.id);
+        });
+
+        it("should allow without any time zone", async () => {
+          const requestBody = {
+            email: "whatever5@gmail.com",
+            name: "Bob Smithson",
+          };
+
+          const response = await request(app.getHttpServer())
+            .post(`/api/v2/oauth-clients/${oAuthClient.id}/users`)
+            .set("x-cal-secret-key", oAuthClient.secret)
+            .send(requestBody)
+            .expect(201);
+
+          const responseBody: CreateManagedUserOutput = response.body;
+          expect(responseBody.data.user.timeZone).toEqual("Europe/London");
+          await userRepositoryFixture.delete(responseBody.data.user.id);
+        });
+      });
+    });
+
     afterAll(async () => {
       await oauthClientRepositoryFixture.delete(oAuthClient.id);
       await oauthClientRepositoryFixture.delete(oAuthClientEventTypesDisabled.id);
@@ -712,17 +817,17 @@ describe("OAuth Client Users Endpoints", () => {
       try {
         await userRepositoryFixture.delete(postResponseData.user.id);
       } catch (e) {
-        // User might have been deleted by the test
+        console.log(e);
       }
       try {
         await userRepositoryFixture.delete(postResponseData2.user.id);
       } catch (e) {
-        // User might have been deleted by the test
+        console.log(e);
       }
       try {
         await userRepositoryFixture.delete(platformAdmin.id);
       } catch (e) {
-        // User might have been deleted by the test
+        console.log(e);
       }
       await app.close();
     });
@@ -931,7 +1036,7 @@ describe("OAuth Client Users Endpoints", () => {
       try {
         await userRepositoryFixture.delete(postResponseData.user.id);
       } catch (e) {
-        // User might have been deleted by the test
+        console.log(e);
       }
       await app.close();
     });

apps/api/v2/src/modules/organizations/delegation-credentials/inputs/create-delegation-credential.input.ts

@@ -4,9 +4,11 @@ import {
   MicrosoftServiceAccountKeyInput,
 } from "@/modules/organizations/delegation-credentials/inputs/service-account-key.input";
 import { ApiProperty, getSchemaPath } from "@nestjs/swagger";
+import { ApiExtraModels } from "@nestjs/swagger";
 import { Expose, Type } from "class-transformer";
-import { IsString, IsNotEmpty, ValidateNested, Validate } from "class-validator";
+import { IsString, IsNotEmpty, Validate } from "class-validator";
 
+@ApiExtraModels(GoogleServiceAccountKeyInput, MicrosoftServiceAccountKeyInput)
 export class CreateDelegationCredentialInput {
   @IsString()
   @IsNotEmpty()

apps/api/v2/src/modules/organizations/delegation-credentials/inputs/update-delegation-credential.input.ts

@@ -3,10 +3,11 @@ import {
   MicrosoftServiceAccountKeyInput,
   ServiceAccountKeyValidator,
 } from "@/modules/organizations/delegation-credentials/inputs/service-account-key.input";
-import { ApiPropertyOptional, getSchemaPath } from "@nestjs/swagger";
+import { ApiExtraModels, ApiPropertyOptional, getSchemaPath } from "@nestjs/swagger";
-import { Expose, plainToClass, Transform, Type } from "class-transformer";
+import { Expose, Type } from "class-transformer";
-import { IsBoolean, IsOptional, Validate, ValidateNested } from "class-validator";
+import { IsBoolean, IsOptional, Validate } from "class-validator";
 
+@ApiExtraModels(GoogleServiceAccountKeyInput, MicrosoftServiceAccountKeyInput)
 export class UpdateDelegationCredentialInput {
   @IsBoolean()
   @IsOptional()

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

@@ -174,4 +174,14 @@ export class OrganizationsRepository {
       },
     });
   }
+
+  async findTeamByPlatformBillingId(billingId: number) {
+    return this.dbRead.prisma.team.findFirst({
+      where: {
+        platformBilling: {
+          id: billingId,
+        },
+      },
+    });
+  }
 }

apps/api/v2/src/modules/organizations/organizations.module.ts

@@ -47,6 +47,7 @@ import { OrganizationsTeamsController } from "@/modules/organizations/teams/inde
 import { OrganizationsTeamsRepository } from "@/modules/organizations/teams/index/organizations-teams.repository";
 import { OrganizationsTeamsService } from "@/modules/organizations/teams/index/services/organizations-teams.service";
 import { OrganizationsTeamsMembershipsController } from "@/modules/organizations/teams/memberships/organizations-teams-memberships.controller";
+import { OrganizationsTeamsInviteController } from "@/modules/organizations/teams/invite/organizations-teams-invite.controller";
 import { OrganizationsTeamsMembershipsRepository } from "@/modules/organizations/teams/memberships/organizations-teams-memberships.repository";
 import { OrganizationsTeamsMembershipsService } from "@/modules/organizations/teams/memberships/services/organizations-teams-memberships.service";
 import { OrganizationsTeamsRoutingFormsModule } from "@/modules/organizations/teams/routing-forms/organizations-teams-routing-forms.module";
@@ -183,6 +184,7 @@ import { Module } from "@nestjs/common";
     OrganizationsMembershipsController,
     OrganizationsEventTypesController,
     OrganizationsTeamsMembershipsController,
+    OrganizationsTeamsInviteController,
     OrganizationsAttributesController,
     OrganizationsAttributesOptionsController,
     OrganizationsWebhooksController,

apps/api/v2/src/modules/organizations/organizations/managed-organizations.repository.ts

@@ -68,7 +68,7 @@ export class ManagedOrganizationsRepository {
       managedOrganization: managedOrganizationFilter,
     };
 
-    const [totalItems, linkRows] = await this.dbRead.prisma.$transaction([
+    const [totalItems, linkRows] = await Promise.all([
       this.dbRead.prisma.managedOrganization.count({ where }),
       this.dbRead.prisma.managedOrganization.findMany({
         where,

apps/api/v2/src/modules/organizations/routing-forms/outputs/create-routing-form-response.output.ts

@@ -1,4 +1,4 @@
-import { ApiProperty, ApiPropertyOptional, getSchemaPath } from "@nestjs/swagger";
+import { ApiExtraModels, ApiProperty, ApiPropertyOptional, getSchemaPath } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsArray, IsBoolean, IsInt, IsNumber, IsOptional, IsString, ValidateNested } from "class-validator";
 
@@ -75,6 +75,7 @@ class Routing {
   crmOwnerRecordType?: string;
 }
 
+@ApiExtraModels(SlotsOutput_2024_09_04, RangeSlotsOutput_2024_09_04)
 export class CreateRoutingFormResponseOutputData {
   @ApiPropertyOptional({
     type: Number,

apps/api/v2/src/modules/organizations/teams/invite/organizations-teams-invite.controller.e2e-spec.ts

@@ -0,0 +1,135 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { TokensModule } from "@/modules/tokens/tokens.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 { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { randomString } from "test/utils/randomString";
+import { withApiAuth } from "test/utils/withApiAuth";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import type { Team, User } from "@calcom/prisma/client";
+
+describe("Organizations Teams Invite Endpoints", () => {
+  describe("User Authentication - User is Org Team Admin", () => {
+    let app: INestApplication;
+
+    let userRepositoryFixture: UserRepositoryFixture;
+    let organizationsRepositoryFixture: OrganizationRepositoryFixture;
+    let teamsRepositoryFixture: TeamRepositoryFixture;
+    let membershipsRepositoryFixture: MembershipRepositoryFixture;
+
+    let org: Team;
+    let orgTeam: Team;
+    let nonOrgTeam: Team;
+
+    const userEmail = `organizations-teams-invite-admin-${randomString()}@api.com`;
+
+    let user: User;
+
+    beforeAll(async () => {
+      const moduleRef = await withApiAuth(
+        userEmail,
+        Test.createTestingModule({
+          imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+        })
+      ).compile();
+
+      userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+      organizationsRepositoryFixture = new OrganizationRepositoryFixture(moduleRef);
+      teamsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+      membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+
+      user = await userRepositoryFixture.create({
+        email: userEmail,
+        username: userEmail,
+      });
+
+      org = await organizationsRepositoryFixture.create({
+        name: `organizations-teams-invite-organization-${randomString()}`,
+        isOrganization: true,
+      });
+
+      orgTeam = await teamsRepositoryFixture.create({
+        name: `organizations-teams-invite-team-${randomString()}`,
+        isOrganization: false,
+        parent: { connect: { id: org.id } },
+      });
+
+      nonOrgTeam = await teamsRepositoryFixture.create({
+        name: `organizations-teams-invite-non-org-team-${randomString()}`,
+        isOrganization: false,
+      });
+
+      // Admin of the org team
+      await membershipsRepositoryFixture.create({
+        role: "ADMIN",
+        user: { connect: { id: user.id } },
+        team: { connect: { id: orgTeam.id } },
+      });
+
+      // Also a member of the organization
+      await membershipsRepositoryFixture.create({
+        role: "ADMIN",
+        user: { connect: { id: user.id } },
+        team: { connect: { id: org.id } },
+      });
+
+      app = moduleRef.createNestApplication();
+      bootstrap(app as NestExpressApplication);
+      await app.init();
+    });
+
+    it("should create a team invite", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams/${orgTeam.id}/invite`)
+        .expect(200)
+        .then((response) => {
+          expect(response.body.status).toEqual(SUCCESS_STATUS);
+          expect(response.body.data.token.length).toBeGreaterThan(0);
+          expect(response.body.data.inviteLink).toEqual(expect.any(String));
+          expect(response.body.data.inviteLink).toContain(response.body.data.token);
+        });
+    });
+
+    it("should create a new invite on each request", async () => {
+      const first = await request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams/${orgTeam.id}/invite`)
+        .expect(200);
+      const firstToken = first.body.data.token as string;
+
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams/${orgTeam.id}/invite`)
+        .expect(200)
+        .then((response) => {
+          expect(response.body.status).toEqual(SUCCESS_STATUS);
+          expect(response.body.data.token).not.toEqual(firstToken);
+          expect(response.body.data.inviteLink).toEqual(expect.any(String));
+          expect(response.body.data.inviteLink).toContain(response.body.data.token);
+        });
+    });
+
+    it("should fail for team not in organization", async () => {
+      return request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/teams/${nonOrgTeam.id}/invite`)
+        .expect(404);
+    });
+
+
+    afterAll(async () => {
+      await userRepositoryFixture.deleteByEmail(user.email);
+      await organizationsRepositoryFixture.delete(org.id);
+      await teamsRepositoryFixture.delete(nonOrgTeam.id);
+      await app.close();
+    });
+  });
+});
+
+

apps/api/v2/src/modules/organizations/teams/invite/organizations-teams-invite.controller.ts

@@ -0,0 +1,43 @@
+import { API_VERSIONS_VALUES } from "@/lib/api-versions";
+import { OPTIONAL_API_KEY_HEADER, OPTIONAL_X_CAL_CLIENT_ID_HEADER, OPTIONAL_X_CAL_SECRET_KEY_HEADER } from "@/lib/docs/headers";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { PlatformPlanGuard } from "@/modules/auth/guards/billing/platform-plan.guard";
+import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-admin-api-enabled.guard";
+import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
+import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
+import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
+import { Controller, UseGuards, Post, Param, ParseIntPipe, HttpCode, HttpStatus } from "@nestjs/common";
+import { ApiHeader, ApiOperation, ApiTags as DocsTags } from "@nestjs/swagger";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+
+import { TeamService } from "@calcom/platform-libraries";
+
+
+import { CreateInviteOutputDto } from "./outputs/invite.output";
+
+@Controller({
+  path: "/v2/organizations/:orgId/teams/:teamId",
+  version: API_VERSIONS_VALUES,
+})
+@UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard, IsTeamInOrg, PlatformPlanGuard, IsAdminAPIEnabledGuard)
+@DocsTags("Orgs / Teams / Invite")
+@ApiHeader(OPTIONAL_X_CAL_CLIENT_ID_HEADER)
+@ApiHeader(OPTIONAL_X_CAL_SECRET_KEY_HEADER)
+@ApiHeader(OPTIONAL_API_KEY_HEADER)
+export class OrganizationsTeamsInviteController {
+  @Post("/invite")
+  @Roles("TEAM_ADMIN")
+  @ApiOperation({ summary: "Create team invite link" })
+  @HttpCode(HttpStatus.OK)
+  async createInvite(
+    @Param("orgId", ParseIntPipe) _orgId: number,
+    @Param("teamId", ParseIntPipe) teamId: number
+  ): Promise<CreateInviteOutputDto> {
+    const result = await TeamService.createInvite(teamId);
+    return { status: SUCCESS_STATUS, data: result };
+  }
+}
+
+

apps/api/v2/src/modules/organizations/teams/invite/outputs/invite.output.ts

@@ -0,0 +1,27 @@
+import { ApiProperty } from "@nestjs/swagger";
+
+export class InviteDataDto {
+  @ApiProperty({
+    description:
+      "Unique invitation token for this team. Share this token with prospective members to allow them to join the team/organization.",
+    example: "f6a5c8b1d2e34c7f90a1b2c3d4e5f6a5b7c8d9e0f1a2b3c4d5e6f7a8b9c0d1e2",
+  })
+  token!: string;
+
+  @ApiProperty({
+    description:
+      "Complete invitation URL that can be shared with prospective members. Opens the signup page with the token and redirects to getting started after signup.",
+    example: "http://app.cal.com/signup?token=f6a5c8b1d2e34c7f90a1b2c3d4e5f6a5b7c8d9e0f1a2b3c4d5e6f7a8b9c0d1e2&callbackUrl=/getting-started",
+  })
+  inviteLink!: string;
+}
+
+export class CreateInviteOutputDto {
+  @ApiProperty({ example: "success" })
+  status!: string;
+
+  @ApiProperty({ type: InviteDataDto })
+  data!: InviteDataDto;
+}
+
+

apps/api/v2/src/modules/organizations/users/index/controllers/organizations-users.e2e-spec.ts

@@ -351,6 +351,7 @@ describe("Organizations Users Endpoints", () => {
         email: `organizations-users-new-member-${randomString()}@api.com`,
         bio,
         metadata,
+        timeZone: "Europe/Rome",
       };
 
       const emailSpy = jest
@@ -367,6 +368,7 @@ describe("Organizations Users Endpoints", () => {
       expect(userData.email).toBe(newOrgUser.email);
       expect(userData.bio).toBe(newOrgUser.bio);
       expect(userData.metadata).toEqual(newOrgUser.metadata);
+      expect(userData.timeZone).toBe(newOrgUser.timeZone);
       expect(emailSpy).toHaveBeenCalledWith({
         usernameOrEmail: newOrgUser.email,
         orgName: org.name,

apps/api/v2/src/modules/teams/event-types/outputs/create-team-event-type.output.ts

@@ -1,9 +1,10 @@
-import { ApiProperty, getSchemaPath } from "@nestjs/swagger";
+import { ApiExtraModels, ApiProperty, getSchemaPath } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsNotEmptyObject, ValidateNested } from "class-validator";
 
 import { ApiResponseWithoutData, TeamEventTypeOutput_2024_06_14 } from "@calcom/platform-types";
 
+@ApiExtraModels(TeamEventTypeOutput_2024_06_14)
 export class CreateTeamEventTypeOutput extends ApiResponseWithoutData {
   @IsNotEmptyObject()
   @ValidateNested()

apps/api/v2/src/modules/teams/event-types/outputs/update-team-event-type.output.ts

@@ -1,9 +1,10 @@
-import { ApiProperty, getSchemaPath } from "@nestjs/swagger";
+import { ApiExtraModels, ApiProperty, getSchemaPath } from "@nestjs/swagger";
 import { Type } from "class-transformer";
 import { IsNotEmptyObject, ValidateNested } from "class-validator";
 
 import { ApiResponseWithoutData, TeamEventTypeOutput_2024_06_14 } from "@calcom/platform-types";
 
+@ApiExtraModels(TeamEventTypeOutput_2024_06_14)
 export class UpdateTeamEventTypeOutput extends ApiResponseWithoutData {
   @IsNotEmptyObject()
   @ValidateNested()

apps/api/v2/src/modules/teams/memberships/controllers/teams-memberships.controller.e2e-spec.ts

@@ -328,6 +328,131 @@ describe("Teams Memberships Endpoints", () => {
       return request(app.getHttpServer()).get(`/v2/teams/${team.id}/memberships/123132145`).expect(404);
     });
 
+    it("should filter memberships by single email", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/teams/${team.id}/memberships?emails=${teamAdminEmail}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: GetTeamMembershipsOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.length).toEqual(1);
+          expect(responseBody.data[0].user.email).toEqual(teamAdminEmail);
+          expect(responseBody.data[0].userId).toEqual(teamAdmin.id);
+          expect(responseBody.data[0].role).toEqual("ADMIN");
+        });
+    });
+
+    it("should filter memberships by multiple emails", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/teams/${team.id}/memberships?emails=${teamAdminEmail},${teamMemberEmail}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: GetTeamMembershipsOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.length).toEqual(2);
+
+          const emails = responseBody.data.map((membership) => membership.user.email);
+          expect(emails).toContain(teamAdminEmail);
+          expect(emails).toContain(teamMemberEmail);
+
+          const adminMembership = responseBody.data.find((m) => m.user.email === teamAdminEmail);
+          const memberMembership = responseBody.data.find((m) => m.user.email === teamMemberEmail);
+
+          expect(adminMembership).toBeDefined();
+          expect(memberMembership).toBeDefined();
+          expect(adminMembership?.role).toEqual("ADMIN");
+          expect(memberMembership?.role).toEqual("MEMBER");
+        });
+    });
+
+    it("should return empty array when filtering by non-existent email", async () => {
+      const nonExistentEmail = `nonexistent-${randomString()}@test.com`;
+      return request(app.getHttpServer())
+        .get(`/v2/teams/${team.id}/memberships?emails=${nonExistentEmail}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: GetTeamMembershipsOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.length).toEqual(0);
+        });
+    });
+
+    it("should return partial results when filtering by mix of existing and non-existent emails", async () => {
+      const nonExistentEmail = `nonexistent-${randomString()}@test.com`;
+      return request(app.getHttpServer())
+        .get(`/v2/teams/${team.id}/memberships?emails=${teamAdminEmail},${nonExistentEmail}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: GetTeamMembershipsOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.length).toEqual(1);
+          expect(responseBody.data[0].user.email).toEqual(teamAdminEmail);
+        });
+    });
+
+    it("should work with pagination and email filtering combined", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/teams/${team.id}/memberships?emails=${teamAdminEmail},${teamMemberEmail}&skip=1&take=1`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: GetTeamMembershipsOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.length).toEqual(1);
+          const returnedEmail = responseBody.data[0].user.email;
+          expect([teamAdminEmail, teamMemberEmail]).toContain(returnedEmail);
+        });
+    });
+
+    it("should handle empty emails array gracefully", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/teams/${team.id}/memberships?emails=`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: GetTeamMembershipsOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.length).toEqual(2);
+        });
+    });
+
+    it("should handle URL encoded email addresses in filter", async () => {
+      const encodedEmail = encodeURIComponent(teamAdminEmail);
+      return request(app.getHttpServer())
+        .get(`/v2/teams/${team.id}/memberships?emails=${encodedEmail}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: GetTeamMembershipsOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.length).toEqual(1);
+          expect(responseBody.data[0].user.email).toEqual(teamAdminEmail);
+        });
+    });
+
+    it("should filter by email and maintain all user properties", async () => {
+      return request(app.getHttpServer())
+        .get(`/v2/teams/${team.id}/memberships?emails=${teamMemberEmail}`)
+        .expect(200)
+        .then((response) => {
+          const responseBody: GetTeamMembershipsOutput = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          expect(responseBody.data.length).toEqual(1);
+          const membership = responseBody.data[0];
+          expect(membership.user.email).toEqual(teamMemberEmail);
+          expect(membership.user.bio).toEqual(teamMember.bio);
+          expect(membership.user.metadata).toEqual(teamMember.metadata);
+          expect(membership.user.username).toEqual(teamMember.username);
+          expect(membership.teamId).toEqual(team.id);
+          expect(membership.userId).toEqual(teamMember.id);
+          expect(membership.role).toEqual("MEMBER");
+        });
+    });
+
+    it("should validate email array size limits", async () => {
+      const tooManyEmails = Array.from({ length: 21 }, (_, i) => `test${i}@example.com`).join(",");
+      return request(app.getHttpServer())
+        .get(`/v2/teams/${team.id}/memberships?emails=${tooManyEmails}`)
+        .expect(400);
+    });
+
     afterAll(async () => {
       await userRepositoryFixture.deleteByEmail(teamAdmin.email);
       await userRepositoryFixture.deleteByEmail(teammateInvitedViaApi.email);

apps/api/v2/src/modules/teams/memberships/controllers/teams-memberships.controller.ts

@@ -4,6 +4,7 @@ import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
 import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
 import { CreateTeamMembershipInput } from "@/modules/teams/memberships/inputs/create-team-membership.input";
+import { GetTeamMembershipsInput } from "@/modules/teams/memberships/inputs/get-team-memberships.input";
 import { UpdateTeamMembershipInput } from "@/modules/teams/memberships/inputs/update-team-membership.input";
 import { CreateTeamMembershipOutput } from "@/modules/teams/memberships/outputs/create-team-membership.output";
 import { DeleteTeamMembershipOutput } from "@/modules/teams/memberships/outputs/delete-team-membership.output";
@@ -32,7 +33,6 @@ import { plainToClass } from "class-transformer";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
 import { updateNewTeamMemberEventTypes } from "@calcom/platform-libraries/event-types";
-import { SkipTakePagination } from "@calcom/platform-types";
 
 @Controller({
   path: "/v2/teams/:teamId/memberships",
@@ -85,16 +85,20 @@ export class TeamsMembershipsController {
   }
 
   @Get("/")
-  @ApiOperation({ summary: "Get all memberships" })
+  @ApiOperation({
+    summary: "Get all memberships",
+    description: "Retrieve team memberships with optional filtering by email addresses. Supports pagination.",
+  })
   @Roles("TEAM_ADMIN")
   @HttpCode(HttpStatus.OK)
   async getTeamMemberships(
     @Param("teamId", ParseIntPipe) teamId: number,
-    @Query() queryParams: SkipTakePagination
+    @Query() queryParams: GetTeamMembershipsInput
   ): Promise<GetTeamMembershipsOutput> {
-    const { skip, take } = queryParams;
+    const { skip, take, emails } = queryParams;
     const orgTeamMemberships = await this.teamsMembershipsService.getPaginatedTeamMemberships(
       teamId,
+      emails,
       skip ?? 0,
       take ?? 250
     );

apps/api/v2/src/modules/teams/memberships/inputs/get-team-memberships.input.ts

@@ -0,0 +1,32 @@
+import { GetUsersInput } from "@/modules/users/inputs/get-users.input";
+import { ApiPropertyOptional } from "@nestjs/swagger";
+import { Transform } from "class-transformer";
+import { ArrayMaxSize, ArrayNotEmpty, IsEmail, IsOptional } from "class-validator";
+
+export class GetTeamMembershipsInput extends GetUsersInput {
+  @IsOptional()
+  @Transform(({ value }) => {
+    if (value == null) return undefined;
+    const rawValues = (Array.isArray(value) ? value : [value]).flatMap((entry) =>
+      typeof entry === "string" ? entry.split(",") : []
+    );
+    const normalized = rawValues
+      .map((email) => email.trim())
+      .filter((email) => email.length > 0)
+      .map((email) => email.toLowerCase());
+    const deduplicated = [...new Set(normalized)];
+    return deduplicated.length > 0 ? deduplicated : undefined;
+  })
+  @ArrayNotEmpty({ message: "emails cannot be empty." })
+  @ArrayMaxSize(20, {
+    message: "emails array cannot contain more than 20 email addresses for team membership filtering",
+  })
+  @IsEmail({}, { each: true, message: "Each email must be a valid email address" })
+  @ApiPropertyOptional({
+    type: [String],
+    description:
+      "Filter team memberships by email addresses. If you want to filter by multiple emails, separate them with a comma (max 20 emails for performance).",
+    example: "?emails=user1@example.com,user2@example.com",
+  })
+  emails?: string[];
+}

apps/api/v2/src/modules/teams/memberships/services/teams-memberships.service.ts

@@ -23,13 +23,15 @@ export class TeamsMembershipsService {
     return teamMembership;
   }
 
-  async getPaginatedTeamMemberships(teamId: number, skip = 0, take = 250) {
+  async getPaginatedTeamMemberships(teamId: number, emails?: string[], skip = 0, take = 250) {
-    const teamMemberships = await this.teamsMembershipsRepository.findTeamMembershipsPaginated(
+    const emailArray = !emails ? [] : emails;
+
+    return await this.teamsMembershipsRepository.findTeamMembershipsPaginatedWithFilters(
       teamId,
+      { emails: emailArray },
       skip,
       take
     );
-    return teamMemberships;
   }
 
   async getTeamMembership(teamId: number, membershipId: number) {

apps/api/v2/src/modules/teams/memberships/teams-memberships.repository.ts

@@ -6,6 +6,10 @@ import { Injectable } from "@nestjs/common";
 
 import type { Prisma } from "@calcom/prisma/client";
 
+export interface TeamMembershipFilters {
+  emails?: string[];
+}
+
 export const MembershipUserSelect: Prisma.UserSelect = {
   username: true,
   email: true,
@@ -41,6 +45,30 @@ export class TeamsMembershipsRepository {
     });
   }
 
+  async findTeamMembershipsPaginatedWithFilters(
+    teamId: number,
+    filters: TeamMembershipFilters,
+    skip: number,
+    take: number
+  ) {
+    const whereClause: Prisma.MembershipWhereInput = {
+      teamId: teamId,
+    };
+
+    if (filters.emails && filters.emails.length > 0) {
+      whereClause.user = {
+        email: { in: filters.emails },
+      };
+    }
+
+    return await this.dbRead.prisma.membership.findMany({
+      where: whereClause,
+      include: { user: { select: MembershipUserSelect } },
+      skip,
+      take,
+    });
+  }
+
   async findTeamMembership(teamId: number, membershipId: number) {
     return this.dbRead.prisma.membership.findUnique({
       where: {

apps/api/v2/src/modules/teams/teams/outputs/teams/create-team.output.ts

@@ -1,11 +1,11 @@
-import { ApiProperty, getSchemaPath } from "@nestjs/swagger";
+import { ApiExtraModels, ApiProperty, getSchemaPath } from "@nestjs/swagger";
 import { Expose } from "class-transformer";
 import { IsEnum, ValidateNested, IsString, IsUrl } from "class-validator";
 
 import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
 import { TeamOutputDto } from "@calcom/platform-types";
 
-class Output {
+class CreateTeamOutputData {
   @Expose()
   @IsString()
   message!: string;
@@ -19,16 +19,17 @@ class Output {
   pendingTeam!: TeamOutputDto;
 }
 
+@ApiExtraModels(TeamOutputDto, CreateTeamOutputData)
 export class CreateTeamOutput {
   @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
   @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
   status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
 
   @ApiProperty({
-    oneOf: [{ $ref: getSchemaPath(Output) }, { $ref: getSchemaPath(TeamOutputDto) }],
+    oneOf: [{ $ref: getSchemaPath(CreateTeamOutputData) }, { $ref: getSchemaPath(TeamOutputDto) }],
     description: "Either an Output object or a TeamOutputDto.",
   })
   @Expose()
   @ValidateNested()
-  data!: Output | TeamOutputDto;
+  data!: CreateTeamOutputData | TeamOutputDto;
 }

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

@@ -120,30 +120,4 @@ export class TeamsRepository {
       },
     });
   }
-
-  async getTeamMemberEmails(teamId: number) {
-    return this.dbRead.prisma.user.findMany({
-      where: {
-        teams: {
-          some: {
-            teamId,
-          },
-        },
-      },
-      select: {
-        id: true,
-        email: true,
-        secondaryEmails: {
-          where: {
-            emailVerified: {
-              not: null,
-            },
-          },
-          select: {
-            email: true,
-          },
-        },
-      },
-    });
-  }
 }

apps/api/v2/src/modules/users/inputs/create-managed-user.input.ts

@@ -1,6 +1,7 @@
 import { Locales } from "@/lib/enums/locales";
 import { CapitalizeTimeZone } from "@/lib/inputs/capitalize-timezone";
 import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
+import { Transform } from "class-transformer";
 import { IsOptional, IsTimeZone, IsString, IsEnum, IsIn, IsUrl, IsObject } from "class-validator";
 
 import { ValidateMetadata } from "@calcom/platform-types";
@@ -29,6 +30,7 @@ export class CreateManagedUserInput {
   })
   weekStart?: WeekDay;
 
+  @Transform(({ value }) => (value === null ? undefined : value))
   @IsTimeZone()
   @IsOptional()
   @CapitalizeTimeZone()

apps/api/v2/src/modules/users/inputs/create-user.input.ts

@@ -1,3 +1,4 @@
+import { CapitalizeTimeZone } from "@/lib/inputs/capitalize-timezone";
 import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
 import { Expose, Transform } from "class-transformer";
 import {
@@ -112,6 +113,7 @@ export class CreateUserInput {
   @ApiProperty({ type: String, required: false, description: "Time zone", example: "America/New_York" })
   @IsOptional()
   @IsString()
+  @CapitalizeTimeZone()
   @Validate(TimeZoneValidator)
   @Expose()
   timeZone?: string;

apps/api/v2/src/modules/users/inputs/get-users.input.ts

@@ -28,6 +28,7 @@ export class GetUsersInput {
   @ApiPropertyOptional({
     type: [String],
     description: "The email address or an array of email addresses to filter by",
+    example: ["user1@example.com", "user2@example.com"],
   })
   emails?: string[];
 }

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

@@ -408,4 +408,30 @@ export class UsersRepository {
       },
     });
   }
+
+  async getUserEmailsVerifiedForTeam(teamId: number) {
+    return this.dbRead.prisma.user.findMany({
+      where: {
+        teams: {
+          some: {
+            teamId,
+          },
+        },
+      },
+      select: {
+        id: true,
+        email: true,
+        secondaryEmails: {
+          where: {
+            emailVerified: {
+              not: null,
+            },
+          },
+          select: {
+            email: true,
+          },
+        },
+      },
+    });
+  }
 }

apps/api/v2/src/modules/users/validators/timeZoneValidator.ts

@@ -1,6 +1,6 @@
 import type { ValidatorConstraintInterface } from "class-validator";
 import { ValidatorConstraint } from "class-validator";
-import tzdata from "tzdata";
+import * as tzdata from "tzdata";
 
 @ValidatorConstraint({ name: "timezoneValidator", async: false })
 export class TimeZoneValidator implements ValidatorConstraintInterface {

apps/api/v2/src/swagger/copy-swagger-module.ts

@@ -8,8 +8,8 @@ import * as path from "path";
 // "nest-cli" with the "nest-cli.json" file, and for nest cli to be loaded with plugins correctly the "@nestjs/swagger"
 // should reside in the project's node_modules already before the "nest start" command is executed.
 async function copyNestSwagger() {
-  const monorepoRoot = path.resolve(__dirname, "../../../../");
+  const monorepoRoot = path.resolve(__dirname, "../../../../../");
-  const nodeModulesNestjs = path.resolve(__dirname, "../node_modules/@nestjs");
+  const nodeModulesNestjs = path.resolve(__dirname, "../../node_modules/@nestjs");
   const swaggerModulePath = "@nestjs/swagger";
 
   const sourceDir = path.join(monorepoRoot, "node_modules", swaggerModulePath);

apps/api/v2/src/swagger/generate-swagger-script.ts

@@ -0,0 +1,29 @@
+import "dotenv/config";
+
+import { bootstrap } from "../app";
+import { createNestApp } from "../main";
+import { generateSwaggerForApp } from "../swagger/generate-swagger";
+
+generateSwagger()
+  .then(() => {
+    console.log("✅ Swagger generation completed successfully");
+    process.exit(0);
+  })
+  .catch((error: Error) => {
+    console.error("❌ Failed to generate swagger", { error: error.stack });
+    process.exit(1);
+  });
+
+async function generateSwagger() {
+  const app = await createNestApp();
+
+  try {
+    bootstrap(app);
+    await generateSwaggerForApp(app);
+  } catch (error) {
+    console.error(error);
+    throw error;
+  } finally {
+    await app.close();
+  }
+}

apps/api/v2/src/swagger/generate-swagger.ts

@@ -0,0 +1,97 @@
+import { getEnv } from "@/env";
+import { Logger } from "@nestjs/common";
+import type { NestExpressApplication } from "@nestjs/platform-express";
+import { SwaggerModule, DocumentBuilder } from "@nestjs/swagger";
+import {
+  PathItemObject,
+  PathsObject,
+  OperationObject,
+} from "@nestjs/swagger/dist/interfaces/open-api-spec.interface";
+import "dotenv/config";
+import * as fs from "fs";
+import { Server } from "http";
+import { spawnSync } from "node:child_process";
+
+const HttpMethods: (keyof PathItemObject)[] = ["get", "post", "put", "delete", "patch", "options", "head"];
+
+export async function generateSwaggerForApp(app: NestExpressApplication<Server>) {
+  const logger = new Logger("App");
+  logger.log(`Generating Swagger documentation...\n`);
+
+  const config = new DocumentBuilder().setTitle("Cal.com API v2").build();
+  const document = SwaggerModule.createDocument(app, config);
+  document.paths = groupAndSortPathsByFirstTag(document.paths);
+
+  const docsOutputFile = "../../../docs/api-reference/v2/openapi.json";
+  const stringifiedContents = JSON.stringify(document, null, 2);
+
+  if (fs.existsSync(docsOutputFile) && getEnv("NODE_ENV") === "development") {
+    fs.unlinkSync(docsOutputFile);
+    fs.writeFileSync(docsOutputFile, stringifiedContents, { encoding: "utf8" });
+    spawnSync("npx", ["prettier", docsOutputFile, "--write"], { stdio: "inherit" });
+  }
+
+  if (!process.env.DOCS_URL) {
+    SwaggerModule.setup("docs", app, document, {
+      customCss: ".swagger-ui .topbar { display: none }",
+    });
+
+    logger.log(`Swagger documentation available in the "/docs" endpoint\n`);
+  }
+}
+
+function groupAndSortPathsByFirstTag(paths: PathsObject): PathsObject {
+  const groupedPaths: { [key: string]: PathsObject } = {};
+
+  Object.keys(paths).forEach((pathKey) => {
+    const pathItem = paths[pathKey];
+
+    HttpMethods.forEach((method) => {
+      const operation = pathItem[method];
+
+      if (isOperationObject(operation) && operation.tags && operation.tags.length > 0) {
+        const firstTag = operation.tags[0];
+
+        if (!groupedPaths[firstTag]) {
+          groupedPaths[firstTag] = {};
+        }
+
+        groupedPaths[firstTag][pathKey] = pathItem;
+      }
+    });
+  });
+
+  const sortedTags = Object.keys(groupedPaths).sort(customTagSort);
+  const sortedPaths: PathsObject = {};
+
+  sortedTags.forEach((tag) => {
+    Object.assign(sortedPaths, groupedPaths[tag]);
+  });
+
+  return sortedPaths;
+}
+
+function customTagSort(a: string, b: string): number {
+  const platformPrefix = "Platform";
+  const orgsPrefix = "Orgs";
+
+  if (a.startsWith(platformPrefix) && !b.startsWith(platformPrefix)) {
+    return -1;
+  }
+  if (!a.startsWith(platformPrefix) && b.startsWith(platformPrefix)) {
+    return 1;
+  }
+
+  if (a.startsWith(orgsPrefix) && !b.startsWith(orgsPrefix)) {
+    return -1;
+  }
+  if (!a.startsWith(orgsPrefix) && b.startsWith(orgsPrefix)) {
+    return 1;
+  }
+
+  return a.localeCompare(b);
+}
+
+function isOperationObject(obj: any): obj is OperationObject {
+  return obj && typeof obj === "object" && "tags" in obj;
+}

apps/api/v2/test/fixtures/repository/billing.repository.fixture.ts

@@ -18,7 +18,7 @@ export class PlatformBillingRepositoryFixture {
         id: orgId,
         customerId: `cus_123_${randomString}`,
         subscriptionId: `sub_123_${randomString}`,
-        plan: plan || "STARTER",
+        plan: plan || "FREE",
       },
     });
   }

apps/ui-playground/app/global.css

@@ -636,10 +636,6 @@ select:focus {
   @apply !border-r-default left-0.5 !border-y-0 !border-l-0;
 }
 
-.intercom-lightweight-app  {
-  @apply z-40 !important;
-}
-
 @import "../../web/styles/tokens.css";
 
 @layer base {
@@ -1027,10 +1023,6 @@ select:focus {
   @apply !border-r-default left-0.5 !border-y-0 !border-l-0;
 }
 
-.intercom-lightweight-app  {
-  @apply z-40 !important;
-}
-
 .prose :where(a:not([data-card])):not(:where([class~="not-prose"] *)) {
   text-decoration: none;
 }

apps/ui-playground/eslint.config.mjs

@@ -0,0 +1,3 @@
+import { nextJsConfig } from "@calcom/eslint-config/next-js";
+
+export default nextJsConfig;

apps/ui-playground/package.json

@@ -6,12 +6,12 @@
     "dev": "next dev --turbopack --port=1337",
     "build": "next build",
     "start": "next start",
-    "lint": "next lint"
+    "lint": "eslint ."
   },
   "dependencies": {
-    "@calcom/config": "*",
+    "@calcom/config": "workspace:*",
-    "@calcom/lib": "*",
+    "@calcom/lib": "workspace:*",
-    "@calcom/ui": "*",
+    "@calcom/ui": "workspace:*",
     "@radix-ui/react-tooltip": "^1.1.8",
     "airtable": "^0.12.2",
     "fumadocs-core": "^14.5.4",
@@ -24,14 +24,12 @@
     "react-hot-toast": "^2.5.2"
   },
   "devDependencies": {
-    "@calcom/tsconfig": "*",
+    "@calcom/eslint-config": "workspace:*",
-    "@eslint/eslintrc": "^3",
+    "@calcom/tsconfig": "workspace:*",
     "@types/mdx": "^2.0.13",
     "@types/node": "^20",
     "@types/react": "^18",
     "@types/react-dom": "^18",
-    "eslint": "^8.34.0",
-    "eslint-config-next": "15.1.6",
     "postcss": "^8",
     "tailwindcss": "^3.4.1",
     "typescript": "^5.9.0-beta"

apps/web/.eslintignore

@@ -1,2 +0,0 @@
-node_modules
-public/embed

apps/web/app/(use-page-wrapper)/(main-nav)/availability/page.tsx

@@ -5,10 +5,11 @@ import { unstable_cache } from "next/cache";
 import { cookies, headers } from "next/headers";
 import { redirect } from "next/navigation";
 
-import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { AvailabilitySliderTable } from "@calcom/features/timezone-buddy/components/AvailabilitySliderTable";
 import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
+import { MembershipRole } from "@calcom/prisma/enums";
 import { availabilityRouter } from "@calcom/trpc/server/routers/viewer/availability/_router";
 
 import { buildLegacyRequest } from "@lib/buildLegacyCtx";
@@ -72,8 +73,14 @@ const Page = async ({ searchParams: _searchParams }: PageProps) => {
         orgId: organizationId,
       })
     : false;
-  const isOrgAdminOrOwner = checkAdminOrOwner(session?.user?.org?.role);
+
-  const canViewTeamAvailability = isOrgAdminOrOwner || !isOrgPrivate;
+  const permissionService = new PermissionCheckService();
+  const teamIdsWithPermission = await permissionService.getTeamIdsWithPermission({
+    userId: session.user.id,
+    permission: "availability.read",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
+  const canViewTeamAvailability = teamIdsWithPermission.length > 0 || !isOrgPrivate;
 
   return (
     <ShellMainAppDir

apps/web/app/(use-page-wrapper)/(main-nav)/bookings/[status]/page.tsx

@@ -6,6 +6,8 @@ import { redirect } from "next/navigation";
 import { z } from "zod";
 
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
+import { MembershipRole } from "@calcom/prisma/enums";
 
 import { buildLegacyRequest } from "@lib/buildLegacyCtx";
 
@@ -33,9 +35,30 @@ const Page = async ({ params }: PageProps) => {
   const t = await getTranslate();
   const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });
 
+  let canReadOthersBookings = false;
+  if (session?.user?.id) {
+    const permissionService = new PermissionCheckService();
+    const userId = session.user.id;
+
+    const teamIdsWithPermission = await permissionService.getTeamIdsWithPermission({
+      userId,
+      permission: "booking.read",
+      fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+    });
+    // We check if teamIdsWithPermission.length > 0.
+    // While this may not be entirely accurate, it's acceptable
+    // because we perform a thorough validation on the server side for the actual filter values.
+    // This variable is primarily for UI purposes.
+    canReadOthersBookings = teamIdsWithPermission.length > 0;
+  }
+
   return (
     <ShellMainAppDir heading={t("bookings")} subtitle={t("bookings_description")}>
-      <BookingsList status={parsed.data.status} userId={session?.user?.id} />
+      <BookingsList
+        status={parsed.data.status}
+        userId={session?.user?.id}
+        permissions={{ canReadOthersBookings }}
+      />
     </ShellMainAppDir>
   );
 };

apps/web/app/(use-page-wrapper)/(main-nav)/teams/CTA.tsx

@@ -11,6 +11,7 @@ export const TeamsCTA = () => {
       data-testid="new-team-btn"
       variant="fab"
       StartIcon="plus"
+      size="sm"
       type="button"
       href={`${WEBAPP_URL}/settings/teams/new?returnTo=${WEBAPP_URL}/teams`}>
       {t("new")}

apps/web/app/(use-page-wrapper)/(main-nav)/teams/page.tsx

@@ -23,7 +23,8 @@ const ServerPage = async ({ searchParams: _searchParams }: ServerPageProps) => {
   const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });
   const searchParams = await _searchParams;
   const token = Array.isArray(searchParams?.token) ? searchParams.token[0] : searchParams?.token;
-  const callbackUrl = token ? `/teams?token=${encodeURIComponent(token)}` : null;
+  const autoAccept = Array.isArray(searchParams?.autoAccept) ? searchParams.autoAccept[0] : searchParams?.autoAccept;
+  const callbackUrl = token ? `/teams?token=${encodeURIComponent(token)}${autoAccept ? `&autoAccept=${encodeURIComponent(autoAccept)}` : ''}` : null;
 
   if (!session) {
     redirect(callbackUrl ? `/auth/login?callbackUrl=${callbackUrl}` : "/auth/login");

apps/web/app/(use-page-wrapper)/(main-nav)/teams/server-page.tsx

@@ -2,11 +2,12 @@ import type { SearchParams } from "app/_types";
 import type { Session } from "next-auth";
 import { unstable_cache } from "next/cache";
 
-import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
 import { TeamsListing } from "@calcom/features/ee/teams/components/TeamsListing";
+import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { TeamRepository } from "@calcom/lib/server/repository/team";
 import { TeamService } from "@calcom/lib/server/service/teamService";
 import prisma from "@calcom/prisma";
+import { MembershipRole } from "@calcom/prisma/enums";
 
 import { TRPCError } from "@trpc/server";
 
@@ -32,14 +33,21 @@ export const ServerTeamsListing = async ({
   session: Session;
 }) => {
   const token = Array.isArray(searchParams?.token) ? searchParams.token[0] : searchParams?.token;
+  const autoAccept = Array.isArray(searchParams?.autoAccept) ? searchParams.autoAccept[0] : searchParams?.autoAccept;
   const userId = session.user.id;
+  let invitationAccepted = false;
 
   let teamNameFromInvite,
     errorMsgFromInvite = null;
 
   if (token) {
     try {
+       if (autoAccept === "true") {
+        await TeamService.acceptInvitationByToken(token, userId);
+        invitationAccepted = true;
+      } else {
         teamNameFromInvite = await TeamService.inviteMemberByToken(token, userId);
+      }
     } catch (e) {
       errorMsgFromInvite = "Error while fetching teams";
       if (e instanceof TRPCError) errorMsgFromInvite = e.message;
@@ -49,21 +57,30 @@ export const ServerTeamsListing = async ({
   const teams = await getCachedTeams(userId);
   const userProfile = session?.user?.profile;
   const orgId = userProfile?.organizationId ?? session?.user.org?.id;
-  const orgRole =
+
-    session?.user?.org?.role ??
+  const permissionCheckService = new PermissionCheckService();
-    userProfile?.organization?.members.find((m: { userId: number }) => m.userId === userId)?.role;
+  const canCreateTeam = orgId
-  const isOrgAdminOrOwner = checkAdminOrOwner(orgRole);
+    ? await permissionCheckService.checkPermission({
+        userId: session.user.id,
+        teamId: orgId,
+        permission: "team.create",
+        fallbackRoles: [MembershipRole.ADMIN, MembershipRole.OWNER],
+      })
+    : false;
 
   return {
     Main: (
       <TeamsListing
+        invitationAccepted={invitationAccepted}
         teams={teams}
         orgId={orgId ?? null}
-        isOrgAdmin={isOrgAdminOrOwner}
+        permissions={{
+          canCreateTeam: canCreateTeam,
+        }}
         teamNameFromInvite={teamNameFromInvite ?? null}
         errorMsgFromInvite={errorMsgFromInvite}
       />
     ),
-    CTA: !orgId || isOrgAdminOrOwner ? <TeamsCTA /> : null,
+    CTA: !orgId || canCreateTeam ? <TeamsCTA /> : null,
   };
 };

apps/web/app/(use-page-wrapper)/apps/routing-forms/forms/[[...pages]]/Forms.tsx

@@ -18,6 +18,7 @@ import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useHasPaidPlan } from "@calcom/lib/hooks/useHasPaidPlan";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
+import { MembershipRole } from "@calcom/prisma/enums";
 import { trpc } from "@calcom/trpc/react";
 import { ArrowButton } from "@calcom/ui/components/arrow-button";
 import { Badge } from "@calcom/ui/components/badge";
@@ -46,6 +47,10 @@ function NewFormButton({ setNewFormDialogState }: { setNewFormDialogState: SetNe
       createFunction={(teamId) => {
         setNewFormDialogState({ action: "new", target: teamId ? String(teamId) : "" });
       }}
+      withPermission={{
+        permission: "routingForm.create",
+        fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+      }}
     />
   );
 }

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/SettingsLayoutAppDirClient.tsx

@@ -101,10 +101,7 @@ const getTabs = (orgBranding: OrganizationBranding | null) => {
           name: "privacy",
           href: "/settings/organizations/privacy",
         },
-        {
+
-          name: "billing",
-          href: "/settings/organizations/billing",
-        },
         { name: "OAuth Clients", href: "/settings/organizations/platform/oauth-clients" },
         {
           name: "SSO",
@@ -173,17 +170,12 @@ const getTabs = (orgBranding: OrganizationBranding | null) => {
 // The following keys are assigned to admin only
 const adminRequiredKeys = ["admin"];
 const organizationRequiredKeys = ["organization"];
-const organizationAdminKeys = [
+const organizationAdminKeys = ["privacy", "OAuth Clients", "SSO", "directory_sync", "delegation_credential"];
-  "privacy",
-  "billing",
-  "OAuth Clients",
-  "SSO",
-  "directory_sync",
-  "delegation_credential",
-];
 
 export interface SettingsPermissions {
   canViewRoles?: boolean;
+  canViewOrganizationBilling?: boolean;
+  canUpdateOrganization?: boolean;
 }
 
 const useTabs = ({
@@ -199,7 +191,6 @@ const useTabs = ({
   const { data: user } = trpc.viewer.me.get.useQuery({ includePasswordAdded: true });
   const orgBranding = useOrgBranding();
   const isAdmin = session.data?.user.role === UserPermissionRole.ADMIN;
-  const isOrgAdminOrOwner = checkAdminOrOwner(orgBranding?.role);
 
   const processTabsMemod = useMemo(() => {
     const processedTabs = getTabs(orgBranding).map((tab) => {
@@ -212,10 +203,10 @@ const useTabs = ({
         };
       } else if (tab.href === "/settings/organizations") {
         const newArray = (tab?.children ?? []).filter(
-          (child) => isOrgAdminOrOwner || !organizationAdminKeys.includes(child.name)
+          (child) => permissions?.canUpdateOrganization || !organizationAdminKeys.includes(child.name)
         );
 
-        if (isOrgAdminOrOwner) {
+        if (permissions?.canUpdateOrganization) {
           newArray.splice(4, 0, {
             name: "attributes",
             href: "/settings/organizations/attributes",
@@ -232,13 +223,29 @@ const useTabs = ({
 
         // Add pbac menu item only if feature flag is enabled AND user has permission to view roles
         // This prevents showing the menu item when user has no organization permissions
-        if (isPbacEnabled && permissions?.canViewRoles) {
+        if (isPbacEnabled) {
+          if (permissions?.canViewRoles) {
             newArray.push({
               name: "roles_and_permissions",
               href: "/settings/organizations/roles",
             });
           }
 
+          if (permissions?.canViewOrganizationBilling) {
+            newArray.push({
+              name: "billing",
+              href: "/settings/organizations/billing",
+            });
+          }
+        } else {
+          if (permissions?.canUpdateOrganization) {
+            newArray.push({
+              name: "billing",
+              href: "/settings/organizations/billing",
+            });
+          }
+        }
+
         return {
           ...tab,
           children: newArray,
@@ -257,7 +264,7 @@ const useTabs = ({
         return { ...tab, children: filtered };
       } else if (tab.href === "/settings/developer") {
         const filtered = tab?.children?.filter(
-          (childTab) => isOrgAdminOrOwner || childTab.name !== "admin_api"
+          (childTab) => permissions?.canUpdateOrganization || childTab.name !== "admin_api"
         );
         return { ...tab, children: filtered };
       }
@@ -267,12 +274,12 @@ const useTabs = ({
     // check if name is in adminRequiredKeys
     return processedTabs.filter((tab) => {
       if (organizationRequiredKeys.includes(tab.name)) return !!orgBranding;
-      if (tab.name === "other_teams" && !isOrgAdminOrOwner) return false;
+      if (tab.name === "other_teams" && !permissions?.canUpdateOrganization) return false;
 
       if (isAdmin) return true;
       return !adminRequiredKeys.includes(tab.name);
     });
-  }, [isAdmin, orgBranding, isOrgAdminOrOwner, user, isDelegationCredentialEnabled]);
+  }, [isAdmin, orgBranding, user, isDelegationCredentialEnabled, isPbacEnabled, permissions]);
 
   return processTabsMemod;
 };
@@ -431,6 +438,7 @@ const TeamListCollapsible = ({ teamFeatures }: { teamFeatures?: Record<number, T
                       name={t("profile")}
                       href={`/settings/teams/${team.id}/profile`}
                       textClassNames="px-3 text-emphasis font-medium text-sm"
+                      className="me-5 h-7 w-auto !px-2"
                       disableChevron
                     />
                   )}
@@ -438,6 +446,7 @@ const TeamListCollapsible = ({ teamFeatures }: { teamFeatures?: Record<number, T
                     name={t("members")}
                     href={`/settings/teams/${team.id}/members`}
                     textClassNames="px-3 text-emphasis font-medium text-sm"
+                    className="me-5 h-7 w-auto !px-2"
                     disableChevron
                   />
                   {/* Show roles only for sub-teams with PBAC-enabled parent */}
@@ -458,6 +467,7 @@ const TeamListCollapsible = ({ teamFeatures }: { teamFeatures?: Record<number, T
                         name={t("appearance")}
                         href={`/settings/teams/${team.id}/appearance`}
                         textClassNames="px-3 text-emphasis font-medium text-sm"
+                        className="me-5 h-7 w-auto !px-2"
                         disableChevron
                       />
                       {/* Hide if there is a parent ID */}
@@ -467,6 +477,7 @@ const TeamListCollapsible = ({ teamFeatures }: { teamFeatures?: Record<number, T
                             name={t("billing")}
                             href={`/settings/teams/${team.id}/billing`}
                             textClassNames="px-3 text-emphasis font-medium text-sm"
+                            className="me-5 h-7 w-auto !px-2"
                             disableChevron
                           />
                         </>
@@ -475,6 +486,7 @@ const TeamListCollapsible = ({ teamFeatures }: { teamFeatures?: Record<number, T
                         name={t("settings")}
                         href={`/settings/teams/${team.id}/settings`}
                         textClassNames="px-3 text-emphasis font-medium text-sm"
+                        className="me-5 h-7 w-auto !px-2"
                         disableChevron
                       />
                     </>
@@ -548,8 +560,6 @@ const SettingsSidebarContainer = ({
     }
   }, [searchParams?.get("id"), otherTeams]);
 
-  const isOrgAdminOrOwner = checkAdminOrOwner(orgBranding?.role);
-
   return (
     <nav
       style={{ maxHeight: `calc(100vh - ${bannersHeight}px)`, top: `${bannersHeight}px` }}
@@ -626,16 +636,17 @@ const SettingsSidebarContainer = ({
                           as="p"
                           className="text-subtle truncate text-sm font-medium leading-5"
                           loadingClassName="ms-3">
-                          {t(isOrgAdminOrOwner ? "my_teams" : tab.name)}
+                          {t("my_teams")}
                         </Skeleton>
                       </div>
                     </Link>
                     <TeamListCollapsible teamFeatures={teamFeatures} />
-                    {(!orgBranding?.id || isOrgAdminOrOwner) && (
+                    {(!orgBranding?.id || permissions?.canUpdateOrganization) && (
                       <VerticalTabItem
                         name={t("add_a_team")}
                         href={`${WEBAPP_URL}/settings/teams/new`}
                         textClassNames="px-3 items-center mt-2 text-emphasis font-medium text-sm"
+                        className="me-5 h-7 w-auto !px-2"
                         icon="plus"
                         disableChevron
                       />
@@ -737,12 +748,14 @@ const SettingsSidebarContainer = ({
                                   name={t("profile")}
                                   href={`/settings/organizations/teams/other/${otherTeam.id}/profile`}
                                   textClassNames="px-3 text-emphasis font-medium text-sm"
+                                  className="me-5 h-7 w-auto !px-2"
                                   disableChevron
                                 />
                                 <VerticalTabItem
                                   name={t("members")}
                                   href={`/settings/organizations/teams/other/${otherTeam.id}/members`}
                                   textClassNames="px-3 text-emphasis font-medium text-sm"
+                                  className="me-5 h-7 w-auto !px-2"
                                   disableChevron
                                 />
                                 <>

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/billing/page.tsx

@@ -21,7 +21,7 @@ const Page = async () => {
     <SettingsHeader
       title={t("billing")}
       description={t("manage_billing_description")}
-      borderInShellHeader={true}>
+      borderInShellHeader={false}>
       <BillingView />
     </SettingsHeader>
   );

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/layout.tsx

@@ -3,11 +3,12 @@ import { cookies, headers } from "next/headers";
 import { redirect } from "next/navigation";
 import React from "react";
 
+import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import type { TeamFeatures } from "@calcom/features/flags/config";
 import { FeaturesRepository } from "@calcom/features/flags/features.repository";
 import { PermissionMapper } from "@calcom/features/pbac/domain/mappers/PermissionMapper";
-import { Resource, CrudAction } from "@calcom/features/pbac/domain/types/permission-registry";
+import { Resource, CrudAction, CustomAction } from "@calcom/features/pbac/domain/types/permission-registry";
 import { PermissionCheckService } from "@calcom/features/pbac/services/permission-check.service";
 import { prisma } from "@calcom/prisma";
 
@@ -45,13 +46,17 @@ export default async function SettingsLayoutAppDir(props: SettingsLayoutProps) {
 
   let teamFeatures: Record<number, TeamFeatures> | null = null;
   let canViewRoles = false;
+  let canViewOrganizationBilling = false;
+  let canUpdateOrganization = false;
   const orgId = session?.user?.profile?.organizationId ?? session?.user.org?.id;
 
   // For now we only grab organization features but it would be nice to fetch these on the server side for specific team feature flags
   if (orgId) {
-    const [features, rolePermissions] = await Promise.all([
+    const isOrgAdminOrOwner = checkAdminOrOwner(session.user.org?.role);
+    const [features, rolePermissions, organizationPermissions] = await Promise.all([
       getTeamFeatures(orgId),
       getCachedResourcePermissions(userId, orgId, Resource.Role),
+      getCachedResourcePermissions(userId, orgId, Resource.Organization),
     ]);
 
     if (features) {
@@ -62,6 +67,13 @@ export default async function SettingsLayoutAppDir(props: SettingsLayoutProps) {
       // Check if user has permission to read roles
       const roleActions = PermissionMapper.toActionMap(rolePermissions, Resource.Role);
       canViewRoles = roleActions[CrudAction.Read] ?? false;
+      const orgActions = PermissionMapper.toActionMap(organizationPermissions, Resource.Organization);
+      canViewOrganizationBilling = orgActions[CustomAction.ManageBilling] ?? isOrgAdminOrOwner;
+      canUpdateOrganization = orgActions[CrudAction.Update] ?? isOrgAdminOrOwner;
+    } else {
+      canViewRoles = false;
+      canViewOrganizationBilling = isOrgAdminOrOwner;
+      canUpdateOrganization = isOrgAdminOrOwner;
     }
   }
 
@@ -70,7 +82,7 @@ export default async function SettingsLayoutAppDir(props: SettingsLayoutProps) {
       <SettingsLayoutAppDirClient
         {...props}
         teamFeatures={teamFeatures ?? {}}
-        permissions={{ canViewRoles }}
+        permissions={{ canViewRoles, canViewOrganizationBilling, canUpdateOrganization }}
       />
     </>
   );

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/[id]/edit/page.tsx

@@ -1,8 +1,9 @@
 import { _generateMetadata } from "app/_utils";
 
 import OrgAttributesEditPage from "@calcom/ee/organizations/pages/settings/attributes/attributes-edit-view";
+import { MembershipRole } from "@calcom/prisma/enums";
 
-import { validateUserHasOrgAdmin } from "../../../../actions/validateUserHasOrgAdmin";
+import { validateUserHasOrgPerms } from "../../../../actions/validateUserHasOrgPerms";
 
 export const generateMetadata = async ({ params }: { params: Promise<{ id: string }> }) =>
   await _generateMetadata(
@@ -14,7 +15,10 @@ export const generateMetadata = async ({ params }: { params: Promise<{ id: strin
   );
 
 const OrgAttributesEditPageWrapper = async () => {
-  await validateUserHasOrgAdmin();
+  await validateUserHasOrgPerms({
+    permission: "organization.attributes.update",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
 
   return <OrgAttributesEditPage />;
 };

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/create/page.tsx

@@ -1,8 +1,9 @@
 import { _generateMetadata } from "app/_utils";
 
 import OrgAttributesCreatePage from "@calcom/ee/organizations/pages/settings/attributes/attributes-create-view";
+import { MembershipRole } from "@calcom/prisma/enums";
 
-import { validateUserHasOrgAdmin } from "../../../actions/validateUserHasOrgAdmin";
+import { validateUserHasOrgPerms } from "../../../actions/validateUserHasOrgPerms";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
@@ -14,7 +15,10 @@ export const generateMetadata = async () =>
   );
 
 const OrgAttributesCreatePageWrapper = async () => {
-  await validateUserHasOrgAdmin();
+  await validateUserHasOrgPerms({
+    permission: "organization.attributes.create",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
 
   return <OrgAttributesCreatePage />;
 };

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/attributes/page.tsx

@@ -7,7 +7,7 @@ import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permi
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { MembershipRole } from "@calcom/prisma/enums";
 
-import { validateUserHasOrgAdmin } from "../../actions/validateUserHasOrgAdmin";
+import { validateUserHasOrg } from "../../actions/validateUserHasOrg";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
@@ -20,7 +20,7 @@ export const generateMetadata = async () =>
 
 const Page = async () => {
   const t = await getTranslate();
-  const session = await validateUserHasOrgAdmin();
+  const session = await validateUserHasOrg();
 
   const { canRead, canEdit, canDelete, canCreate } = await getResourcePermissions({
     userId: session.user.id,

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/billing/page.tsx

@@ -2,10 +2,11 @@ import { _generateMetadata } from "app/_utils";
 import { getTranslate } from "app/_utils";
 
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
+import { MembershipRole } from "@calcom/prisma/enums";
 
 import BillingView from "~/settings/billing/billing-view";
 
-import { validateUserHasOrgAdmin } from "../../actions/validateUserHasOrgAdmin";
+import { validateUserHasOrgPerms } from "../../actions/validateUserHasOrgPerms";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
@@ -18,9 +19,11 @@ export const generateMetadata = async () =>
 
 const Page = async () => {
   const t = await getTranslate();
-  await validateUserHasOrgAdmin();
 
-  // TODO(SEAN): Add PBAC to this page in the next PR
+  await validateUserHasOrgPerms({
+    permission: "organization.manageBilling",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
 
   return (
     <SettingsHeader

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/delegation-credential/page.tsx

@@ -2,8 +2,9 @@ import { _generateMetadata, getTranslate } from "app/_utils";
 
 import DelegationCredentialList from "@calcom/features/ee/organizations/pages/settings/delegationCredential";
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
+import { MembershipRole } from "@calcom/prisma/enums";
 
-import { validateUserHasOrgAdmin } from "../../actions/validateUserHasOrgAdmin";
+import { validateUserHasOrgPerms } from "../../actions/validateUserHasOrgPerms";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
@@ -17,7 +18,10 @@ export const generateMetadata = async () =>
 const Page = async () => {
   const t = await getTranslate();
 
-  await validateUserHasOrgAdmin();
+  await validateUserHasOrgPerms({
+    permission: "organization.update",
+    fallbackRoles: [MembershipRole.OWNER, MembershipRole.ADMIN],
+  });
 
   return (
     <SettingsHeader

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/dsync/page.tsx

@@ -6,7 +6,7 @@ import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permi
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { MembershipRole } from "@calcom/prisma/enums";
 
-import { validateUserHasOrgAdmin } from "../../actions/validateUserHasOrgAdmin";
+import { validateUserHasOrg } from "../../actions/validateUserHasOrg";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
@@ -19,7 +19,7 @@ export const generateMetadata = async () =>
 
 const Page = async () => {
   const t = await getTranslate();
-  const session = await validateUserHasOrgAdmin();
+  const session = await validateUserHasOrg();
 
   const { canEdit } = await getResourcePermissions({
     userId: session.user.id,

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/layout.tsx

@@ -1,24 +1,4 @@
-import { cookies, headers } from "next/headers";
-import { redirect } from "next/navigation";
-
-import { checkAdminOrOwner } from "@calcom/features/auth/lib/checkAdminOrOwner";
-import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-
-import { buildLegacyRequest } from "@lib/buildLegacyCtx";
-
 const OrgAdminOnlyLayout = async ({ children }: { children: React.ReactNode }) => {
-  const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });
-  const userProfile = session?.user?.profile;
-  const userId = session?.user?.id;
-  const orgRole =
-    session?.user?.org?.role ??
-    userProfile?.organization?.members.find((m: { userId: number }) => m.userId === userId)?.role;
-  const isOrgAdminOrOwner = checkAdminOrOwner(orgRole);
-
-  if (!isOrgAdminOrOwner) {
-    return redirect("/settings/organizations/profile");
-  }
-
   return children;
 };
 

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/privacy/page.tsx

@@ -7,7 +7,7 @@ import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permi
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { MembershipRole } from "@calcom/prisma/enums";
 
-import { validateUserHasOrgAdmin } from "../../actions/validateUserHasOrgAdmin";
+import { validateUserHasOrg } from "../../actions/validateUserHasOrg";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
@@ -21,7 +21,7 @@ export const generateMetadata = async () =>
 const Page = async () => {
   const t = await getTranslate();
 
-  const session = await validateUserHasOrgAdmin();
+  const session = await validateUserHasOrg();
 
   if (!session?.user.id || !session?.user.profile?.organizationId || !session?.user.org) {
     return redirect("/settings/profile");

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/(org-admin-only)/sso/page.tsx

@@ -7,7 +7,7 @@ import { getResourcePermissions } from "@calcom/features/pbac/lib/resource-permi
 import SettingsHeader from "@calcom/features/settings/appDir/SettingsHeader";
 import { MembershipRole } from "@calcom/prisma/enums";
 
-import { validateUserHasOrgAdmin } from "../../actions/validateUserHasOrgAdmin";
+import { validateUserHasOrg } from "../../actions/validateUserHasOrg";
 
 export const generateMetadata = async () =>
   await _generateMetadata(
@@ -20,7 +20,7 @@ export const generateMetadata = async () =>
 
 const Page = async () => {
   const t = await getTranslate();
-  const session = await validateUserHasOrgAdmin();
+  const session = await validateUserHasOrg();
 
   if (!session?.user.id || !session?.user.profile?.organizationId || !session?.user.org) {
     return redirect("/settings/organizations/general");