chore: release v5.5.0

* fix: use raw query at InsightsBookingService

* feat: convert InsightsBookingService to use Prisma.sql raw queries

- Convert auth conditions from Prisma object notation to Prisma.sql
- Convert filter conditions from Prisma object notation to Prisma.sql
- Update return types from Prisma.BookingTimeStatusDenormalizedWhereInput to Prisma.Sql
- Fix type error in isOrgOwnerOrAdmin method
- Follow same pattern as InsightsRoutingService conversion

Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>

* feat: convert InsightsBookingService to use Prisma.sql raw queries

- Convert auth conditions from Prisma object notation to Prisma.sql
- Convert filter conditions from Prisma object notation to Prisma.sql
- Update return types from Prisma.BookingTimeStatusDenormalizedWhereInput to Prisma.Sql
- Fix type error in isOrgOwnerOrAdmin method
- Follow same pattern as InsightsRoutingService conversion

Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>

* fix: update InsightsBookingService integration tests for Prisma.sql format

- Replace Prisma object notation expectations with Prisma.sql template literals
- Add NOTHING_CONDITION constant for consistency with InsightsRoutingService
- Update all test cases to use direct Prisma.sql comparisons
- Use $queryRaw for actual database integration testing
- Follow same testing patterns as InsightsRoutingService

Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>

* fix: exclude intentionally skipped jobs from required CI check failure

- Remove 'skipped' from failure condition in pr.yml and all-checks.yml
- Allow E2E jobs to be skipped without failing the required check
- Only actual failures and cancelled jobs will cause required check to fail

Co-Authored-By: eunjae@cal.com <hey@eunjae.dev>

* fix tests

* Revert "fix: exclude intentionally skipped jobs from required CI check failure"

This reverts commit 6ff44fc9a8f14ad657f7bba7c2e454e192b66c8f.

* clean up tests

* address feedback

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>

.env.example

@@ -164,6 +164,7 @@ SENTRY_PROJECT=
 SENTRY_AUTH_TOKEN=
 # Used for capturing exceptions and logging messages
 NEXT_PUBLIC_SENTRY_DSN=
+NEXT_PUBLIC_SENTRY_DSN_CLIENT=
 SENTRY_DEBUG=
 SENTRY_MAX_SPANS=
 SENTRY_SAMPLE_RATE=

.github/CODEOWNERS

@@ -23,6 +23,7 @@
 /packages/lib/getUserAvailability.ts @calcom/Foundation
 /packages/lib/server/getLuckyUser.ts @calcom/Foundation
 /packages/lib/slots.ts @calcom/Foundation
+/packages/platform/atoms/**/*WebWrapper.tsx @calcom/Consumer
 /packages/platform/**/* @calcom/Platform @calcom/Foundation
 /packages/prisma/**/* @calcom/DBA
 /packages/trpc/server/routers/viewer/bookings/confirm.handler.ts @calcom/Foundation

.github/workflows/draft-release.yml

@@ -27,8 +27,24 @@ jobs:
 
       - name: Configure git
         run: |
-          git config --local user.email "github-actions@github.com"
-          git config --local user.name "GitHub Actions"
+          # Define authorized users and their emails using organization secret
+          # Expected format: JSON object with username -> email mapping
+          # Example: {"zomars": "zomars@cal.com", "peer": "peer@cal.com", "username3": "email3@cal.com"}
+          USER_EMAILS='${{ secrets.RELEASE_USER_EMAILS }}'
+          
+          # Extract email for the triggering user
+          USER_EMAIL=$(echo "$USER_EMAILS" | jq -r --arg user "${{ github.actor }}" '.[$user] // empty')
+          
+          # Fail if user is not authorized or not in mapping
+          if [ -z "$USER_EMAIL" ] || [ "$USER_EMAIL" = "null" ]; then
+            echo "Error: User '${{ github.actor }}' is not authorized to run the release workflow."
+            echo "Only authorized team members can trigger releases."
+            echo "Contact your administrator to be added to the authorized users list."
+            exit 1
+          fi
+          
+          git config --local user.email "$USER_EMAIL"
+          git config --local user.name "${{ github.actor }}"
 
       - uses: ./.github/actions/yarn-install
 

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

@@ -26,7 +26,7 @@ jobs:
   e2e:
     timeout-minutes: 20
     name: E2E API v2
-    runs-on: buildjet-8vcpu-ubuntu-2204
+    runs-on: buildjet-16vcpu-ubuntu-2204
     services:
       postgres:
         image: postgres:13

.github/workflows/i18n.yml

@@ -17,6 +17,10 @@ jobs:
       pull-requests: write
     steps:
       - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: 'npm'
       - uses: lingodotdev/lingo.dev@main
         env:
           GH_TOKEN: ${{ secrets.GH_ACCESS_TOKEN }}

.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, devops, billing, bookings, caldav, calendar-apps, ci, console, crm-apps, docs, documentation, emails, embeds, event-types, i18n, impersonation, manual-testing, ui, performance, ops-stack, organizations, public-api, routing-forms, seats, teams, webhooks, workflows, zapier"
+          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, teams, webhooks, workflows, zapier"
   apply-labels-from-issue:
     runs-on: ubuntu-latest
 

.github/workflows/pr.yml

@@ -46,7 +46,7 @@ jobs:
     permissions:
       pull-requests: read
     outputs:
-      run-e2e: ${{ steps.check-if-pr-has-label.outputs.run-e2e == 'true' && (github.event.action != 'labeled' || (github.event.action == 'labeled' && github.event.label.name == 'ready-for-e2e')) }}
+      run-e2e: ${{ steps.check-if-pr-has-label.outputs.run-e2e == 'true' && (github.event.action != 'labeled' || github.event.label.name == 'ready-for-e2e') }}
     steps:
       - name: Check if PR exists with ready-for-e2e label for this SHA
         id: check-if-pr-has-label

.yarn/versions/0de8a967.yml

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

.yarn/versions/34be8820.yml

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

.yarn/versions/74629f39.yml

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

.yarn/versions/95b6ac81.yml

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

.yarn/versions/98703c4b.yml

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

.yarn/versions/c08cbab0.yml

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

.yarn/versions/e5255dda.yml

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

.yarn/versions/fc9f64e8.yml

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

README.md

@@ -488,13 +488,8 @@ Don't code but still want to contribute? Join our [Discussions](https://github.c
 - Set CSP_POLICY="non-strict" env variable, which enables [Strict CSP](https://web.dev/strict-csp/) except for unsafe-inline in style-src . If you have some custom changes in your instance, you might have to make some code change to make your instance CSP compatible. Right now it enables strict CSP only on login page and on other SSR pages it is enabled in Report only mode to detect possible issues. On, SSG pages it is still not supported.
 
 ## Single Org Mode
-If you want to have booker.yourcompany.com to be the domain used for both dashboard(e.g. https://booker.yourcompany.com/event-types) and booking pages(e.g. https://booker.yourcompany.com/john.joe/15min).
-- Set the `NEXT_PUBLIC_SINGLE_ORG_SLUG` environment variable to the slug of the organization you want to use. `NEXT_PUBLIC_SINGLE_ORG_SLUG=booker`
-- Set the `NEXT_PUBLIC_WEBAPP_URL` environment variable to the URL of the Cal.com self-hosted instance e.g. `NEXT_PUBLIC_WEBAPP_URL=https://booker.yourcompany.com`.
-- Set the `NEXT_PUBLIC_WEBSITE_URL` environment variable to the URL of the Cal.com self-hosted instance e.g. `NEXT_PUBLIC_WEBSITE_URL=https://booker.yourcompany.com`.
-- Set the `NEXTAUTH_URL` environment variable to the URL of the Cal.com self-hosted instance e.g. `NEXTAUTH_URL=https://booker.yourcompany.com`.
+Refer to docs [here](./docs/self-hosting/guides/organization/single-organization-setup) for a detailed documentation with screenshots.
 
-Note: It causes root to serve the dashboard and not the organization profile page which shows all bookable users in the organization.
 
 ## Integrations
 

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

@@ -23,6 +23,7 @@ afterEach(() => {
 
 const mockDeploymentRepository: IDeploymentRepository = {
   getLicenseKeyWithId: vi.fn().mockResolvedValue("mockLicenseKey"), // Mocked return value
+  getSignatureToken: vi.fn().mockResolvedValue("mockSignatureToken"),
 };
 
 // TODO: Fix the skip condition for this test suite

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

@@ -43,6 +43,7 @@ enum locales {
   SR = "sr",
   SV = "sv",
   VI = "vi",
+  BN = "bn",
 }
 enum theme {
   DARK = "dark",

apps/api/v1/next-env.d.ts

@@ -2,4 +2,4 @@
 /// <reference types="next/image-types/global" />
 
 // NOTE: This file should not be edited
-// see https://nextjs.org/docs/basic-features/typescript for more information.
+// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

apps/api/v1/next.config.js

@@ -5,9 +5,6 @@ const plugins = [withAxiom];
 
 /** @type {import("next").NextConfig} */
 const nextConfig = {
-  experimental: {
-    instrumentationHook: true,
-  },
   transpilePackages: [
     "@calcom/app-store",
     "@calcom/dayjs",

apps/api/v1/package.json

@@ -33,7 +33,7 @@
     "@sentry/nextjs": "^9.15.0",
     "bcryptjs": "^2.4.3",
     "memory-cache": "^0.2.0",
-    "next": "^13.5.9",
+    "next": "^15.3.0",
     "next-api-middleware": "^1.0.1",
     "next-axiom": "^0.17.0",
     "next-swagger-doc": "^0.3.6",

apps/api/v1/pages/api/bookings/_post.ts

@@ -222,6 +222,13 @@ async function handler(req: NextApiRequest) {
   };
   if (isSystemWideAdmin) userId = req.body.userId || userId;
 
+  if (req.body.eventTypeId !== undefined && typeof req.body.eventTypeId !== "number") {
+    throw new HttpError({
+      statusCode: 400,
+      message: "Bad request, eventTypeId must be a number",
+    });
+  }
+
   if (isOrganizationOwnerOrAdmin) {
     const accessibleUsersIds = await getAccessibleUsers({
       adminUserId: userId,

apps/api/v1/pages/api/connected-calendars/_get.ts

@@ -105,7 +105,9 @@ async function getHandler(req: NextApiRequest) {
 
   const userIds = req.query.userId ? extractUserIdsFromQuery(req) : [userId];
 
-  const usersWithCalendars = await UserRepository.findManyByIdsIncludeDestinationAndSelectedCalendars({
+  const usersWithCalendars = await new UserRepository(
+    prisma
+  ).findManyByIdsIncludeDestinationAndSelectedCalendars({
     ids: userIds,
   });
 

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

@@ -4,11 +4,11 @@ import type { NextApiRequest, NextApiResponse } from "next";
 
 import dayjs from "@calcom/dayjs";
 import { isSupportedTimeZone } from "@calcom/lib/dayjs";
+import { getAvailableSlotsService } from "@calcom/lib/di/containers/available-slots";
 import { HttpError } from "@calcom/lib/http-error";
 import { defaultResponder } from "@calcom/lib/server/defaultResponder";
 import { createContext } from "@calcom/trpc/server/createContext";
 import { getScheduleSchema } from "@calcom/trpc/server/routers/viewer/slots/types";
-import { getAvailableSlots } from "@calcom/trpc/server/routers/viewer/slots/util";
 
 import { TRPCError } from "@trpc/server";
 import { getHTTPStatusCodeFromError } from "@trpc/server/http";
@@ -27,7 +27,13 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
     }
     const input = getScheduleSchema.parse({ usernameList: slugs, isTeamEvent: parsedIsTeamEvent, ...rest });
     const timeZoneSupported = input.timeZone ? isSupportedTimeZone(input.timeZone) : false;
-    const availableSlots = await getAvailableSlots({ ctx: await createContext({ req, res }), input });
+
+    const availableSlotsService = getAvailableSlotsService();
+    const availableSlots = await availableSlotsService.getAvailableSlots({
+      ctx: await createContext({ req, res }),
+      input,
+    });
+
     const slotsInProvidedTimeZone = timeZoneSupported
       ? Object.keys(availableSlots.slots).reduce(
           (acc: Record<string, { time: string; attendees?: number; bookingUid?: string }[]>, date) => {

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

@@ -25,6 +25,44 @@ vi.mock("@calcom/lib/server/i18n", () => {
   };
 });
 
+describe("POST /api/bookings - eventTypeId validation", () => {
+  test("String eventTypeId should return 400", async () => {
+    const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+      method: "POST",
+      body: {
+        eventTypeId: "invalid-string",
+      },
+    });
+
+    await handler(req, res);
+
+    expect(res._getStatusCode()).toBe(400);
+    expect(JSON.parse(res._getData())).toEqual(
+      expect.objectContaining({
+        message: "Bad request, eventTypeId must be a number",
+      })
+    );
+  });
+
+  test("Number eventTypeId should not trigger validation error", async () => {
+    const { req, res } = createMocks<CustomNextApiRequest, CustomNextApiResponse>({
+      method: "POST",
+      body: {
+        eventTypeId: 123,
+      },
+    });
+
+    await handler(req, res);
+
+    const statusCode = res._getStatusCode();
+    const responseData = JSON.parse(res._getData());
+
+    if (statusCode === 400) {
+      expect(responseData.message).not.toBe("Bad request, eventTypeId must be a number");
+    }
+  });
+});
+
 describe.skipIf(true)("POST /api/bookings", () => {
   describe("Errors", () => {
     test("Missing required data", async () => {

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

@@ -93,6 +93,8 @@ describe("POST /api/selected-calendars", () => {
         watchAttempts: 0,
         maxAttempts: 3,
         unwatchAttempts: 0,
+        createdAt: new Date(),
+        updatedAt: new Date(),
       });
 
       await handler(req, res);
@@ -136,6 +138,8 @@ describe("POST /api/selected-calendars", () => {
         watchAttempts: 0,
         maxAttempts: 3,
         unwatchAttempts: 0,
+        createdAt: new Date(),
+        updatedAt: new Date(),
       });
 
       await handler(req, res);

apps/api/v2/package.json

@@ -38,8 +38,7 @@
     "@axiomhq/winston": "^1.2.0",
     "@calcom/platform-constants": "*",
     "@calcom/platform-enums": "*",
-    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.231",
-    "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
+    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.258",
     "@calcom/platform-types": "*",
     "@calcom/platform-utils": "*",
     "@calcom/prisma": "*",

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

@@ -232,6 +232,15 @@ export class BookingsController_2024_04_15 {
     }
 
     if (bookingUid) {
+      const { bookingInfo } = await getBookingInfo(bookingUid);
+      if (!bookingInfo) {
+        throw new NotFoundException(`Booking with UID=${bookingUid} does not exist.`);
+      }
+      if (bookingInfo.status === "CANCELLED") {
+        throw new BadRequestException(
+          `Can't cancel booking with uid=${bookingUid} because it has been cancelled already. Please provide uid of a booking that is not cancelled.`
+        );
+      }
       try {
         req.body.uid = bookingUid;
         const bookingRequest = await this.createNextApiBookingRequest(req, oAuthClientId, undefined, isEmbed);

apps/api/v2/src/ee/bookings/2024-08-13/controllers/bookings.controller.ts

@@ -443,7 +443,7 @@ export class BookingsController_2024_08_13 {
   @Permissions([BOOKING_READ])
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
   @ApiOperation({
-    summary: "Get 'Booking References' for a booking",
+    summary: "Get booking references",
   })
   @HttpCode(HttpStatus.OK)
   async getBookingReferences(

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

@@ -1425,8 +1425,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
             // @ts-ignore
             const data: BookingOutput_2024_08_13 = responseBody.data;
             expect(data.status).toEqual("cancelled");
-
-            createdBooking = data;
+            expect(data.rescheduledToUid).toEqual(rescheduledBooking.uid);
           });
       });
 
@@ -2553,6 +2552,59 @@ describe("Bookings Endpoints 2024-08-13", () => {
       });
     });
 
+    describe("cant't cancel already cancelled booking", () => {
+      it("should not be able to cancel alraedy cancelled booking", async () => {
+        const cancelledBooking = await bookingsRepositoryFixture.create({
+          status: "CANCELLED",
+          user: {
+            connect: {
+              id: user.id,
+            },
+          },
+          startTime: new Date(Date.UTC(2050, 0, 8, 13, 0, 0)),
+          endTime: new Date(Date.UTC(2050, 0, 8, 14, 0, 0)),
+          title: "peer coding lets goo",
+          uid: `cancelled-booking-${randomString()}`,
+          eventType: {
+            connect: {
+              id: eventTypeId,
+            },
+          },
+          location: "integrations:daily",
+          customInputs: {},
+          metadata: {},
+          responses: {
+            name: "Oldie",
+            email: "oldie@gmail.com",
+          },
+          attendees: {
+            create: {
+              email: "oldie@gmail.com",
+              name: "Oldie",
+              locale: "lv",
+              timeZone: "Europe/Rome",
+            },
+          },
+        });
+
+        const body: CancelBookingInput_2024_08_13 = {
+          cancellationReason: "Going on a vacation",
+        };
+
+        const response = await request(app.getHttpServer())
+          .post(`/v2/bookings/${cancelledBooking.uid}/cancel`)
+          .send(body)
+          .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+          .set(X_CAL_CLIENT_ID, oAuthClient.id)
+          .expect(400);
+
+        expect(response.body.error.message).toEqual(
+          `Can't cancel booking with uid=${cancelledBooking.uid} because it has been cancelled already. Please provide uid of a booking that is not cancelled.`
+        );
+        await bookingsRepositoryFixture.deleteById(cancelledBooking.id);
+      });
+    });
+
     describe("calendar events", () => {
       beforeEach(() => {
         jest.restoreAllMocks();

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

@@ -596,9 +596,9 @@ export class BookingsService_2024_08_13 {
       } else if (isRecurring && isSeated) {
         formattedBookings.push(this.outputService.getOutputRecurringSeatedBooking(formatted));
       } else if (isSeated) {
-        formattedBookings.push(this.outputService.getOutputSeatedBooking(formatted));
+        formattedBookings.push(await this.outputService.getOutputSeatedBooking(formatted));
       } else {
-        formattedBookings.push(this.outputService.getOutputBooking(formatted));
+        formattedBookings.push(await this.outputService.getOutputBooking(formatted));
       }
     }
 

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

@@ -186,6 +186,31 @@ export class InputBookingsService_2024_08_13 {
         guests,
         location,
       },
+      ...this.getRoutingFormData(inputBooking.routing),
+    };
+  }
+
+  private getRoutingFormData(
+    routing:
+      | {
+          teamMemberIds?: number[];
+          responseId?: number;
+          teamMemberEmail?: string;
+          skipContactOwner?: boolean;
+          crmAppSlug?: string;
+          crmOwnerRecordType?: string;
+        }
+      | undefined
+  ) {
+    if (!routing) return null;
+
+    return {
+      routedTeamMemberIds: routing.teamMemberIds,
+      routingFormResponseId: routing.responseId,
+      teamMemberEmail: routing.teamMemberEmail,
+      skipContactOwner: routing.skipContactOwner,
+      crmAppSlug: routing.crmAppSlug,
+      crmOwnerRecordType: routing.crmOwnerRecordType,
     };
   }
 
@@ -453,6 +478,7 @@ export class InputBookingsService_2024_08_13 {
           location,
         },
         schedulingType: eventType.schedulingType,
+        ...this.getRoutingFormData(inputBooking.routing),
       });
 
       switch (timeBetween) {
@@ -711,6 +737,12 @@ export class InputBookingsService_2024_08_13 {
       throw new NotFoundException(`Booking with uid=${bookingUid} not found`);
     }
 
+    if (booking.status === "CANCELLED") {
+      throw new BadRequestException(
+        `Can't cancel booking with uid=${bookingUid} because it has been cancelled already. Please provide uid of a booking that is not cancelled.`
+      );
+    }
+
     const oAuthClientParams = booking.eventTypeId
       ? await this.platformBookingsService.getOAuthClientParams(booking.eventTypeId)
       : undefined;

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

@@ -90,7 +90,7 @@ type DatabaseMetadata = z.infer<typeof bookingMetadataSchema>;
 export class OutputBookingsService_2024_08_13 {
   constructor(private readonly bookingsRepository: BookingsRepository_2024_08_13) {}
 
-  getOutputBooking(databaseBooking: DatabaseBooking) {
+  async getOutputBooking(databaseBooking: DatabaseBooking) {
     const dateStart = DateTime.fromISO(databaseBooking.startTime.toISOString());
     const dateEnd = DateTime.fromISO(databaseBooking.endTime.toISOString());
     const duration = dateEnd.diff(dateStart, "minutes").minutes;
@@ -101,6 +101,9 @@ export class OutputBookingsService_2024_08_13 {
     );
     const metadata = safeParse(bookingMetadataSchema, databaseBooking.metadata, defaultBookingMetadata);
     const location = metadata?.videoCallUrl || databaseBooking.location;
+    const rescheduledToUid = databaseBooking.rescheduled
+      ? await this.getRescheduledToUid(databaseBooking.uid)
+      : undefined;
 
     const booking = {
       id: databaseBooking.id,
@@ -109,8 +112,9 @@ export class OutputBookingsService_2024_08_13 {
       description: databaseBooking.description,
       hosts: [this.getHost(databaseBooking.user)],
       status: databaseBooking.status.toLowerCase(),
-      cancellationReason: databaseBooking.cancellationReason || undefined,
-      cancelledByEmail: databaseBooking.cancelledBy || undefined,
+      cancellationReason:
+        databaseBooking.status === "CANCELLED" ? databaseBooking.cancellationReason : undefined,
+      cancelledByEmail: databaseBooking.status === "CANCELLED" ? databaseBooking.cancelledBy : undefined,
       reschedulingReason: bookingResponses?.rescheduledReason,
       rescheduledByEmail: databaseBooking.rescheduledBy || undefined,
       rescheduledFromUid: databaseBooking.fromReschedule || undefined,
@@ -137,6 +141,7 @@ export class OutputBookingsService_2024_08_13 {
       updatedAt: databaseBooking.updatedAt,
       rating: databaseBooking.rating,
       icsUid: databaseBooking.iCalUID,
+      rescheduledToUid,
     };
 
     const bookingTransformed = plainToClass(BookingOutput_2024_08_13, booking, { strategy: "excludeAll" });
@@ -146,6 +151,11 @@ export class OutputBookingsService_2024_08_13 {
     return bookingTransformed;
   }
 
+  async getRescheduledToUid(bookingUid: string) {
+    const rescheduledTo = await this.bookingsRepository.getByFromReschedule(bookingUid);
+    return rescheduledTo?.uid;
+  }
+
   getUserDefinedMetadata(databaseMetadata: DatabaseMetadata) {
     if (databaseMetadata === null) return {};
 
@@ -204,8 +214,9 @@ export class OutputBookingsService_2024_08_13 {
       description: databaseBooking.description,
       hosts: [this.getHost(databaseBooking.user)],
       status: databaseBooking.status.toLowerCase(),
-      cancellationReason: databaseBooking.cancellationReason || undefined,
-      cancelledByEmail: databaseBooking.cancelledBy || undefined,
+      cancellationReason:
+        databaseBooking.status === "CANCELLED" ? databaseBooking.cancellationReason : undefined,
+      cancelledByEmail: databaseBooking.status === "CANCELLED" ? databaseBooking.cancelledBy : undefined,
       reschedulingReason: bookingResponses?.rescheduledReason,
       rescheduledByEmail: databaseBooking.rescheduledBy || undefined,
       rescheduledFromUid: databaseBooking.fromReschedule || undefined,
@@ -244,20 +255,23 @@ export class OutputBookingsService_2024_08_13 {
     return bookingTransformed;
   }
 
-  getOutputCreateSeatedBooking(
+  async getOutputCreateSeatedBooking(
     databaseBooking: DatabaseBooking,
     seatUid: string
-  ): CreateSeatedBookingOutput_2024_08_13 {
-    const getSeatedBookingOutput = this.getOutputSeatedBooking(databaseBooking);
+  ): Promise<CreateSeatedBookingOutput_2024_08_13> {
+    const getSeatedBookingOutput = await this.getOutputSeatedBooking(databaseBooking);
     return { ...getSeatedBookingOutput, seatUid };
   }
 
-  getOutputSeatedBooking(databaseBooking: DatabaseBooking) {
+  async getOutputSeatedBooking(databaseBooking: DatabaseBooking) {
     const dateStart = DateTime.fromISO(databaseBooking.startTime.toISOString());
     const dateEnd = DateTime.fromISO(databaseBooking.endTime.toISOString());
     const duration = dateEnd.diff(dateStart, "minutes").minutes;
     const metadata = safeParse(bookingMetadataSchema, databaseBooking.metadata, defaultBookingMetadata);
     const location = metadata?.videoCallUrl || databaseBooking.location;
+    const rescheduledToUid = databaseBooking.rescheduled
+      ? await this.getRescheduledToUid(databaseBooking.uid)
+      : undefined;
 
     const booking = {
       id: databaseBooking.id,
@@ -266,7 +280,8 @@ export class OutputBookingsService_2024_08_13 {
       description: databaseBooking.description,
       hosts: [this.getHost(databaseBooking.user)],
       status: databaseBooking.status.toLowerCase(),
-      cancellationReason: databaseBooking.cancellationReason || undefined,
+      cancellationReason:
+        databaseBooking.status === "CANCELLED" ? databaseBooking.cancellationReason : undefined,
       rescheduledFromUid: databaseBooking.fromReschedule || undefined,
       start: databaseBooking.startTime,
       end: databaseBooking.endTime,
@@ -283,6 +298,7 @@ export class OutputBookingsService_2024_08_13 {
       updatedAt: databaseBooking.updatedAt,
       rating: databaseBooking.rating,
       icsUid: databaseBooking.iCalUID,
+      rescheduledToUid,
     };
 
     const parsed = plainToClass(GetSeatedBookingOutput_2024_08_13, booking, { strategy: "excludeAll" });
@@ -375,7 +391,8 @@ export class OutputBookingsService_2024_08_13 {
       description: databaseBooking.description,
       hosts: [this.getHost(databaseBooking.user)],
       status: databaseBooking.status.toLowerCase(),
-      cancellationReason: databaseBooking.cancellationReason || undefined,
+      cancellationReason:
+        databaseBooking.status === "CANCELLED" ? databaseBooking.cancellationReason : undefined,
       rescheduledFromUid: databaseBooking.fromReschedule || undefined,
       start: databaseBooking.startTime,
       end: databaseBooking.endTime,

apps/api/v2/src/ee/calendars/calendars.repository.ts

@@ -1,9 +1,9 @@
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
-import { Prisma } from "@prisma/client";
+import type { Prisma } from "@prisma/client";
 
-const credentialForCalendarRepositorySelect = Prisma.validator<Prisma.CredentialSelect>()({
+const credentialForCalendarRepositorySelect = {
   id: true,
   appId: true,
   type: true,
@@ -16,7 +16,7 @@ const credentialForCalendarRepositorySelect = Prisma.validator<Prisma.Credential
   teamId: true,
   key: true,
   invalid: true,
-});
+} satisfies Prisma.CredentialSelect;
 
 @Injectable()
 export class CalendarsRepository {

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

@@ -1,6 +1,7 @@
 import { bootstrap } from "@/app";
 import { AppModule } from "@/app.module";
 import { CreateIcsFeedOutput, CreateIcsFeedOutputResponseDto } from "@/ee/calendars/input/create-ics.output";
+import { ConnectedCalendarsData } from "@/ee/calendars/outputs/connected-calendars.output";
 import { DeletedCalendarCredentialsOutputResponseDto } from "@/ee/calendars/outputs/delete-calendar-credentials.output";
 import { CalendarsService } from "@/ee/calendars/services/calendars.service";
 import { HttpExceptionFilter } from "@/filters/http-exception.filter";
@@ -30,7 +31,7 @@ import {
   GOOGLE_CALENDAR_ID,
 } from "@calcom/platform-constants";
 import { OFFICE_365_CALENDAR_ID, OFFICE_365_CALENDAR_TYPE } from "@calcom/platform-constants";
-import { ICS_CALENDAR } from "@calcom/platform-constants/apps";
+import { ICS_CALENDAR, ICS_CALENDAR_TYPE } from "@calcom/platform-constants/apps";
 import { IcsFeedCalendarService } from "@calcom/platform-libraries/app-store";
 
 const CLIENT_REDIRECT_URI = "http://localhost:5555";
@@ -247,6 +248,35 @@ describe("Platform Calendars Endpoints", () => {
       .expect(200);
   });
 
+  it(`/GET/v2/calendars with access token`, async () => {
+    const response = await request(app.getHttpServer())
+      .get(`/v2/calendars`)
+      .set("Authorization", `Bearer ${accessTokenSecret}`)
+      .set("Origin", CLIENT_REDIRECT_URI)
+      .expect(200);
+
+    const data: ConnectedCalendarsData = response.body.data;
+    expect(data.connectedCalendars).toBeDefined();
+    expect(data.connectedCalendars).toHaveLength(3);
+
+    const googleConnectedCalendar = data.connectedCalendars.find(
+      (calendar) => calendar.integration.type === GOOGLE_CALENDAR_TYPE
+    );
+    const office365ConnectedCalendar = data.connectedCalendars.find(
+      (calendar) => calendar.integration.type === OFFICE_365_CALENDAR_TYPE
+    );
+    const icsConnectedCalendar = data.connectedCalendars.find(
+      (calendar) => calendar.integration.type === ICS_CALENDAR_TYPE
+    );
+
+    expect(googleConnectedCalendar).toBeDefined();
+    expect(office365ConnectedCalendar).toBeDefined();
+    expect(icsConnectedCalendar).toBeDefined();
+
+    expect(data.destinationCalendar).toBeDefined();
+    expect(data.destinationCalendar.integration).toEqual(GOOGLE_CALENDAR_TYPE);
+  });
+
   it.skip(`/POST/v2/calendars/${OFFICE_365_CALENDAR}/disconnect: it should respond with a 201 returning back the user deleted calendar credentials`, async () => {
     const body = {
       id: 10,

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

@@ -157,7 +157,7 @@ export class CalendarsController {
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
   @Get("/:calendar/connect")
   @HttpCode(HttpStatus.OK)
-  @ApiOperation({ summary: "Get oAuth connect URL" })
+  @ApiOperation({ summary: "Get OAuth connect URL" })
   @ApiQuery({
     name: "redir",
     required: false,

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

@@ -14,7 +14,7 @@ import {
   NotFoundException,
 } from "@nestjs/common";
 import { User } from "@prisma/client";
-import { Prisma } from "@prisma/client";
+import type { Prisma } from "@prisma/client";
 import { DateTime } from "luxon";
 import { z } from "zod";
 

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

@@ -18,6 +18,7 @@ import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
 import { Permissions } from "@/modules/auth/decorators/permissions/permissions.decorator";
 import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
+import { OrganizationsRepository } from "@/modules/organizations/index/organizations.repository";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import {
@@ -33,13 +34,19 @@ import {
   HttpStatus,
   Delete,
   Query,
+  Headers,
   InternalServerErrorException,
   ParseIntPipe,
 } from "@nestjs/common";
 import { ApiExcludeController as DocsExcludeController } from "@nestjs/swagger";
 
-import { EVENT_TYPE_READ, EVENT_TYPE_WRITE, SUCCESS_STATUS } from "@calcom/platform-constants";
-import { getPublicEvent, getEventTypesByViewer } from "@calcom/platform-libraries-0.0.2";
+import {
+  EVENT_TYPE_READ,
+  EVENT_TYPE_WRITE,
+  SUCCESS_STATUS,
+  X_CAL_CLIENT_ID,
+} from "@calcom/platform-constants";
+import { getPublicEvent, getEventTypesByViewer } from "@calcom/platform-libraries/event-types";
 import { PrismaClient } from "@calcom/prisma";
 
 @Controller({
@@ -51,7 +58,8 @@ import { PrismaClient } from "@calcom/prisma";
 export class EventTypesController_2024_04_15 {
   constructor(
     private readonly eventTypesService: EventTypesService_2024_04_15,
-    private readonly prismaReadService: PrismaReadService
+    private readonly prismaReadService: PrismaReadService,
+    private readonly organizationsRepository: OrganizationsRepository
   ) {}
 
   @Post("/")
@@ -109,19 +117,32 @@ export class EventTypesController_2024_04_15 {
   async getPublicEventType(
     @Param("username") username: string,
     @Param("eventSlug") eventSlug: string,
-    @Query() queryParams: GetPublicEventTypeQueryParams_2024_04_15
+    @Query() queryParams: GetPublicEventTypeQueryParams_2024_04_15,
+    @Headers(X_CAL_CLIENT_ID) clientId?: string
   ): Promise<GetEventTypePublicOutput> {
     try {
+      let orgSlug = queryParams.org;
+
+      if (clientId && !orgSlug && username.includes(`-${clientId}`)) {
+        const org = await this.organizationsRepository
+          .findTeamIdAndSlugFromClientId(clientId)
+          .catch(() => null);
+        if (org) {
+          orgSlug = org.slug;
+        }
+      }
+
       const event = await getPublicEvent(
         username.toLowerCase(),
         eventSlug,
         queryParams.isTeamEvent,
-        queryParams.org || null,
+        orgSlug ?? null,
         this.prismaReadService.prisma as unknown as PrismaClient,
         // We should be fine allowing unpublished orgs events to be servable through platform because Platform access is behind license
         // If there is ever a need to restrict this, we can introduce a new query param `fromRedirectOfNonOrgLink`
         true
       );
+
       return {
         data: event,
         status: SUCCESS_STATUS,

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

@@ -2,6 +2,7 @@ import { EventTypesController_2024_04_15 } from "@/ee/event-types/event-types_20
 import { EventTypesRepository_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/event-types.repository";
 import { EventTypesService_2024_04_15 } from "@/ee/event-types/event-types_2024_04_15/services/event-types.service";
 import { MembershipsModule } from "@/modules/memberships/memberships.module";
+import { OrganizationsModule } from "@/modules/organizations/organizations.module";
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { SelectedCalendarsModule } from "@/modules/selected-calendars/selected-calendars.module";
 import { TokensModule } from "@/modules/tokens/tokens.module";
@@ -9,7 +10,14 @@ import { UsersModule } from "@/modules/users/users.module";
 import { Module } from "@nestjs/common";
 
 @Module({
-  imports: [PrismaModule, MembershipsModule, TokensModule, UsersModule, SelectedCalendarsModule],
+  imports: [
+    PrismaModule,
+    MembershipsModule,
+    TokensModule,
+    UsersModule,
+    SelectedCalendarsModule,
+    OrganizationsModule,
+  ],
   providers: [EventTypesRepository_2024_04_15, EventTypesService_2024_04_15],
   controllers: [EventTypesController_2024_04_15],
   exports: [EventTypesService_2024_04_15, EventTypesRepository_2024_04_15],

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

@@ -1721,7 +1721,7 @@ describe("Event types Endpoints", () => {
         description: "undefined booking fields",
         length: 40,
         hidden: false,
-        slug: "undefined-booking-fields",
+        slug: `undefined-booking-fields-${randomString()}`,
         locations: [],
         schedulingType: SchedulingType.ROUND_ROBIN,
       };
@@ -1751,6 +1751,14 @@ describe("Event types Endpoints", () => {
               disableOnPrefill: false,
               hidden: false,
             },
+            {
+              disableOnPrefill: false,
+              hidden: true,
+              isDefault: true,
+              required: false,
+              slug: "attendeePhoneNumber",
+              type: "phone",
+            },
             {
               isDefault: true,
               type: "radioInput",

apps/api/v2/src/ee/schedules/schedules_2024_04_15/controllers/schedules.controller.ts

@@ -46,11 +46,10 @@ export class SchedulesController_2024_04_15 {
     @Body() bodySchedule: CreateScheduleInput_2024_04_15
   ): Promise<CreateScheduleOutput_2024_04_15> {
     const schedule = await this.schedulesService.createUserSchedule(user.id, bodySchedule);
-    const scheduleFormatted = await this.schedulesService.formatScheduleForAtom(user, schedule);
 
     return {
       status: SUCCESS_STATUS,
-      data: scheduleFormatted,
+      data: schedule,
     };
   }
 
@@ -60,13 +59,10 @@ export class SchedulesController_2024_04_15 {
     @GetUser() user: UserWithProfile
   ): Promise<GetDefaultScheduleOutput_2024_04_15 | null> {
     const schedule = await this.schedulesService.getUserScheduleDefault(user.id);
-    const scheduleFormatted = schedule
-      ? await this.schedulesService.formatScheduleForAtom(user, schedule)
-      : null;
 
     return {
       status: SUCCESS_STATUS,
-      data: scheduleFormatted,
+      data: schedule,
     };
   }
 
@@ -77,23 +73,25 @@ export class SchedulesController_2024_04_15 {
     @Param("scheduleId") scheduleId: number
   ): Promise<GetScheduleOutput_2024_04_15> {
     const schedule = await this.schedulesService.getUserSchedule(user.id, scheduleId);
-    const scheduleFormatted = await this.schedulesService.formatScheduleForAtom(user, schedule);
 
     return {
       status: SUCCESS_STATUS,
-      data: scheduleFormatted,
+      data: schedule,
     };
   }
 
   @Get("/")
   @Permissions([SCHEDULE_READ])
   async getSchedules(@GetUser() user: UserWithProfile): Promise<GetSchedulesOutput_2024_04_15> {
-    const schedules = await this.schedulesService.getUserSchedules(user.id);
-    const schedulesFormatted = await this.schedulesService.formatSchedulesForAtom(user, schedules);
+    const schedules = await this.schedulesService.getUserSchedules(
+      user.id,
+      user.timeZone,
+      user.defaultScheduleId
+    );
 
     return {
       status: SUCCESS_STATUS,
-      data: schedulesFormatted,
+      data: schedules,
     };
   }
 

apps/api/v2/src/ee/schedules/schedules_2024_04_15/schedules.repository.ts

@@ -3,7 +3,7 @@ import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
-import { Prisma } from "@prisma/client";
+import type { Prisma } from "@prisma/client";
 
 @Injectable()
 export class SchedulesRepository_2024_04_15 {

apps/api/v2/src/ee/schedules/schedules_2024_04_15/services/schedules.service.ts

@@ -1,26 +1,22 @@
 import { CreateAvailabilityInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-availability.input";
 import { CreateScheduleInput_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/inputs/create-schedule.input";
-import { ScheduleOutput } from "@/ee/schedules/schedules_2024_04_15/outputs/schedule.output";
 import { SchedulesRepository_2024_04_15 } from "@/ee/schedules/schedules_2024_04_15/schedules.repository";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { UserWithProfile, UsersRepository } from "@/modules/users/users.repository";
 import { BadRequestException, ForbiddenException, Injectable, NotFoundException } from "@nestjs/common";
 import { Schedule } from "@prisma/client";
-import { User } from "@prisma/client";
 
-import type { ScheduleWithAvailabilities } from "@calcom/platform-libraries-0.0.2";
-import { updateScheduleHandler } from "@calcom/platform-libraries-0.0.2";
-import {
-  transformWorkingHoursForClient,
-  transformAvailabilityForClient,
-  transformDateOverridesForClient,
-} from "@calcom/platform-libraries-0.0.2";
+import { updateSchedule } from "@calcom/platform-libraries/schedules";
+import { ScheduleRepository } from "@calcom/platform-libraries/schedules";
 import { UpdateScheduleInput_2024_04_15 } from "@calcom/platform-types";
+import { PrismaClient } from "@calcom/prisma";
 
 @Injectable()
 export class SchedulesService_2024_04_15 {
   constructor(
     private readonly schedulesRepository: SchedulesRepository_2024_04_15,
-    private readonly usersRepository: UsersRepository
+    private readonly usersRepository: UsersRepository,
+    private readonly dbWrite: PrismaWriteService
   ) {}
 
   async createUserDefaultSchedule(userId: number, timeZone: string) {
@@ -48,7 +44,9 @@ export class SchedulesService_2024_04_15 {
       await this.usersRepository.setDefaultSchedule(userId, createdSchedule.id);
     }
 
-    return createdSchedule;
+    const formattedSchedule = await this.getUserSchedule(userId, createdSchedule.id);
+
+    return formattedSchedule;
   }
 
   async getUserScheduleDefault(userId: number) {
@@ -56,11 +54,29 @@ export class SchedulesService_2024_04_15 {
 
     if (!user?.defaultScheduleId) return null;
 
-    return this.schedulesRepository.getScheduleById(user.defaultScheduleId);
+    return await ScheduleRepository.findDetailedScheduleById({
+      scheduleId: user.defaultScheduleId,
+      isManagedEventType: undefined,
+      userId,
+      timeZone: user.timeZone,
+      defaultScheduleId: user.defaultScheduleId,
+    });
   }
 
   async getUserSchedule(userId: number, scheduleId: number) {
-    const existingSchedule = await this.schedulesRepository.getScheduleById(scheduleId);
+    const user = await this.usersRepository.findById(userId);
+
+    if (!user) {
+      throw new NotFoundException(`User with ID=${userId} does not exist.`);
+    }
+
+    const existingSchedule = await ScheduleRepository.findDetailedScheduleById({
+      scheduleId: scheduleId,
+      isManagedEventType: undefined,
+      userId,
+      timeZone: user.timeZone,
+      defaultScheduleId: user.defaultScheduleId,
+    });
 
     if (!existingSchedule) {
       throw new NotFoundException(`Schedule with ID=${scheduleId} does not exist.`);
@@ -71,8 +87,8 @@ export class SchedulesService_2024_04_15 {
     return existingSchedule;
   }
 
-  async getUserSchedules(userId: number) {
-    return this.schedulesRepository.getSchedulesByUserId(userId);
+  async getUserSchedules(userId: number, timeZone: string, defaultScheduleId: number | null) {
+    return ScheduleRepository.findManyDetailedScheduleByUserId({ userId, timeZone, defaultScheduleId });
   }
 
   async updateUserSchedule(
@@ -89,7 +105,6 @@ export class SchedulesService_2024_04_15 {
     this.checkUserOwnsSchedule(user.id, existingSchedule);
 
     const schedule = await this.getUserSchedule(user.id, Number(scheduleId));
-    const scheduleFormatted = await this.formatScheduleForAtom(user, schedule);
 
     if (!bodySchedule.schedule) {
       // note(Lauris): When updating an availability in cal web app, lets say only its name, also
@@ -97,12 +112,16 @@ export class SchedulesService_2024_04_15 {
       // and they have same shape, so to match shapes I attach "scheduleFormatted.availability" to reflect
       // schedule that would be passed by the web app. If we don't, then updating schedule name will erase
       // schedule.
-      bodySchedule.schedule = scheduleFormatted.availability;
+      bodySchedule.schedule = schedule.availability;
     }
 
-    return updateScheduleHandler({
-      input: { scheduleId: Number(scheduleId), ...bodySchedule },
-      ctx: { user },
+    return updateSchedule({
+      input: {
+        scheduleId: Number(scheduleId),
+        ...bodySchedule,
+      },
+      user,
+      prisma: this.dbWrite.prisma as unknown as PrismaClient,
     });
   }
 
@@ -118,44 +137,6 @@ export class SchedulesService_2024_04_15 {
     return this.schedulesRepository.deleteScheduleById(scheduleId);
   }
 
-  async formatScheduleForAtom(user: User, schedule: ScheduleWithAvailabilities): Promise<ScheduleOutput> {
-    const usersSchedulesCount = await this.schedulesRepository.getUserSchedulesCount(user.id);
-    return this.transformScheduleForAtom(schedule, usersSchedulesCount, user);
-  }
-
-  async formatSchedulesForAtom(
-    user: User,
-    schedules: ScheduleWithAvailabilities[]
-  ): Promise<ScheduleOutput[]> {
-    const usersSchedulesCount = await this.schedulesRepository.getUserSchedulesCount(user.id);
-    return Promise.all(
-      schedules.map((schedule) => this.transformScheduleForAtom(schedule, usersSchedulesCount, user))
-    );
-  }
-
-  async transformScheduleForAtom(
-    schedule: ScheduleWithAvailabilities,
-    userSchedulesCount: number,
-    user: Pick<User, "id" | "defaultScheduleId" | "timeZone">
-  ): Promise<ScheduleOutput> {
-    const timeZone = schedule.timeZone || user.timeZone;
-    const defaultSchedule = await this.getUserScheduleDefault(user.id);
-
-    return {
-      id: schedule.id,
-      name: schedule.name,
-      isManaged: schedule.userId !== user.id,
-      workingHours: transformWorkingHoursForClient(schedule),
-      schedule: schedule.availability,
-      availability: transformAvailabilityForClient(schedule),
-      timeZone,
-      dateOverrides: transformDateOverridesForClient(schedule, timeZone),
-      isDefault: defaultSchedule?.id === schedule.id,
-      isLastSchedule: userSchedulesCount <= 1,
-      readOnly: schedule.userId !== user.id,
-    };
-  }
-
   checkUserOwnsSchedule(userId: number, schedule: Pick<Schedule, "id" | "userId">) {
     if (userId !== schedule.userId) {
       throw new ForbiddenException(`User with ID=${userId} does not own schedule with ID=${schedule.id}`);

apps/api/v2/src/filters/calendar-service-exception.filter.ts

@@ -1,3 +1,4 @@
+import { extractUserContext } from "@/lib/extract-user-context";
 import { filterReqHeaders } from "@/lib/filterReqHeaders";
 import { ArgumentsHost, Catch, ExceptionFilter, Logger } from "@nestjs/common";
 import { Request } from "express";
@@ -39,6 +40,7 @@ export class CalendarServiceExceptionFilter implements ExceptionFilter {
     const requestId = request.headers["X-Request-Id"] ?? "unknown-request-id";
     response.setHeader("X-Request-Id", requestId.toString());
 
+    const userContext = extractUserContext(request);
     this.logger.error(`Calendar Service Exception Filter: ${exception?.message}`, {
       exception,
       body: request.body,
@@ -46,6 +48,7 @@ export class CalendarServiceExceptionFilter implements ExceptionFilter {
       url: request.url,
       method: request.method,
       requestId,
+      ...userContext,
     });
 
     response.status(400).json({

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

@@ -1,3 +1,4 @@
+import { extractUserContext } from "@/lib/extract-user-context";
 import { filterReqHeaders } from "@/lib/filterReqHeaders";
 import { ArgumentsHost, Catch, ExceptionFilter, HttpException, Logger } from "@nestjs/common";
 import { Request } from "express";
@@ -16,6 +17,7 @@ export class HttpExceptionFilter implements ExceptionFilter<HttpException> {
     const statusCode = exception.getStatus();
     const requestId = request.headers["X-Request-Id"] ?? "unknown-request-id";
     response.setHeader("X-Request-Id", requestId.toString());
+    const userContext = extractUserContext(request);
     this.logger.error(`Http Exception Filter: ${exception?.message}`, {
       exception,
       body: request.body,
@@ -23,6 +25,7 @@ export class HttpExceptionFilter implements ExceptionFilter<HttpException> {
       url: request.url,
       method: request.method,
       requestId,
+      ...userContext,
     });
 
     response.status(statusCode).json({

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

@@ -1,3 +1,4 @@
+import { extractUserContext } from "@/lib/extract-user-context";
 import { filterReqHeaders } from "@/lib/filterReqHeaders";
 import type { ArgumentsHost, ExceptionFilter } from "@nestjs/common";
 import { Catch, HttpStatus, Logger } from "@nestjs/common";
@@ -43,6 +44,7 @@ export class PrismaExceptionFilter implements ExceptionFilter {
     const requestId = request.headers["X-Request-Id"] ?? "unknown-request-id";
     response.setHeader("X-Request-Id", requestId.toString());
 
+    const userContext = extractUserContext(request);
     this.logger.error(`PrismaError: ${error.message}`, {
       error,
       body: request.body,
@@ -50,6 +52,7 @@ export class PrismaExceptionFilter implements ExceptionFilter {
       url: request.url,
       method: request.method,
       requestId,
+      ...userContext,
     });
 
     let message = "There was an error, please try again later.";

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

@@ -1,3 +1,4 @@
+import { extractUserContext } from "@/lib/extract-user-context";
 import { filterReqHeaders } from "@/lib/filterReqHeaders";
 import { ArgumentsHost, Catch, ExceptionFilter, Logger } from "@nestjs/common";
 import { Request } from "express";
@@ -120,6 +121,7 @@ export class TRPCExceptionFilter implements ExceptionFilter {
     const requestId = request.headers["X-Request-Id"] ?? "unknown-request-id";
     response.setHeader("X-Request-Id", requestId.toString());
 
+    const userContext = extractUserContext(request);
     this.logger.error(`TRPC Exception Filter: ${exception?.message}`, {
       exception,
       body: request.body,
@@ -127,6 +129,7 @@ export class TRPCExceptionFilter implements ExceptionFilter {
       url: request.url,
       method: request.method,
       requestId,
+      ...userContext,
     });
 
     response.status(statusCode).json({

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

@@ -1,3 +1,4 @@
+import { extractUserContext } from "@/lib/extract-user-context";
 import { filterReqHeaders } from "@/lib/filterReqHeaders";
 import type { ArgumentsHost, ExceptionFilter } from "@nestjs/common";
 import { Catch, HttpStatus, Logger } from "@nestjs/common";
@@ -18,6 +19,7 @@ export class ZodExceptionFilter implements ExceptionFilter {
     const requestId = request.headers["X-Request-Id"] ?? "unknown-request-id";
     response.setHeader("X-Request-Id", requestId.toString());
 
+    const userContext = extractUserContext(request);
     this.logger.error(`ZodError: ${error.message}`, {
       error,
       body: request.body,
@@ -25,6 +27,7 @@ export class ZodExceptionFilter implements ExceptionFilter {
       url: request.url,
       method: request.method,
       requestId,
+      ...userContext,
     });
 
     response.status(HttpStatus.BAD_REQUEST).json({

apps/api/v2/src/lib/enums/auth-methods.ts

@@ -3,4 +3,5 @@ export enum AuthMethods {
   "ACCESS_TOKEN" = "access-token",
   "OAUTH_CLIENT" = "oauth-client",
   "NEXT_AUTH" = "next-auth",
+  "THIRD_PARTY_ACCESS_TOKEN" = "third_party_access_token",
 }

apps/api/v2/src/lib/enums/locales.ts

@@ -41,4 +41,5 @@ export enum Locales {
   TA = "ta",
   UK = "uk",
   ZH_TW = "zh-TW",
+  BN = "bn",
 }

apps/api/v2/src/lib/extract-user-context.ts

@@ -0,0 +1,38 @@
+import { Request } from "express";
+
+import { Team } from "@calcom/prisma/client";
+
+import { ApiAuthGuardUser } from "../modules/auth/strategies/api-auth/api-auth.strategy";
+
+export interface UserContext {
+  userId?: string;
+  userEmail?: string;
+  organizationId?: string;
+  teamId?: string;
+  userOrgId?: string;
+}
+
+export function extractUserContext(request: Request): UserContext {
+  const context: UserContext = {};
+
+  const user = (request as any).user as ApiAuthGuardUser | undefined;
+  if (user) {
+    context.userId = String(user.id);
+    context.userEmail = user.email;
+    if (user.profiles?.[0]?.organizationId) {
+      context.userOrgId = String(user.profiles?.[0].organizationId);
+    }
+  }
+
+  const organizationId = (request as any).organizationId as number | undefined;
+  if (organizationId) {
+    context.organizationId = String(organizationId);
+  }
+
+  const team = (request as any).team as Team | undefined;
+  if (team) {
+    context.teamId = String(team.id);
+  }
+
+  return context;
+}

apps/api/v2/src/lib/modules/available-slots.module.ts

@@ -0,0 +1,28 @@
+import { PrismaBookingRepository } from "@/lib/repositories/prisma-booking.repository";
+import { PrismaEventTypeRepository } from "@/lib/repositories/prisma-event-type.repository";
+import { PrismaOOORepository } from "@/lib/repositories/prisma-ooo.repository";
+import { PrismaRoutingFormResponseRepository } from "@/lib/repositories/prisma-routing-form-response.repository";
+import { PrismaScheduleRepository } from "@/lib/repositories/prisma-schedule.repository";
+import { PrismaSelectedSlotsRepository } from "@/lib/repositories/prisma-selected-slots.repository";
+import { PrismaTeamRepository } from "@/lib/repositories/prisma-team.repository";
+import { PrismaUserRepository } from "@/lib/repositories/prisma-user.repository";
+import { AvailableSlotsService } from "@/lib/services/available-slots.service";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { Module } from "@nestjs/common";
+
+@Module({
+  imports: [PrismaModule],
+  providers: [
+    PrismaOOORepository,
+    PrismaScheduleRepository,
+    PrismaBookingRepository,
+    PrismaSelectedSlotsRepository,
+    PrismaUserRepository,
+    PrismaEventTypeRepository,
+    PrismaRoutingFormResponseRepository,
+    PrismaTeamRepository,
+    AvailableSlotsService,
+  ],
+  exports: [AvailableSlotsService],
+})
+export class AvailableSlotsModule {}

apps/api/v2/src/lib/repositories/prisma-booking.repository.ts

@@ -0,0 +1,12 @@
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { PrismaBookingRepository as PrismaBookingRepositoryLib } from "@calcom/platform-libraries/repositories";
+import { PrismaClient } from "@calcom/prisma";
+
+@Injectable()
+export class PrismaBookingRepository extends PrismaBookingRepositoryLib {
+  constructor(private readonly dbWrite: PrismaWriteService) {
+    super(dbWrite.prisma as unknown as PrismaClient);
+  }
+}

apps/api/v2/src/lib/repositories/prisma-event-type.repository.ts

@@ -0,0 +1,12 @@
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { PrismaEventTypeRepository as PrismaEventTypeRepositoryLib } from "@calcom/platform-libraries/repositories";
+import { PrismaClient } from "@calcom/prisma";
+
+@Injectable()
+export class PrismaEventTypeRepository extends PrismaEventTypeRepositoryLib {
+  constructor(private readonly dbWrite: PrismaWriteService) {
+    super(dbWrite.prisma as unknown as PrismaClient);
+  }
+}

apps/api/v2/src/lib/repositories/prisma-ooo.repository.ts

@@ -0,0 +1,12 @@
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { PrismaOOORepository as PrismaOOORepositoryLib } from "@calcom/platform-libraries/repositories";
+import { PrismaClient } from "@calcom/prisma";
+
+@Injectable()
+export class PrismaOOORepository extends PrismaOOORepositoryLib {
+  constructor(private readonly dbWrite: PrismaWriteService) {
+    super(dbWrite.prisma as unknown as PrismaClient);
+  }
+}

apps/api/v2/src/lib/repositories/prisma-routing-form-response.repository.ts

@@ -0,0 +1,12 @@
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { PrismaRoutingFormResponseRepository as PrismaRoutingFormResponseRepositoryLib } from "@calcom/platform-libraries/repositories";
+import { PrismaClient } from "@calcom/prisma";
+
+@Injectable()
+export class PrismaRoutingFormResponseRepository extends PrismaRoutingFormResponseRepositoryLib {
+  constructor(private readonly dbWrite: PrismaWriteService) {
+    super(dbWrite.prisma as unknown as PrismaClient);
+  }
+}

apps/api/v2/src/lib/repositories/prisma-schedule.repository.ts

@@ -0,0 +1,12 @@
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { PrismaScheduleRepository as PrismaScheduleRepositoryLib } from "@calcom/platform-libraries/repositories";
+import { PrismaClient } from "@calcom/prisma";
+
+@Injectable()
+export class PrismaScheduleRepository extends PrismaScheduleRepositoryLib {
+  constructor(private readonly dbWrite: PrismaWriteService) {
+    super(dbWrite.prisma as unknown as PrismaClient);
+  }
+}

apps/api/v2/src/lib/repositories/prisma-selected-slots.repository.ts

@@ -0,0 +1,12 @@
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { PrismaSelectedSlotsRepository as PrismaSelectedSlotsRepositoryLib } from "@calcom/platform-libraries/repositories";
+import { PrismaClient } from "@calcom/prisma";
+
+@Injectable()
+export class PrismaSelectedSlotsRepository extends PrismaSelectedSlotsRepositoryLib {
+  constructor(private readonly dbWrite: PrismaWriteService) {
+    super(dbWrite.prisma as unknown as PrismaClient);
+  }
+}

apps/api/v2/src/lib/repositories/prisma-team.repository.ts

@@ -0,0 +1,12 @@
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { PrismaTeamRepository as PrismaTeamRepositoryLib } from "@calcom/platform-libraries/repositories";
+import { PrismaClient } from "@calcom/prisma";
+
+@Injectable()
+export class PrismaTeamRepository extends PrismaTeamRepositoryLib {
+  constructor(private readonly dbWrite: PrismaWriteService) {
+    super(dbWrite.prisma as unknown as PrismaClient);
+  }
+}

apps/api/v2/src/lib/repositories/prisma-user.repository.ts

@@ -0,0 +1,12 @@
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+import { PrismaUserRepository as PrismaUserRepositoryLib } from "@calcom/platform-libraries/repositories";
+import { PrismaClient } from "@calcom/prisma";
+
+@Injectable()
+export class PrismaUserRepository extends PrismaUserRepositoryLib {
+  constructor(private readonly dbWrite: PrismaWriteService) {
+    super(dbWrite.prisma as unknown as PrismaClient);
+  }
+}

apps/api/v2/src/lib/services/available-slots.service.ts

@@ -0,0 +1,36 @@
+import { PrismaBookingRepository } from "@/lib/repositories/prisma-booking.repository";
+import { PrismaEventTypeRepository } from "@/lib/repositories/prisma-event-type.repository";
+import { PrismaOOORepository } from "@/lib/repositories/prisma-ooo.repository";
+import { PrismaRoutingFormResponseRepository } from "@/lib/repositories/prisma-routing-form-response.repository";
+import { PrismaScheduleRepository } from "@/lib/repositories/prisma-schedule.repository";
+import { PrismaSelectedSlotsRepository } from "@/lib/repositories/prisma-selected-slots.repository";
+import { PrismaTeamRepository } from "@/lib/repositories/prisma-team.repository";
+import { PrismaUserRepository } from "@/lib/repositories/prisma-user.repository";
+import { Injectable } from "@nestjs/common";
+
+import { AvailableSlotsService as BaseAvailableSlotsService } from "@calcom/platform-libraries/slots";
+
+@Injectable()
+export class AvailableSlotsService extends BaseAvailableSlotsService {
+  constructor(
+    private readonly oooRepoDependency: PrismaOOORepository,
+    private readonly scheduleRepoDependency: PrismaScheduleRepository,
+    private readonly teamRepository: PrismaTeamRepository,
+    private readonly routingFormResponseRepository: PrismaRoutingFormResponseRepository,
+    private readonly bookingRepository: PrismaBookingRepository,
+    private readonly selectedSlotsRepository: PrismaSelectedSlotsRepository,
+    private readonly eventTypeRepository: PrismaEventTypeRepository,
+    private readonly userRepository: PrismaUserRepository
+  ) {
+    super({
+      oooRepo: oooRepoDependency,
+      scheduleRepo: scheduleRepoDependency,
+      teamRepo: teamRepository,
+      routingFormResponseRepo: routingFormResponseRepository,
+      bookingRepo: bookingRepository,
+      selectedSlotsRepo: selectedSlotsRepository,
+      eventTypeRepo: eventTypeRepository,
+      userRepo: userRepository,
+    });
+  }
+}

apps/api/v2/src/middleware/request-ids/request-id.interceptor.ts

@@ -1,3 +1,4 @@
+import { extractUserContext } from "@/lib/extract-user-context";
 import { CallHandler, ExecutionContext, Injectable, NestInterceptor, Logger } from "@nestjs/common";
 import { Request, Response } from "express";
 import { tap } from "rxjs/operators";
@@ -14,6 +15,7 @@ export class ResponseInterceptor implements NestInterceptor {
     const requestId = request.headers["X-Request-Id"] ?? "unknown-request-id";
     response.setHeader("X-Request-Id", requestId.toString());
     const { method, url } = request;
+    const userContext = extractUserContext(request);
     const startTime = Date.now();
 
     return next.handle().pipe(
@@ -39,6 +41,7 @@ export class ResponseInterceptor implements NestInterceptor {
           responseTime,
           responseBody: jsonBodyString,
           timestamp: new Date().toISOString(),
+          ...userContext,
         });
       })
     );

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

@@ -95,7 +95,9 @@ export class EventTypesAtomService {
     }
 
     // note (Lauris): don't show platform owner as one of the people that can be assigned to managed team event type
-    const onlyManagedTeamMembers = eventType.teamMembers.filter((user) => user.isPlatformManaged);
+    const onlyManagedTeamMembers = eventType.teamMembers.filter(
+      (user) => user.isPlatformManaged && user.membership === "MEMBER"
+    );
     eventType.teamMembers = onlyManagedTeamMembers;
 
     return eventType;

apps/api/v2/src/modules/auth/decorators/api-auth-guard-only-allow.decorator.ts

@@ -1,5 +1,10 @@
 import { Reflector } from "@nestjs/core";
 
-export type AllowedAuthMethod = "OAUTH_CLIENT_CREDENTIALS" | "API_KEY" | "ACCESS_TOKEN" | "NEXT_AUTH";
+export type AllowedAuthMethod =
+  | "OAUTH_CLIENT_CREDENTIALS"
+  | "API_KEY"
+  | "ACCESS_TOKEN"
+  | "NEXT_AUTH"
+  | "THIRD_PARTY_ACCESS_TOKEN";
 
 export const ApiAuthGuardOnlyAllow = Reflector.createDecorator<AllowedAuthMethod[]>();

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

@@ -10,16 +10,30 @@ import { ProfilesRepository } from "@/modules/profiles/profiles.repository";
 import { TokensRepository } from "@/modules/tokens/tokens.repository";
 import { UsersService } from "@/modules/users/services/users.service";
 import { UserWithProfile, UsersRepository } from "@/modules/users/users.repository";
-import { Injectable, InternalServerErrorException, UnauthorizedException } from "@nestjs/common";
+import {
+  HttpException,
+  Injectable,
+  InternalServerErrorException,
+  UnauthorizedException,
+} from "@nestjs/common";
+import { Logger } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { PassportStrategy } from "@nestjs/passport";
 import type { Request } from "express";
+import * as jwt from "jsonwebtoken";
 import { getToken } from "next-auth/jwt";
 
 import { INVALID_ACCESS_TOKEN, X_CAL_CLIENT_ID, X_CAL_SECRET_KEY } from "@calcom/platform-constants";
 
 import type { AllowedAuthMethod } from "../../decorators/api-auth-guard-only-allow.decorator";
 
+interface OAuthTokenPayload {
+  userId?: number;
+  teamId?: number;
+  scope: string[];
+  token_type: string;
+}
+
 export type ApiAuthGuardUser = UserWithProfile & { isSystemAdmin: boolean };
 export type ApiAuthGuardRequest = Request & {
   authMethod: AuthMethods;
@@ -29,8 +43,11 @@ export type ApiAuthGuardRequest = Request & {
 };
 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";
+
 @Injectable()
 export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth") {
+  private readonly logger = new Logger("ApiAuthStrategy");
+
   constructor(
     private readonly deploymentsService: DeploymentsService,
     private readonly config: ConfigService,
@@ -54,22 +71,53 @@ export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth")
 
       const allowedMethods = request.allowedAuthMethods;
       const noSpecificAuthExpected = !allowedMethods || !allowedMethods.length;
+
       const oAuthAllowed = noSpecificAuthExpected || allowedMethods.includes("OAUTH_CLIENT_CREDENTIALS");
       const apiKeyAllowed = noSpecificAuthExpected || allowedMethods.includes("API_KEY");
       const accessTokenAllowed = noSpecificAuthExpected || allowedMethods.includes("ACCESS_TOKEN");
       const nextAuthAllowed = noSpecificAuthExpected || allowedMethods.includes("NEXT_AUTH");
+      const thirdPartyAccessTokenAllowed =
+        noSpecificAuthExpected || allowedMethods.includes("THIRD_PARTY_ACCESS_TOKEN");
 
       if (oAuthClientId && oAuthClientSecret && oAuthAllowed) {
         request.authMethod = AuthMethods["OAUTH_CLIENT"];
         return await this.authenticateOAuthClient(oAuthClientId, oAuthClientSecret, request);
       }
 
-      if (bearerToken && (apiKeyAllowed || accessTokenAllowed)) {
-        const requestOrigin = request.get("Origin");
-        request.authMethod = isApiKey(bearerToken, this.config.get<string>("api.apiKeyPrefix") ?? "cal_")
-          ? AuthMethods["API_KEY"]
-          : AuthMethods["ACCESS_TOKEN"];
-        return await this.authenticateBearerToken(bearerToken, request, requestOrigin);
+      if (bearerToken) {
+        if (!apiKeyAllowed && !accessTokenAllowed && thirdPartyAccessTokenAllowed) {
+          request.authMethod = AuthMethods["THIRD_PARTY_ACCESS_TOKEN"];
+          const result = await this.validateThirdPartyAccessToken(bearerToken, request);
+          if (result.success) {
+            return this.success(this.getSuccessUser(result.data));
+          }
+        }
+
+        if (apiKeyAllowed || accessTokenAllowed) {
+          try {
+            const requestOrigin = request.get("Origin");
+            request.authMethod = isApiKey(bearerToken, this.config.get<string>("api.apiKeyPrefix") ?? "cal_")
+              ? AuthMethods["API_KEY"]
+              : AuthMethods["ACCESS_TOKEN"];
+            return await this.authenticateBearerToken(bearerToken, request, requestOrigin);
+          } catch (err) {
+            // failed to validate access token, try to validate third party token
+            if (thirdPartyAccessTokenAllowed && request.authMethod === AuthMethods["ACCESS_TOKEN"]) {
+              request.authMethod = AuthMethods["THIRD_PARTY_ACCESS_TOKEN"];
+              const result = await this.validateThirdPartyAccessToken(bearerToken, request);
+
+              if (result.success) {
+                return this.success(this.getSuccessUser(result.data));
+              }
+            }
+            // token was not third party token, rethrow error from authenticateBearerToken
+            if (err instanceof Error) {
+              return this.error(err);
+            }
+          }
+        }
+
+        throw new UnauthorizedException(`ApiAuthStrategy - Invalid Bearer token`);
       }
 
       const nextAuthSecret = this.config.get("next.authSecret", { infer: true });
@@ -83,8 +131,11 @@ export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth")
       if (noAuthProvided) {
         throw new UnauthorizedException(`ApiAuthStrategy - ${NO_AUTH_PROVIDED_MESSAGE}`);
       }
+
       throw new UnauthorizedException(
-        `ApiAuthStrategy - Invalid authentication method. Please provide one of the allowed methods: ${allowedMethods}`
+        `ApiAuthStrategy - Invalid authentication method. Please provide one of the allowed methods: ${
+          allowedMethods && allowedMethods.length > 0 ? allowedMethods.join(", ") : "Any supported method"
+        }`
       );
     } catch (err) {
       if (err instanceof Error) {
@@ -164,21 +215,17 @@ export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth")
         : await this.accessTokenStrategy(authString, request, requestOrigin);
 
       if (!user) {
-        return this.error(
-          new UnauthorizedException(
-            "ApiAuthStrategy - bearer token - No user associated with the provided token"
-          )
+        throw new UnauthorizedException(
+          "ApiAuthStrategy - bearer token - No user associated with the provided token"
         );
       }
 
       return this.success(this.getSuccessUser(user));
     } catch (err) {
       if (err instanceof Error) {
-        return this.error(err);
+        throw err;
       }
-      return this.error(
-        new InternalServerErrorException("An error occurred while authenticating the request")
-      );
+      throw new InternalServerErrorException("An error occurred while authenticating the request");
     }
   }
 
@@ -271,4 +318,55 @@ export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth")
 
     return user;
   }
+
+  async validateThirdPartyAccessToken(
+    token: string,
+    request: ApiAuthGuardRequest
+  ): Promise<{ success: true; data: UserWithProfile } | { success: false }> {
+    // Removed requiredScopes parameter
+    const encryptionKey = this.config.get<string>("CALENDSO_ENCRYPTION_KEY");
+    if (!encryptionKey) {
+      throw new InternalServerErrorException("CALENDSO_ENCRYPTION_KEY environment variable is not set.");
+    }
+
+    let decodedToken: OAuthTokenPayload;
+    try {
+      decodedToken = jwt.verify(token, encryptionKey) as OAuthTokenPayload;
+    } catch (e) {
+      return { success: false };
+    }
+
+    if (!decodedToken || decodedToken.token_type !== "Access Token") {
+      return { success: false };
+    }
+
+    let user: UserWithProfile | null = null;
+    let organizationId: number | null = null;
+
+    if (decodedToken.userId) {
+      user = await this.userRepository.findByIdWithProfile(decodedToken.userId);
+      if (user) {
+        organizationId = this.usersService.getUserMainOrgId(user) as number;
+      }
+    } else if (decodedToken.teamId) {
+      const teamOwner = await this.userRepository.findOwnerByTeamIdWithProfile(decodedToken.teamId);
+      if (!teamOwner) {
+        throw new UnauthorizedException(
+          "ApiAuthStrategy - third-party token - No owner found for the associated team."
+        );
+      }
+      user = teamOwner;
+      organizationId =
+        teamOwner.profiles?.find((p) => p.organizationId === decodedToken.teamId)?.organizationId ?? null;
+    }
+
+    if (!user) {
+      throw new UnauthorizedException(
+        "ApiAuthStrategy - third-party token - No user or team owner associated with the token."
+      );
+    }
+
+    request.organizationId = organizationId;
+    return { success: true, data: user };
+  }
 }

apps/api/v2/src/modules/booking-seat/booking-seat.repository.ts

@@ -1,7 +1,6 @@
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
-import { Prisma } from "@prisma/client";
 
 @Injectable()
 export class BookingSeatRepository {

apps/api/v2/src/modules/cal-unified-calendars/controllers/cal-unified-calendars.controller.ts

@@ -34,7 +34,7 @@ export class CalUnifiedCalendarsController {
   @UseGuards(ApiAuthGuard, PermissionsGuard)
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
   @ApiOperation({
-    summary: "Get meeting Details from calendar",
+    summary: "Get meeting details from calendar",
     description: "Returns detailed information about a meeting including attendance metrics",
   })
   async getCalendarEventDetails(

apps/api/v2/src/modules/cal-unified-calendars/services/google-calendar.service.ts

@@ -5,7 +5,7 @@ import { calendar_v3 } from "@googleapis/calendar";
 import { Injectable, UnauthorizedException } from "@nestjs/common";
 import { NotFoundException } from "@nestjs/common";
 import { Logger } from "@nestjs/common";
-import { Prisma } from "@prisma/client";
+import type { Prisma } from "@prisma/client";
 import { JWT } from "googleapis-common";
 
 import { DelegationCredentialRepository, OAuth2UniversalSchema } from "@calcom/platform-libraries/app-store";

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

@@ -87,7 +87,7 @@ export class ConferencingController {
   @HttpCode(HttpStatus.OK)
   @UseGuards(ApiAuthGuard)
   @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
-  @ApiOperation({ summary: "Get OAuth conferencing app auth url" })
+  @ApiOperation({ summary: "Get OAuth conferencing app auth URL" })
   @ApiParam({
     name: "app",
     description: "Conferencing application type",
@@ -130,7 +130,7 @@ export class ConferencingController {
   @Get("/:app/oauth/callback")
   @UseGuards()
   @Redirect(undefined, 301)
-  @ApiOperation({ summary: "conferencing apps oauths callback" })
+  @ApiOperation({ summary: "Conferencing app OAuth callback" })
   @ApiParam({
     name: "app",
     description: "Conferencing application type",

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

@@ -1,7 +1,7 @@
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
-import { Prisma } from "@prisma/client";
+import type { Prisma } from "@prisma/client";
 
 import { GOOGLE_MEET_TYPE } from "@calcom/platform-constants";
 
@@ -9,7 +9,7 @@ import { GOOGLE_MEET_TYPE } from "@calcom/platform-constants";
 export class ConferencingRepository {
   constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
 
-  private readonly credentialSelect = Prisma.validator<Prisma.CredentialSelect>()({
+  private readonly credentialSelect = {
     id: true,
     type: true,
     userId: true,
@@ -20,7 +20,7 @@ export class ConferencingRepository {
     billingCycleStart: true,
     invalid: true,
     delegationCredentialId: true,
-  });
+  } satisfies Prisma.CredentialSelect;
 
   async findConferencingApps(userId: number) {
     return this.dbRead.prisma.credential.findMany({

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

@@ -1,7 +1,7 @@
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
-import { Prisma } from "@prisma/client";
+import type { Prisma } from "@prisma/client";
 
 import { APPS_TYPE_ID_MAPPING } from "@calcom/platform-constants";
 import { credentialForCalendarServiceSelect } from "@calcom/platform-libraries";

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

@@ -92,6 +92,8 @@ describe("Platform Destination Calendar Endpoints", () => {
               publisher: "",
               url: "",
               email: "",
+              createdAt: new Date().toISOString(),
+              updatedAt: new Date().toISOString(),
             },
             // calendars: {
             //   externalId:
@@ -118,6 +120,8 @@ describe("Platform Destination Calendar Endpoints", () => {
           id: 0,
           delegationCredentialId: null,
           domainWideDelegationCredentialId: null,
+          createdAt: new Date(),
+          updatedAt: new Date(),
         },
       })
     );

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

@@ -2,7 +2,7 @@ import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { Injectable } from "@nestjs/common";
 import { v4 as uuidv4 } from "uuid";
 
-import { Prisma } from "@calcom/prisma/client";
+import type { Prisma } from "@calcom/prisma/client";
 
 import { PrismaWriteService } from "../../prisma/prisma-write.service";
 

apps/api/v2/src/modules/organizations/attributes/options/organizations-attributes-options.controller.ts

@@ -134,7 +134,7 @@ export class OrganizationsAttributesOptionsController {
   @Roles("ORG_MEMBER")
   @PlatformPlan("ESSENTIALS")
   @Get("/attributes/:attributeId/options/assigned")
-  @ApiOperation({ summary: "Get by attribute id all of the attribute options that are assigned to users" })
+  @ApiOperation({ summary: "Get all assigned attribute options by attribute ID" })
   async getOrganizationAttributeAssignedOptions(
     @Param("orgId", ParseIntPipe) orgId: number,
     @Param("attributeId") attributeId: string,
@@ -158,7 +158,7 @@ export class OrganizationsAttributesOptionsController {
   @Roles("ORG_MEMBER")
   @PlatformPlan("ESSENTIALS")
   @Get("/attributes/slugs/:attributeSlug/options/assigned")
-  @ApiOperation({ summary: "Get by attribute slug all of the attribute options that are assigned to users" })
+  @ApiOperation({ summary: "Get all assigned attribute options by attribute slug" })
   async getOrganizationAttributeAssignedOptionsBySlug(
     @Param("orgId", ParseIntPipe) orgId: number,
     @Param("attributeSlug") attributeSlug: string,

apps/api/v2/src/modules/organizations/bookings/organizations-bookings.controller.ts

@@ -34,7 +34,7 @@ export class OrganizationsBookingsController {
   constructor(private readonly bookingsService: BookingsService_2024_08_13) {}
 
   @Get("/")
-  @ApiOperation({ summary: "Get Organization Bookings" })
+  @ApiOperation({ summary: "Get organization bookings" })
   @Roles("ORG_ADMIN")
   @PlatformPlan("ESSENTIALS")
   @HttpCode(HttpStatus.OK)

apps/api/v2/src/modules/organizations/conferencing/organizations-conferencing.controller.ts

@@ -105,7 +105,7 @@ export class OrganizationsConferencingController {
   @UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard, IsTeamInOrg, PlatformPlanGuard, IsAdminAPIEnabledGuard)
   @Get("/teams/:teamId/conferencing/:app/oauth/auth-url")
   @HttpCode(HttpStatus.OK)
-  @ApiOperation({ summary: "Get OAuth conferencing app's auth url for a team" })
+  @ApiOperation({ summary: "Get OAuth conferencing app's auth URL for a team" })
   async getTeamOAuthUrl(
     @Req() req: Request,
     @Headers("Authorization") authorization: string,

apps/api/v2/src/modules/organizations/delegation-credentials/organizations-delegation-credential.controller.ts

@@ -52,7 +52,7 @@ export class OrganizationsDelegationCredentialController {
   @HttpCode(HttpStatus.CREATED)
   @Roles("ORG_ADMIN")
   @PlatformPlan("SCALE")
-  @ApiOperation({ summary: "Save delegation credentials for your organization." })
+  @ApiOperation({ summary: "Save delegation credentials for your organization" })
   async createDelegationCredential(
     @Param("orgId", ParseIntPipe) orgId: number,
     @GetUser() delegatedServiceAccountUser: User,
@@ -72,7 +72,7 @@ export class OrganizationsDelegationCredentialController {
   @Patch("/:credentialId")
   @Roles("ORG_ADMIN")
   @PlatformPlan("SCALE")
-  @ApiOperation({ summary: "Update delegation credentials of your organization." })
+  @ApiOperation({ summary: "Update delegation credentials of your organization" })
   async updateDelegationCredential(
     @Param("orgId", ParseIntPipe) orgId: number,
     @GetUser() delegatedServiceAccountUser: User,

apps/api/v2/src/modules/organizations/delegation-credentials/organizations-delegation-credential.repository.ts

@@ -2,7 +2,7 @@ import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
 
-import { Prisma } from "@calcom/prisma/client";
+import type { Prisma } from "@calcom/prisma/client";
 
 @Injectable()
 export class OrganizationsDelegationCredentialRepository {

apps/api/v2/src/modules/organizations/event-types/assign-all-team-members.e2e-spec.ts

@@ -304,8 +304,10 @@ describe("Assign all team members", () => {
           expect(data.title).toEqual(body.title);
           expect(data.hosts.length).toEqual(2);
           expect(data.schedulingType).toEqual("collective");
-          evaluateHost({ userId: firstManagedUser.user.id }, data.hosts[0]);
-          evaluateHost({ userId: secondManagedUser.user.id }, data.hosts[1]);
+          const dataFirstHost = data.hosts.find((host) => host.userId === firstManagedUser.user.id);
+          const dataSecondHost = data.hosts.find((host) => host.userId === secondManagedUser.user.id);
+          evaluateHost({ userId: firstManagedUser.user.id }, dataFirstHost);
+          evaluateHost({ userId: secondManagedUser.user.id }, dataSecondHost);
 
           const eventTypeHosts = await hostsRepositoryFixture.getEventTypeHosts(data.id);
           expect(eventTypeHosts.length).toEqual(2);
@@ -341,13 +343,15 @@ describe("Assign all team members", () => {
           expect(data.title).toEqual(body.title);
           expect(data.hosts.length).toEqual(2);
           expect(data.schedulingType).toEqual("roundRobin");
+          const dataFirstHost = data.hosts.find((host) => host.userId === firstManagedUser.user.id);
+          const dataSecondHost = data.hosts.find((host) => host.userId === secondManagedUser.user.id);
           evaluateHost(
             { userId: firstManagedUser.user.id, mandatory: false, priority: "medium" },
-            data.hosts[0]
+            dataFirstHost
           );
           evaluateHost(
             { userId: secondManagedUser.user.id, mandatory: false, priority: "medium" },
-            data.hosts[1]
+            dataSecondHost
           );
 
           const eventTypeHosts = await hostsRepositoryFixture.getEventTypeHosts(data.id);
@@ -381,13 +385,15 @@ describe("Assign all team members", () => {
           expect(data.title).toEqual(body.title);
           expect(data.hosts.length).toEqual(2);
           expect(data.schedulingType).toEqual("roundRobin");
+          const dataFirstHost = data.hosts.find((host) => host.userId === firstManagedUser.user.id);
+          const dataSecondHost = data.hosts.find((host) => host.userId === secondManagedUser.user.id);
           evaluateHost(
             { userId: firstManagedUser.user.id, mandatory: false, priority: "medium" },
-            data.hosts[0]
+            dataFirstHost
           );
           evaluateHost(
             { userId: secondManagedUser.user.id, mandatory: false, priority: "medium" },
-            data.hosts[1]
+            dataSecondHost
           );
 
           const eventTypeHosts = await hostsRepositoryFixture.getEventTypeHosts(data.id);

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

@@ -69,7 +69,7 @@ export class OrganizationsRepository {
     return id;
   }
 
-  async findTeamIdFromClientId(clientId: string) {
+  async findTeamIdAndSlugFromClientId(clientId: string) {
     return this.dbRead.prisma.team.findFirstOrThrow({
       where: {
         platformOAuthClient: {
@@ -80,6 +80,7 @@ export class OrganizationsRepository {
       },
       select: {
         id: true,
+        slug: true,
       },
     });
   }

apps/api/v2/src/modules/organizations/memberships/organizations-membership.repository.ts

@@ -4,7 +4,7 @@ import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { MembershipUserSelect } from "@/modules/teams/memberships/teams-memberships.repository";
 import { Injectable } from "@nestjs/common";
 
-import { Prisma } from "@calcom/prisma/client";
+import type { Prisma } from "@calcom/prisma/client";
 
 import { UpdateOrgMembershipDto } from "./inputs/update-organization-membership.input";
 

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

@@ -0,0 +1,29 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { IsOptional, IsString } from "class-validator";
+
+import { SkipTakePagination } from "@calcom/platform-types";
+
+export class GetManagedOrganizationsInput_2024_08_13 extends SkipTakePagination {
+  @IsOptional()
+  @IsString()
+  @ApiProperty({ example: "organization-slug", description: "The slug of the managed organization" })
+  slug?: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty({
+    example: "metadata-key",
+    description:
+      "The key of the metadata - it is case sensitive so provide exactly as stored. If you provide it then you must also provide metadataValue",
+  })
+  metadataKey?: string;
+
+  @IsOptional()
+  @IsString()
+  @ApiProperty({
+    example: "metadata-value",
+    description:
+      "The value of the metadata - it is case sensitive so provide exactly as stored. If you provide it then you must also provide metadataKey",
+  })
+  metadataValue?: string;
+}

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

@@ -1,9 +1,10 @@
+import { GetManagedOrganizationsInput_2024_08_13 } from "@/modules/organizations/organizations/inputs/get-managed-organizations.input";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
 import { Injectable } from "@nestjs/common";
 
 import { SkipTakePagination } from "@calcom/platform-types";
-import { Prisma } from "@calcom/prisma/client";
+import type { Prisma } from "@calcom/prisma/client";
 
 @Injectable()
 export class ManagedOrganizationsRepository {
@@ -24,6 +25,17 @@ export class ManagedOrganizationsRepository {
     });
   }
 
+  async getManagedOrganizationBySlug(managerOrganizationId: number, managedOrganizationSlug: string) {
+    return this.dbRead.prisma.managedOrganization.findFirst({
+      where: {
+        managerOrganizationId,
+        managedOrganization: {
+          slug: managedOrganizationSlug,
+        },
+      },
+    });
+  }
+
   async getByManagerManagedIds(managerOrganizationId: number, managedOrganizationId: number) {
     return this.dbRead.prisma.managedOrganization.findUnique({
       where: {
@@ -35,11 +47,26 @@ export class ManagedOrganizationsRepository {
     });
   }
 
-  async getByManagerOrganizationIdPaginated(managerOrganizationId: number, pagination: SkipTakePagination) {
-    const { skip, take } = pagination;
+  async getByManagerOrganizationIdPaginated(
+    managerOrganizationId: number,
+    query: GetManagedOrganizationsInput_2024_08_13
+  ) {
+    const { skip, take, slug, metadataKey, metadataValue } = query;
+
+    const managedOrganizationFilter: Prisma.TeamWhereInput = {
+      slug,
+    };
+
+    if (metadataKey && metadataValue) {
+      managedOrganizationFilter.metadata = {
+        path: [metadataKey],
+        equals: metadataValue,
+      };
+    }
 
     const where: Prisma.ManagedOrganizationWhereInput = {
       managerOrganizationId,
+      managedOrganization: managedOrganizationFilter,
     };
 
     const [totalItems, linkRows] = await this.dbRead.prisma.$transaction([

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

@@ -66,6 +66,7 @@ describe("Organizations Organizations Endpoints", () => {
 
   let managerOrg: Team;
   let managedOrg: ManagedOrganizationWithApiKeyOutput;
+  let managedOrg2: ManagedOrganizationWithApiKeyOutput;
   const managerOrgAdminEmail = `organizations-organizations-admin-${randomString()}@api.com`;
   let managerOrgAdmin: User;
   let managerOrgAdminApiKey: string;
@@ -159,27 +160,36 @@ describe("Organizations Organizations Endpoints", () => {
       .expect(400);
   });
 
+  const suffix = randomString(5);
+  const metadataKey = "first-org-metadata-key";
+  const metadataValue = "first-org-metadata-value";
+  const createManagedOrganizationBody: CreateOrganizationInput = {
+    name: `org ${suffix}`,
+    slug: `org-${suffix}`,
+    metadata: { [metadataKey]: metadataValue },
+  };
+
+  const suffix2 = randomString(5);
+  const createManagedOrganizationBodySecond: CreateOrganizationInput = {
+    name: `org2 ${suffix2}`,
+    slug: `org2-${suffix2}`,
+    metadata: { key: "value" },
+  };
+
   it("should create managed organization", async () => {
-    const suffix = randomString();
-
-    const body: CreateOrganizationInput = {
-      name: `organizations organizations org ${suffix}`,
-      metadata: { key: "value" },
-    };
-
     return request(app.getHttpServer())
       .post(`/v2/organizations/${managerOrg.id}/organizations`)
       .set("Authorization", `Bearer ${managerOrgAdminApiKey}`)
-      .send(body)
+      .send(createManagedOrganizationBody)
       .expect(201)
       .then(async (response) => {
         const responseBody: ApiSuccessResponse<ManagedOrganizationWithApiKeyOutput> = response.body;
         expect(responseBody.status).toEqual(SUCCESS_STATUS);
         managedOrg = responseBody.data;
         expect(managedOrg?.id).toBeDefined();
-        expect(managedOrg?.name).toEqual(body.name);
-        expect(managedOrg?.slug).toEqual(slugify(body.name));
-        expect(managedOrg?.metadata).toEqual(body.metadata);
+        expect(managedOrg?.name).toEqual(createManagedOrganizationBody.name);
+        expect(managedOrg?.slug).toEqual(createManagedOrganizationBody.slug);
+        expect(managedOrg?.metadata).toEqual(createManagedOrganizationBody.metadata);
         expect(managedOrg?.apiKey).toBeDefined();
 
         // note(Lauris): check that managed organization is correctly setup in database
@@ -284,6 +294,36 @@ describe("Organizations Organizations Endpoints", () => {
       });
   });
 
+  it("should not create managed organization if slug already exists", async () => {
+    const response = await request(app.getHttpServer())
+      .post(`/v2/organizations/${managerOrg.id}/organizations`)
+      .set("Authorization", `Bearer ${managerOrgAdminApiKey}`)
+      .send(createManagedOrganizationBody)
+      .expect(409);
+
+    expect(response.body.error.message).toBe(
+      `Organization with slug '${createManagedOrganizationBody.slug}' already exists. Please, either provide a different slug or change name so that the automatically generated slug is different.`
+    );
+  });
+
+  it("should create second managed organization", async () => {
+    return request(app.getHttpServer())
+      .post(`/v2/organizations/${managerOrg.id}/organizations`)
+      .set("Authorization", `Bearer ${managerOrgAdminApiKey}`)
+      .send(createManagedOrganizationBodySecond)
+      .expect(201)
+      .then(async (response) => {
+        const responseBody: ApiSuccessResponse<ManagedOrganizationWithApiKeyOutput> = response.body;
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        managedOrg2 = responseBody.data;
+        expect(managedOrg2?.id).toBeDefined();
+        expect(managedOrg2?.name).toEqual(createManagedOrganizationBodySecond.name);
+        expect(managedOrg2?.slug).toEqual(createManagedOrganizationBodySecond.slug);
+        expect(managedOrg2?.metadata).toEqual(createManagedOrganizationBodySecond.metadata);
+        expect(managedOrg2?.apiKey).toBeDefined();
+      });
+  });
+
   it("should get managed organization", async () => {
     return request(app.getHttpServer())
       .get(`/v2/organizations/${managerOrg.id}/organizations/${managedOrg.id}`)
@@ -304,12 +344,69 @@ describe("Organizations Organizations Endpoints", () => {
       .get(`/v2/organizations/${managerOrg.id}/organizations`)
       .set("Authorization", `Bearer ${managerOrgAdminApiKey}`)
       .expect(200)
+      .then(async (response) => {
+        const responseBody: GetManagedOrganizationsOutput = response.body;
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        const responseManagedOrgs = responseBody.data;
+        expect(responseManagedOrgs?.length).toEqual(2);
+        const responseManagedOrg = responseManagedOrgs.find((org) => org.id === managedOrg.id);
+        expect(responseManagedOrg?.id).toBeDefined();
+        expect(responseManagedOrg?.name).toEqual(managedOrg.name);
+        expect(responseManagedOrg?.metadata).toEqual(managedOrg.metadata);
+
+        const responseManagedOrg2 = responseManagedOrgs.find((org) => org.id === managedOrg2.id);
+        expect(responseManagedOrg2?.id).toBeDefined();
+        expect(responseManagedOrg2?.name).toEqual(managedOrg2.name);
+        expect(responseManagedOrg2?.metadata).toEqual(managedOrg2.metadata);
+
+        expect(responseBody.pagination).toBeDefined();
+        expect(responseBody.pagination.totalItems).toEqual(2);
+        expect(responseBody.pagination.remainingItems).toEqual(0);
+        expect(responseBody.pagination.returnedItems).toEqual(2);
+        expect(responseBody.pagination.itemsPerPage).toEqual(250);
+        expect(responseBody.pagination.currentPage).toEqual(1);
+        expect(responseBody.pagination.totalPages).toEqual(1);
+      });
+  });
+
+  it("should get managed organization by slug", async () => {
+    return request(app.getHttpServer())
+      .get(`/v2/organizations/${managerOrg.id}/organizations?slug=${managedOrg.slug}`)
+      .set("Authorization", `Bearer ${managerOrgAdminApiKey}`)
+      .expect(200)
       .then(async (response) => {
         const responseBody: GetManagedOrganizationsOutput = response.body;
         expect(responseBody.status).toEqual(SUCCESS_STATUS);
         const responseManagedOrgs = responseBody.data;
         expect(responseManagedOrgs?.length).toEqual(1);
-        const responseManagedOrg = responseManagedOrgs[0];
+        const responseManagedOrg = responseManagedOrgs.find((org) => org.id === managedOrg.id);
+        expect(responseManagedOrg?.id).toBeDefined();
+        expect(responseManagedOrg?.name).toEqual(managedOrg.name);
+        expect(responseManagedOrg?.metadata).toEqual(managedOrg.metadata);
+
+        expect(responseBody.pagination).toBeDefined();
+        expect(responseBody.pagination.totalItems).toEqual(1);
+        expect(responseBody.pagination.remainingItems).toEqual(0);
+        expect(responseBody.pagination.returnedItems).toEqual(1);
+        expect(responseBody.pagination.itemsPerPage).toEqual(250);
+        expect(responseBody.pagination.currentPage).toEqual(1);
+        expect(responseBody.pagination.totalPages).toEqual(1);
+      });
+  });
+
+  it("should get managed organization by metadata key", async () => {
+    return request(app.getHttpServer())
+      .get(
+        `/v2/organizations/${managerOrg.id}/organizations?metadataKey=${metadataKey}&metadataValue=${metadataValue}`
+      )
+      .set("Authorization", `Bearer ${managerOrgAdminApiKey}`)
+      .expect(200)
+      .then(async (response) => {
+        const responseBody: GetManagedOrganizationsOutput = response.body;
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        const responseManagedOrgs = responseBody.data;
+        expect(responseManagedOrgs?.length).toEqual(1);
+        const responseManagedOrg = responseManagedOrgs.find((org) => org.id === managedOrg.id);
         expect(responseManagedOrg?.id).toBeDefined();
         expect(responseManagedOrg?.name).toEqual(managedOrg.name);
         expect(responseManagedOrg?.metadata).toEqual(managedOrg.metadata);
@@ -465,7 +562,40 @@ describe("Organizations Organizations Endpoints", () => {
       });
   });
 
-  it("should delete managed organization ", async () => {
+  it("should delete managed organization", async () => {
+    return request(app.getHttpServer())
+      .delete(`/v2/organizations/${managerOrg.id}/organizations/${managedOrg2.id}`)
+      .set("Authorization", `Bearer ${managerOrgAdminApiKey}`)
+      .expect(200)
+      .then(async (response) => {
+        const responseBody: ApiSuccessResponse<ManagedOrganizationWithApiKeyOutput> = response.body;
+        expect(responseBody.status).toEqual(SUCCESS_STATUS);
+        const responseManagedOrg = responseBody.data;
+        expect(responseManagedOrg?.id).toBeDefined();
+        expect(responseManagedOrg?.id).toEqual(managedOrg2.id);
+        expect(responseManagedOrg?.name).toEqual(managedOrg2.name);
+
+        const managedOrgInDb =
+          await managedOrganizationsRepositoryFixture.getOrganizationWithManagedOrganizations(managedOrg2.id);
+        expect(managedOrgInDb).toEqual(null);
+
+        const billings = await platformBillingRepositoryFixture.getByCustomerSubscriptionIds(
+          managerOrgBilling.customerId,
+          managerOrgBilling.subscriptionId!
+        );
+        expect(billings).toBeDefined();
+        // note(Lauris): manager billing is left and other managed org
+        expect(billings?.length).toEqual(2);
+
+        const managerOrgInDb =
+          await managedOrganizationsRepositoryFixture.getOrganizationWithManagedOrganizations(managerOrg.id);
+        expect(managerOrgInDb).toBeDefined();
+        expect(managerOrgInDb?.id).toEqual(managerOrg.id);
+        expect(managerOrgInDb?.managedOrganizations?.length).toEqual(1);
+      });
+  });
+
+  it("should delete managed organization", async () => {
     return request(app.getHttpServer())
       .delete(`/v2/organizations/${managerOrg.id}/organizations/${managedOrg.id}`)
       .set("Authorization", `Bearer ${managerOrgAdminApiKey}`)

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

@@ -11,6 +11,7 @@ import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
 import { ApiAuthGuardUser } from "@/modules/auth/strategies/api-auth/api-auth.strategy";
 import { CreateOrganizationInput } from "@/modules/organizations/organizations/inputs/create-managed-organization.input";
+import { GetManagedOrganizationsInput_2024_08_13 } from "@/modules/organizations/organizations/inputs/get-managed-organizations.input";
 import { UpdateOrganizationInput } from "@/modules/organizations/organizations/inputs/update-managed-organization.input";
 import { CreateManagedOrganizationOutput } from "@/modules/organizations/organizations/outputs/create-managed-organization.output";
 import { GetManagedOrganizationOutput } from "@/modules/organizations/organizations/outputs/get-managed-organization.output";
@@ -102,10 +103,10 @@ export class OrganizationsOrganizationsController {
   })
   async getOrganizations(
     @Param("orgId", ParseIntPipe) managerOrganizationId: number,
-    @Query() queryPagination: SkipTakePagination
+    @Query() query: GetManagedOrganizationsInput_2024_08_13
   ): Promise<GetManagedOrganizationsOutput> {
     const { organizations, pagination: responsePagination } =
-      await this.managedOrganizationsService.getManagedOrganizations(managerOrganizationId, queryPagination);
+      await this.managedOrganizationsService.getManagedOrganizations(managerOrganizationId, query);
     return {
       status: SUCCESS_STATUS,
       data: organizations,

apps/api/v2/src/modules/organizations/organizations/services/managed-organizations.service.ts

@@ -5,11 +5,12 @@ import { ManagedOrganizationsBillingService } from "@/modules/billing/services/m
 import { OrganizationsRepository } from "@/modules/organizations/index/organizations.repository";
 import { OrganizationsMembershipService } from "@/modules/organizations/memberships/services/organizations-membership.service";
 import { CreateOrganizationInput } from "@/modules/organizations/organizations/inputs/create-managed-organization.input";
+import { GetManagedOrganizationsInput_2024_08_13 } from "@/modules/organizations/organizations/inputs/get-managed-organizations.input";
 import { UpdateOrganizationInput } from "@/modules/organizations/organizations/inputs/update-managed-organization.input";
 import { ManagedOrganizationsRepository } from "@/modules/organizations/organizations/managed-organizations.repository";
 import { ManagedOrganizationsOutputService } from "@/modules/organizations/organizations/services/managed-organizations-output.service";
 import { ProfilesRepository } from "@/modules/profiles/profiles.repository";
-import { ForbiddenException, Injectable, NotFoundException } from "@nestjs/common";
+import { ConflictException, ForbiddenException, Injectable, NotFoundException } from "@nestjs/common";
 
 import { slugify } from "@calcom/platform-libraries";
 import { SkipTakePagination } from "@calcom/platform-types";
@@ -44,6 +45,18 @@ export class ManagedOrganizationsService {
       organizationData.slug = slugify(organizationData.name);
     }
 
+    const existingManagedOrganization =
+      await this.managedOrganizationsRepository.getManagedOrganizationBySlug(
+        managerOrganizationId,
+        organizationData.slug
+      );
+
+    if (existingManagedOrganization) {
+      throw new ConflictException(
+        `Organization with slug '${organizationData.slug}' already exists. Please, either provide a different slug or change name so that the automatically generated slug is different.`
+      );
+    }
+
     const organization = await this.managedOrganizationsRepository.createManagedOrganization(
       managerOrganizationId,
       {
@@ -101,11 +114,14 @@ export class ManagedOrganizationsService {
     return this.managedOrganizationsOutputService.getOutputManagedOrganization(organization);
   }
 
-  async getManagedOrganizations(managerOrganizationId: number, pagination: SkipTakePagination) {
+  async getManagedOrganizations(
+    managerOrganizationId: number,
+    query: GetManagedOrganizationsInput_2024_08_13
+  ) {
     const { items: managedOrganizations, totalItems } =
       await this.managedOrganizationsRepository.getByManagerOrganizationIdPaginated(
         managerOrganizationId,
-        pagination
+        query
       );
 
     return {
@@ -113,7 +129,7 @@ export class ManagedOrganizationsService {
         this.managedOrganizationsOutputService.getOutputManagedOrganization(managedOrganization)
       ),
       pagination: getPagination({
-        ...pagination,
+        ...query,
         totalCount: totalItems,
       }),
     };

apps/api/v2/src/modules/organizations/routing-forms/controllers/organizations-routing-forms-responses.controller.e2e-spec.ts

@@ -37,7 +37,13 @@ describe("OrganizationsRoutingFormsResponsesController", () => {
   let user: User;
   const userEmail = `OrganizationsRoutingFormsResponsesController-key-bookings-2024-08-13-user-${randomString()}@api.com`;
   let profileRepositoryFixture: ProfileRepositoryFixture;
-
+  let routingEventType: {
+    id: number;
+    slug: string | null;
+    teamId: number | null;
+    userId: number | null;
+    title: string;
+  };
   let membershipsRepositoryFixture: MembershipRepositoryFixture;
   beforeAll(async () => {
     const moduleRef = await Test.createTestingModule({
@@ -72,6 +78,7 @@ describe("OrganizationsRoutingFormsResponsesController", () => {
       role: "OWNER",
       user: { connect: { id: user.id } },
       team: { connect: { id: org.id } },
+      accepted: true,
     });
 
     await profileRepositoryFixture.create({
@@ -93,14 +100,74 @@ describe("OrganizationsRoutingFormsResponsesController", () => {
     const { keyString } = await apiKeysRepositoryFixture.createApiKey(user.id, null);
     apiKeyString = `${keyString}`;
 
+    // Create an event type for routing form to route to
+    routingEventType = await prismaWriteService.prisma.eventType.create({
+      data: {
+        title: "Test Event Type",
+        slug: "test-event-type",
+        length: 30,
+        userId: user.id,
+        teamId: team.id,
+      },
+    });
+
     routingForm = await prismaWriteService.prisma.app_RoutingForms_Form.create({
       data: {
         name: "Test Routing Form",
         description: "Test Description",
         disabled: false,
-        routes: JSON.stringify([]),
-        fields: JSON.stringify([]),
-        settings: JSON.stringify({}),
+        routes: [
+          {
+            id: "route-1",
+            queryValue: {
+              id: "route-1",
+              type: "group",
+              children1: {
+                "rule-1": {
+                  type: "rule",
+                  properties: {
+                    field: "question1",
+                    operator: "equal",
+                    value: ["answer1"],
+                    valueSrc: ["value"],
+                    valueType: ["text"],
+                  },
+                },
+              },
+            },
+            action: {
+              type: "eventTypeRedirectUrl",
+              eventTypeId: routingEventType.id,
+              value: `team/${team.slug}/${routingEventType.slug}`,
+            },
+            isFallback: false,
+          },
+          {
+            id: "fallback-route",
+            action: { type: "customPageMessage", value: "Fallback Message" },
+            isFallback: true,
+            queryValue: { id: "fallback-route", type: "group" },
+          },
+        ],
+        fields: [
+          {
+            id: "question1",
+            type: "text",
+            label: "Question 1",
+            required: true,
+            identifier: "question1",
+          },
+          {
+            id: "question2",
+            type: "text",
+            label: "Question 2",
+            required: false,
+            identifier: "question2",
+          },
+        ],
+        settings: {
+          emailOwnerOnSubmission: false,
+        },
         teamId: team.id,
         userId: user.id,
       },
@@ -175,6 +242,381 @@ describe("OrganizationsRoutingFormsResponsesController", () => {
     });
   });
 
+  describe(`POST /v2/organizations/:orgId/routing-forms/:routingFormId/responses`, () => {
+    it("should return 403 when organization does not exist", async () => {
+      return request(app.getHttpServer())
+        .post(
+          `/v2/organizations/99999/routing-forms/${routingForm.id}/responses?start=2050-09-05&end=2050-09-06`
+        )
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          question1: "answer1",
+        })
+        .expect(403);
+    });
+
+    it("should return 404 when routing form does not exist", async () => {
+      return request(app.getHttpServer())
+        .post(
+          `/v2/organizations/${org.id}/routing-forms/non-existent-id/responses?start=2050-09-05&end=2050-09-06`
+        )
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          question1: "answer1",
+        })
+        .expect(404);
+    });
+
+    it("should return 401 when authentication token is missing", async () => {
+      return request(app.getHttpServer())
+        .post(
+          `/v2/organizations/${org.id}/routing-forms/${routingForm.id}/responses?start=2050-09-05&end=2050-09-06`
+        )
+        .send({
+          question1: "answer1",
+        })
+        .expect(401);
+    });
+
+    it("should create response and return available slots when routing to event type", async () => {
+      return request(app.getHttpServer())
+        .post(
+          `/v2/organizations/${org.id}/routing-forms/${routingForm.id}/responses?start=2050-09-05&end=2050-09-06`
+        )
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          question1: "answer1", // This matches the route condition
+          question2: "answer2",
+        })
+        .expect(201)
+        .then((response) => {
+          const responseBody = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          const data = responseBody.data;
+          expect(data).toBeDefined();
+          expect(data.routing?.responseId).toBeDefined();
+          expect(typeof data.routing?.responseId).toBe("number");
+          expect(data.eventTypeId).toEqual(routingEventType.id);
+          expect(data.slots).toBeDefined();
+          expect(typeof data.slots).toBe("object");
+        });
+    });
+
+    it("should return 400 when required form fields are missing", async () => {
+      return request(app.getHttpServer())
+        .post(
+          `/v2/organizations/${org.id}/routing-forms/${routingForm.id}/responses?start=2050-09-05&end=2050-09-06`
+        )
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          question2: "answer2", // Missing required question1
+        })
+        .expect(400);
+    });
+
+    it("should create response and return custom message if the routing is to custom page", async () => {
+      return request(app.getHttpServer())
+        .post(
+          `/v2/organizations/${org.id}/routing-forms/${routingForm.id}/responses?start=2050-09-05&end=2050-09-06`
+        )
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          question1: "different-answer", // This won't match any route
+          question2: "answer2",
+        })
+        .expect(201)
+        .then((response) => {
+          const responseBody = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          const data = responseBody.data;
+          expect(data).toBeDefined();
+          expect(data.routingCustomMessage).toBeDefined();
+          expect(data.routingCustomMessage).toBe("Fallback Message");
+        });
+    });
+
+    it("should return 400 when required slot query parameters are missing", async () => {
+      // Missing start parameter
+      await request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/routing-forms/${routingForm.id}/responses?end=2050-09-06`)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          question1: "answer1",
+          question2: "answer2",
+        })
+        .expect(400);
+
+      // Missing end parameter
+      await request(app.getHttpServer())
+        .post(`/v2/organizations/${org.id}/routing-forms/${routingForm.id}/responses?start=2050-09-05`)
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          question1: "answer1",
+          question2: "answer2",
+        })
+        .expect(400);
+    });
+
+    it("should return 400 when date parameters have invalid format", async () => {
+      return request(app.getHttpServer())
+        .post(
+          `/v2/organizations/${org.id}/routing-forms/${routingForm.id}/responses?start=invalid-date&end=2050-09-06`
+        )
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          question1: "answer1",
+        })
+        .expect(400);
+    });
+
+    it("should return 400 when end date is before start date", async () => {
+      return request(app.getHttpServer())
+        .post(
+          `/v2/organizations/${org.id}/routing-forms/${routingForm.id}/responses?start=2050-09-10&end=2050-09-05`
+        )
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          question1: "answer1",
+        })
+        .expect(400);
+    });
+
+    it("should return 403 when user lacks permission to access organization", async () => {
+      // Create a new user without organization access
+      const unauthorizedUser = await userRepositoryFixture.create({
+        email: `unauthorized-user-${randomString()}@api.com`,
+      });
+
+      const { keyString: unauthorizedApiKey } = await apiKeysRepositoryFixture.createApiKey(
+        unauthorizedUser.id,
+        null
+      );
+
+      const response = await request(app.getHttpServer())
+        .post(
+          `/v2/organizations/${org.id}/routing-forms/${routingForm.id}/responses?start=2050-09-05&end=2050-09-06`
+        )
+        .set({ Authorization: `Bearer cal_test_${unauthorizedApiKey}` })
+        .send({
+          question1: "answer1",
+        });
+
+      expect(response.status).toBe(403);
+
+      // Clean up
+      await prismaWriteService.prisma.user.delete({
+        where: { id: unauthorizedUser.id },
+      });
+    });
+
+    it("should handle queued response creation", async () => {
+      return request(app.getHttpServer())
+        .post(
+          `/v2/organizations/${org.id}/routing-forms/${routingForm.id}/responses?start=2050-09-05&end=2050-09-06&queueResponse=true`
+        )
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          question1: "answer1",
+          question2: "answer2",
+        })
+        .expect(201)
+        .then((response) => {
+          const responseBody = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          const data = responseBody.data;
+          expect(data.routing?.queuedResponseId).toBeDefined();
+        });
+    });
+
+    it("should return 500 when event type is not found", async () => {
+      // Create a routing form with an invalid eventTypeId
+      const routingFormWithInvalidEventType = await prismaWriteService.prisma.app_RoutingForms_Form.create({
+        data: {
+          name: "Test Routing Form with Invalid Event Type",
+          description: "Test Description",
+          disabled: false,
+          routes: [
+            {
+              id: "route-1",
+              queryValue: {
+                id: "route-1",
+                type: "group",
+                children1: {
+                  "rule-1": {
+                    type: "rule",
+                    properties: {
+                      field: "question1",
+                      operator: "equal",
+                      value: ["answer1"],
+                      valueSrc: ["value"],
+                      valueType: ["text"],
+                    },
+                  },
+                },
+              },
+              action: {
+                type: "eventTypeRedirectUrl",
+                eventTypeId: 99999, // Invalid event type ID
+                value: `team/${team.slug}/non-existent-event-type`,
+              },
+              isFallback: false,
+            },
+            {
+              id: "fallback-route",
+              action: { type: "customPageMessage", value: "Fallback Message" },
+              isFallback: true,
+              queryValue: { id: "fallback-route", type: "group" },
+            },
+          ],
+          fields: [
+            {
+              id: "question1",
+              type: "text",
+              label: "Question 1",
+              required: true,
+              identifier: "question1",
+            },
+          ],
+          settings: {
+            emailOwnerOnSubmission: false,
+          },
+          teamId: team.id,
+          userId: user.id,
+        },
+      });
+
+      // Try to create a response for the form with invalid event type
+      const response = await request(app.getHttpServer())
+        .post(
+          `/v2/organizations/${org.id}/routing-forms/${routingFormWithInvalidEventType.id}/responses?start=2050-09-05&end=2050-09-06`
+        )
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          question1: "answer1",
+        });
+
+      expect(response.status).toBe(500);
+
+      // Clean up the form
+      await prismaWriteService.prisma.app_RoutingForms_Form.delete({
+        where: { id: routingFormWithInvalidEventType.id },
+      });
+    });
+
+    it("should handle routing with team member assignments", async () => {
+      // This test verifies that routing forms can handle team member assignments
+      // and that the routing returns the correct team member information
+      return request(app.getHttpServer())
+        .post(
+          `/v2/organizations/${org.id}/routing-forms/${routingForm.id}/responses?start=2050-09-05&end=2050-09-06`
+        )
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          question1: "answer1", // This matches the route condition
+          question2: "answer2",
+        })
+        .expect(201)
+        .then((response) => {
+          const responseBody = response.body;
+          expect(responseBody.status).toEqual(SUCCESS_STATUS);
+          const data = responseBody.data;
+          expect(data).toBeDefined();
+          expect(data.routing?.responseId).toBeDefined();
+          expect(typeof data.routing?.responseId).toBe("number");
+          expect(data.eventTypeId).toEqual(routingEventType.id);
+          expect(data.slots).toBeDefined();
+          // Team member assignments would be part of the routing data
+          // This test validates the basic routing functionality works
+        });
+    });
+
+    it("should return external redirect URL when routing to external URL", async () => {
+      // Create a routing form with external redirect action
+      const externalRoutingForm = await prismaWriteService.prisma.app_RoutingForms_Form.create({
+        data: {
+          name: "Test External Routing Form",
+          description: "Test Description for External Redirect",
+          disabled: false,
+          routes: [
+            {
+              id: "external-route-1",
+              queryValue: {
+                id: "external-route-1",
+                type: "group",
+                children1: {
+                  "rule-1": {
+                    type: "rule",
+                    properties: {
+                      field: "question1",
+                      operator: "equal",
+                      value: ["external"],
+                      valueSrc: ["value"],
+                      valueType: ["text"],
+                    },
+                  },
+                },
+              },
+              action: {
+                type: "externalRedirectUrl",
+                value: "https://example.com/external-booking",
+              },
+              isFallback: false,
+            },
+            {
+              id: "fallback-route",
+              action: { type: "customPageMessage", value: "Fallback Message" },
+              isFallback: true,
+              queryValue: { id: "fallback-route", type: "group" },
+            },
+          ],
+          fields: [
+            {
+              id: "question1",
+              type: "text",
+              label: "Question 1",
+              required: true,
+              identifier: "question1",
+            },
+          ],
+          settings: {
+            emailOwnerOnSubmission: false,
+          },
+          teamId: team.id,
+          userId: user.id,
+        },
+      });
+
+      const response = await request(app.getHttpServer())
+        .post(
+          `/v2/organizations/${org.id}/routing-forms/${externalRoutingForm.id}/responses?start=2050-09-05&end=2050-09-06`
+        )
+        .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+        .send({
+          question1: "external", // This matches the route condition for external redirect
+        })
+        .expect(201);
+
+      const responseBody = response.body;
+      expect(responseBody.status).toEqual(SUCCESS_STATUS);
+      const data = responseBody.data;
+      expect(data).toBeDefined();
+      expect(data.routingExternalRedirectUrl).toBeDefined();
+      expect(data.routingExternalRedirectUrl).toContain("https://example.com/external-booking");
+      expect(data.routingExternalRedirectUrl).toContain("cal.action=externalRedirectUrl");
+
+      // Verify that it doesn't contain event type routing data
+      expect(data.eventTypeId).toBeUndefined();
+      expect(data.slots).toBeUndefined();
+      expect(data.routing).toBeUndefined();
+      expect(data.routingCustomMessage).toBeUndefined();
+
+      // Clean up the external routing form
+      await prismaWriteService.prisma.app_RoutingForms_Form.delete({
+        where: { id: externalRoutingForm.id },
+      });
+    });
+  });
+
   describe(`PATCH /v2/organizations/:orgId/routing-forms/:routingFormId/responses/:responseId`, () => {
     it("should not update routing form response for non existing org", async () => {
       return request(app.getHttpServer())

apps/api/v2/src/modules/organizations/routing-forms/controllers/organizations-routing-forms-responses.controller.ts

@@ -9,13 +9,28 @@ import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
 import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
 import { GetRoutingFormResponsesOutput } from "@/modules/organizations/routing-forms/outputs/get-routing-form-responses.output";
 import { OrganizationsRoutingFormsResponsesService } from "@/modules/organizations/routing-forms/services/organizations-routing-forms-responses.service";
-import { Body, Controller, Get, Param, Patch, Query, UseGuards, ParseIntPipe } from "@nestjs/common";
+import {
+  Body,
+  Controller,
+  Get,
+  Param,
+  Patch,
+  Post,
+  Query,
+  UseGuards,
+  ParseIntPipe,
+  Req,
+} from "@nestjs/common";
 import { ApiHeader, ApiOperation, ApiTags } from "@nestjs/swagger";
+import { Request } from "express";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import { GetAvailableSlotsInput_2024_09_04 } from "@calcom/platform-types";
 
+import { CreateRoutingFormResponseInput } from "../inputs/create-routing-form-response.input";
 import { GetRoutingFormResponsesParams } from "../inputs/get-routing-form-responses-params.input";
 import { UpdateRoutingFormResponseInput } from "../inputs/update-routing-form-response.input";
+import { CreateRoutingFormResponseOutput } from "../outputs/create-routing-form-response.output";
 import { UpdateRoutingFormResponseOutput } from "../outputs/update-routing-form-response.output";
 
 @Controller({
@@ -56,6 +71,29 @@ export class OrganizationsRoutingFormsResponsesController {
     };
   }
 
+  @Post("/")
+  @ApiOperation({ summary: "Create routing form response and get available slots" })
+  @Roles("ORG_ADMIN")
+  @PlatformPlan("ESSENTIALS")
+  async createRoutingFormResponse(
+    @Param("orgId", ParseIntPipe) orgId: number,
+    @Param("routingFormId") routingFormId: string,
+    @Query() query: CreateRoutingFormResponseInput,
+    @Req() request: Request
+  ): Promise<CreateRoutingFormResponseOutput> {
+    const result = await this.organizationsRoutingFormsResponsesService.createRoutingFormResponseWithSlots(
+      orgId,
+      routingFormId,
+      query,
+      request
+    );
+
+    return {
+      status: SUCCESS_STATUS,
+      data: result,
+    };
+  }
+
   @Patch("/:responseId")
   @ApiOperation({ summary: "Update routing form response" })
   @Roles("ORG_ADMIN")

apps/api/v2/src/modules/organizations/routing-forms/inputs/create-routing-form-response.input.ts

@@ -0,0 +1,23 @@
+import { ApiPropertyOptional } from "@nestjs/swagger";
+import { Transform } from "class-transformer";
+import { IsBoolean, IsOptional } from "class-validator";
+
+import { GetAvailableSlotsInput_2024_09_04 } from "@calcom/platform-types";
+
+export class CreateRoutingFormResponseInput extends GetAvailableSlotsInput_2024_09_04 {
+  @Transform(({ value }: { value: string | boolean }) => {
+    if (typeof value === "boolean") return value;
+    if (typeof value === "string") {
+      return value.toLowerCase() === "true";
+    }
+    return undefined;
+  })
+  @IsBoolean()
+  @IsOptional()
+  @ApiPropertyOptional({
+    type: Boolean,
+    description: "Whether to queue the form response.",
+    example: true,
+  })
+  queueResponse?: boolean;
+}

apps/api/v2/src/modules/organizations/routing-forms/organizations-routing-forms.module.ts

@@ -4,7 +4,9 @@ import { OrganizationsTeamsRoutingFormsResponsesOutputService } from "@/modules/
 import { PrismaModule } from "@/modules/prisma/prisma.module";
 import { RedisModule } from "@/modules/redis/redis.module";
 import { RoutingFormsModule } from "@/modules/routing-forms/routing-forms.module";
+import { SlotsModule_2024_09_04 } from "@/modules/slots/slots-2024-09-04/slots.module";
 import { StripeModule } from "@/modules/stripe/stripe.module";
+import { TeamsEventTypesRepository } from "@/modules/teams/event-types/teams-event-types.repository";
 import { Module } from "@nestjs/common";
 
 import { OrganizationsRoutingFormsResponsesController } from "./controllers/organizations-routing-forms-responses.controller";
@@ -14,7 +16,7 @@ import { OrganizationsRoutingFormsResponsesService } from "./services/organizati
 import { OrganizationsRoutingFormsService } from "./services/organizations-routing-forms.service";
 
 @Module({
-  imports: [PrismaModule, StripeModule, RedisModule, RoutingFormsModule],
+  imports: [PrismaModule, StripeModule, RedisModule, RoutingFormsModule, SlotsModule_2024_09_04],
   providers: [
     MembershipsRepository,
     OrganizationsRepository,
@@ -22,6 +24,7 @@ import { OrganizationsRoutingFormsService } from "./services/organizations-routi
     OrganizationsRoutingFormsService,
     OrganizationsRoutingFormsResponsesService,
     OrganizationsTeamsRoutingFormsResponsesOutputService,
+    TeamsEventTypesRepository,
   ],
   controllers: [OrganizationsRoutingFormsController, OrganizationsRoutingFormsResponsesController],
 })

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

@@ -0,0 +1,141 @@
+import { ApiProperty, ApiPropertyOptional, getSchemaPath } from "@nestjs/swagger";
+import { Type } from "class-transformer";
+import { IsArray, IsBoolean, IsInt, IsNumber, IsOptional, IsString, ValidateNested } from "class-validator";
+
+import {
+  ApiResponseWithoutData,
+  SlotsOutput_2024_09_04,
+  RangeSlotsOutput_2024_09_04,
+} from "@calcom/platform-types";
+
+class Routing {
+  @ApiProperty({
+    type: String,
+    description: "The ID of the queued form response. Only present if the form response was queued.",
+    example: "123",
+  })
+  @IsString()
+  @IsOptional()
+  @ApiPropertyOptional()
+  queuedResponseId?: string | null;
+
+  @ApiProperty({
+    type: Number,
+    description: "The ID of the routing form response.",
+    example: 123,
+  })
+  @IsInt()
+  @IsOptional()
+  @ApiPropertyOptional()
+  responseId?: number | null;
+
+  @ApiProperty({
+    type: [Number],
+    description: "Array of team member IDs that were routed to handle this booking.",
+    example: [101, 102],
+  })
+  @IsArray()
+  @IsInt({ each: true })
+  teamMemberIds!: number[];
+
+  @ApiPropertyOptional({
+    type: String,
+    description: "The email of the team member assigned to handle this booking.",
+    example: "john.doe@example.com",
+  })
+  @IsString()
+  @IsOptional()
+  teamMemberEmail?: string;
+
+  @ApiPropertyOptional({
+    type: Boolean,
+    description: "Whether to skip contact owner assignment from CRM integration.",
+    example: true,
+  })
+  @IsBoolean()
+  @IsOptional()
+  skipContactOwner?: boolean;
+
+  @ApiPropertyOptional({
+    type: String,
+    description: "The CRM application slug for integration.",
+    example: "salesforce",
+  })
+  @IsString()
+  @IsOptional()
+  crmAppSlug?: string;
+
+  @ApiPropertyOptional({
+    type: String,
+    description: "The CRM owner record type for contact assignment.",
+    example: "Account",
+  })
+  @IsString()
+  @IsOptional()
+  crmOwnerRecordType?: string;
+}
+
+export class CreateRoutingFormResponseOutputData {
+  @ApiPropertyOptional({
+    type: Number,
+    description: "The ID of the event type that was routed to.",
+    example: 123,
+  })
+  @IsNumber()
+  @IsOptional()
+  eventTypeId?: number;
+
+  @ValidateNested()
+  @ApiProperty({ type: Routing })
+  @Type(() => Routing)
+  @ApiPropertyOptional({
+    type: Routing,
+    description: "The routing information.",
+    example: {
+      eventTypeId: 123,
+      routing: {
+        teamMemberIds: [101, 102],
+        teamMemberEmail: "john.doe@example.com",
+        skipContactOwner: true,
+      },
+    },
+  })
+  @ValidateNested()
+  @Type(() => Routing)
+  routing?: Routing;
+
+  @IsString()
+  @IsOptional()
+  @ApiPropertyOptional({
+    type: String,
+    description: "A custom message to be displayed to the user in case of routing to a custom page.",
+    example: "This is a custom message.",
+  })
+  routingCustomMessage?: string;
+
+  @IsString()
+  @IsOptional()
+  @ApiPropertyOptional({
+    type: String,
+    description: "The external redirect URL to be used in case of routing to a non cal.com event type URL.",
+    example: "https://example.com/",
+  })
+  routingExternalRedirectUrl?: string;
+
+  @ValidateNested()
+  @ApiProperty({
+    oneOf: [
+      { $ref: getSchemaPath(SlotsOutput_2024_09_04) },
+      { $ref: getSchemaPath(RangeSlotsOutput_2024_09_04) },
+    ],
+  })
+  @Type(() => Object)
+  slots?: SlotsOutput_2024_09_04 | RangeSlotsOutput_2024_09_04;
+}
+
+export class CreateRoutingFormResponseOutput extends ApiResponseWithoutData {
+  @ValidateNested()
+  @ApiProperty({ type: CreateRoutingFormResponseOutputData })
+  @Type(() => CreateRoutingFormResponseOutputData)
+  data!: CreateRoutingFormResponseOutputData;
+}

apps/api/v2/src/modules/organizations/routing-forms/services/organizations-routing-forms-responses.service.ts

@@ -1,12 +1,28 @@
 import { OrganizationsRoutingFormsRepository } from "@/modules/organizations/routing-forms/organizations-routing-forms.repository";
 import { OrganizationsTeamsRoutingFormsResponsesOutputService } from "@/modules/organizations/teams/routing-forms/services/organizations-teams-routing-forms-responses-output.service";
-import { Injectable } from "@nestjs/common";
+import { SlotsService_2024_09_04 } from "@/modules/slots/slots-2024-09-04/services/slots.service";
+import { TeamsEventTypesRepository } from "@/modules/teams/event-types/teams-event-types.repository";
+import {
+  BadRequestException,
+  Injectable,
+  NotFoundException,
+  InternalServerErrorException,
+} from "@nestjs/common";
+import { Request } from "express";
+
+import { getRoutedUrl } from "@calcom/platform-libraries";
+import { ById_2024_09_04_type } from "@calcom/platform-types";
+
+import type { CreateRoutingFormResponseInput } from "../inputs/create-routing-form-response.input";
+import type { CreateRoutingFormResponseOutputData } from "../outputs/create-routing-form-response.output";
 
 @Injectable()
 export class OrganizationsRoutingFormsResponsesService {
   constructor(
     private readonly organizationsRoutingFormsRepository: OrganizationsRoutingFormsRepository,
-    private readonly outputService: OrganizationsTeamsRoutingFormsResponsesOutputService
+    private readonly outputService: OrganizationsTeamsRoutingFormsResponsesOutputService,
+    private readonly slotsService: SlotsService_2024_09_04,
+    private readonly teamsEventTypesRepository: TeamsEventTypesRepository
   ) {}
 
   async getOrganizationRoutingFormResponses(
@@ -52,4 +68,201 @@ export class OrganizationsRoutingFormsResponsesService {
 
     return this.outputService.getRoutingFormResponses([updatedResponse])[0];
   }
+
+  async createRoutingFormResponseWithSlots(
+    orgId: number,
+    routingFormId: string,
+    query: CreateRoutingFormResponseInput,
+    request: Request
+  ): Promise<CreateRoutingFormResponseOutputData> {
+    const { queueResponse, ...slotsQuery } = query;
+
+    this.validateDateRange(slotsQuery.start, slotsQuery.end);
+
+    const { redirectUrl, customMessage } = await this.getRoutingUrl(
+      request,
+      routingFormId,
+      queueResponse ?? false
+    );
+
+    // If there is no redirect URL, then we have to show the message as that would be custom page message to be shown as per the route chosen
+    if (!redirectUrl) {
+      return {
+        routingCustomMessage: customMessage,
+      };
+    }
+
+    if (!this.isEventTypeRedirectUrl(redirectUrl)) {
+      return {
+        routingExternalRedirectUrl: redirectUrl.toString(),
+      };
+    }
+
+    // Extract event type information from the routed URL
+    const { eventTypeId, crmParams } = await this.extractEventTypeAndCrmParams(redirectUrl);
+
+    const paramsForGetAvailableSlots = {
+      type: ById_2024_09_04_type,
+      eventTypeId,
+      ...slotsQuery,
+      ...crmParams,
+    } as const;
+
+    // Get available slots using the slots service with CRM parameters
+    const slots = await this.slotsService.getAvailableSlots(paramsForGetAvailableSlots);
+    const teamMemberIds = crmParams.routedTeamMemberIds ?? [];
+    const teamMemberEmail = crmParams.teamMemberEmail ?? undefined;
+    const skipContactOwner = crmParams.skipContactOwner ?? undefined;
+    const queuedResponseId = crmParams.queuedFormResponseId ?? null;
+    const responseId = crmParams.routingFormResponseId ?? null;
+    const crmAppSlug = crmParams.crmAppSlug ?? undefined;
+    const crmOwnerRecordType = crmParams.crmOwnerRecordType ?? undefined;
+
+    if (responseId) {
+      return {
+        routing: {
+          responseId,
+          teamMemberEmail,
+          teamMemberIds,
+          skipContactOwner,
+          crmAppSlug,
+          crmOwnerRecordType,
+        },
+        eventTypeId,
+        slots,
+      };
+    }
+
+    if (!queuedResponseId) {
+      throw new InternalServerErrorException(
+        "No routing form response ID or queued form response ID could be found."
+      );
+    }
+
+    return {
+      routing: {
+        queuedResponseId,
+        teamMemberEmail,
+        teamMemberIds,
+        skipContactOwner,
+        crmAppSlug,
+        crmOwnerRecordType,
+      },
+      eventTypeId,
+      slots,
+    };
+  }
+
+  private validateDateRange(start: string, end: string) {
+    const startDate = new Date(start);
+    const endDate = new Date(end);
+
+    if (endDate < startDate) {
+      throw new BadRequestException("End date cannot be before start date.");
+    }
+  }
+
+  private async getRoutingUrl(request: Request, formId: string, queueResponse: boolean) {
+    const params = Object.fromEntries(new URLSearchParams(request.body));
+    const routedUrlData = await getRoutedUrl(
+      {
+        req: request,
+        query: { ...params, form: formId, ...(queueResponse && { "cal.queueFormResponse": "true" }) },
+      },
+      true
+    );
+
+    if (routedUrlData.notFound) {
+      throw new NotFoundException("Routing form not found.");
+    }
+
+    if (routedUrlData?.props?.errorMessage) {
+      throw new BadRequestException(routedUrlData.props.errorMessage);
+    }
+
+    const destination = routedUrlData?.redirect?.destination;
+
+    if (!destination) {
+      if (routedUrlData?.props?.message) {
+        return {
+          redirectUrl: null,
+          customMessage: routedUrlData.props.message,
+        };
+      }
+      // This should never happen because there is always a fallback route
+      throw new InternalServerErrorException("No route found.");
+    }
+
+    return {
+      redirectUrl: new URL(destination),
+      customMessage: null,
+    };
+  }
+
+  private async extractEventTypeAndCrmParams(routingUrl: URL) {
+    // Extract team and event type information
+    const { teamId, eventTypeSlug } = this.extractTeamIdAndEventTypeSlugFromRedirectUrl(routingUrl);
+    const eventType = await this.teamsEventTypesRepository.getEventTypeByTeamIdAndSlug(teamId, eventTypeSlug);
+
+    if (!eventType?.id) {
+      // This could only happen if the event-type earlier selected as route action was deleted
+      throw new InternalServerErrorException("Chosen event type not found.");
+    }
+
+    // Extract CRM parameters from URL
+    const urlParams = routingUrl.searchParams;
+    const crmParams = {
+      teamMemberEmail: urlParams.get("cal.crmContactOwnerEmail") || undefined,
+      routedTeamMemberIds: urlParams.get("cal.routedTeamMemberIds")
+        ? urlParams
+            .get("cal.routedTeamMemberIds")!
+            .split(",")
+            .map((id) => parseInt(id))
+        : undefined,
+      routingFormResponseId: urlParams.get("cal.routingFormResponseId")
+        ? parseInt(urlParams.get("cal.routingFormResponseId")!)
+        : undefined,
+      queuedFormResponseId: urlParams.get("cal.queuedFormResponseId")
+        ? (urlParams.get("cal.queuedFormResponseId") as string)
+        : undefined,
+      skipContactOwner: urlParams.get("cal.skipContactOwner") === "true" ? true : false,
+      crmAppSlug: urlParams.get("cal.crmAppSlug") || undefined,
+      crmOwnerRecordType: urlParams.get("cal.crmContactOwnerRecordType") || undefined,
+    };
+
+    return {
+      eventTypeId: eventType.id,
+      crmParams,
+    };
+  }
+
+  private isEventTypeRedirectUrl(routingUrl: URL) {
+    const routingSearchParams = routingUrl.searchParams;
+    return routingSearchParams.get("cal.action") === "eventTypeRedirectUrl";
+  }
+
+  private extractTeamIdAndEventTypeSlugFromRedirectUrl(routingUrl: URL) {
+    const eventTypeSlug = this.extractEventTypeFromRoutedUrl(routingUrl);
+    const teamId = this.extractTeamIdFromRoutedUrl(routingUrl);
+
+    if (!teamId) {
+      throw new NotFoundException("Team ID not found in the routed URL.");
+    }
+
+    if (!eventTypeSlug) {
+      throw new NotFoundException("Event type slug not found in the routed URL.");
+    }
+
+    return { teamId, eventTypeSlug };
+  }
+
+  private extractTeamIdFromRoutedUrl(routingUrl: URL) {
+    const routingSearchParams = routingUrl.searchParams;
+    return Number(routingSearchParams.get("cal.teamId"));
+  }
+
+  private extractEventTypeFromRoutedUrl(routingUrl: URL) {
+    const pathNameParams = routingUrl.pathname.split("/");
+    return pathNameParams[pathNameParams.length - 1];
+  }
 }

apps/api/v2/src/modules/organizations/stripe/organizations-stripe.controller.ts

@@ -53,7 +53,7 @@ export type OAuthCallbackState = {
   path: "/v2/organizations/:orgId/teams/:teamId/stripe",
   version: API_VERSIONS_VALUES,
 })
-@DocsTags("Organizations/Teams Stripe")
+@DocsTags("Orgs / Teams / Stripe")
 export class OrganizationsStripeController {
   constructor(
     private readonly organizationsStripeService: OrganizationsStripeService,
@@ -65,7 +65,7 @@ export class OrganizationsStripeController {
   @UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard, IsTeamInOrg, PlatformPlanGuard, IsAdminAPIEnabledGuard)
   @Get("/connect")
   @HttpCode(HttpStatus.OK)
-  @ApiOperation({ summary: "Get stripe connect URL for a team" })
+  @ApiOperation({ summary: "Get Stripe connect URL for a team" })
   async getTeamStripeConnectUrl(
     @Req() req: Request,
     @Headers("Authorization") authorization: string,
@@ -104,7 +104,7 @@ export class OrganizationsStripeController {
   @UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard, IsTeamInOrg, PlatformPlanGuard, IsAdminAPIEnabledGuard)
   @Get("/check")
   @HttpCode(HttpStatus.OK)
-  @ApiOperation({ summary: "Check team stripe connection" })
+  @ApiOperation({ summary: "Check team Stripe connection" })
   async checkTeamStripeConnection(
     @Param("teamId", ParseIntPipe) teamId: number
   ): Promise<StripCredentialsCheckOutputResponseDto> {
@@ -116,7 +116,7 @@ export class OrganizationsStripeController {
   @UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard, IsTeamInOrg, PlatformPlanGuard, IsAdminAPIEnabledGuard)
   @Get("/save")
   @Redirect(undefined, 301)
-  @ApiOperation({ summary: "Save stripe credentials" })
+  @ApiOperation({ summary: "Save Stripe credentials" })
   async save(
     @Query("state") state: string,
     @Query("code") code: string,

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

@@ -80,7 +80,7 @@ export class OrganizationsTeamsBookingsController {
     IsAdminAPIEnabledGuard
   )
   @ApiOperation({
-    summary: "Get 'Booking References' for a booking",
+    summary: "Get booking references",
   })
   @HttpCode(HttpStatus.OK)
   async getBookingReferences(