chore: release v5.6.8

* fix: Missing personal event types in All filter

Signed-off-by: Anirban Singha <anirbansingha20@gmail.com>

* chore: coderabbit suggestion

Signed-off-by: Anirban Singha <anirbansingha20@gmail.com>

* chore: export function

* chore: Add test file

Signed-off-by: Anirban Singha <anirbansingha20@gmail.com>

---------

Signed-off-by: Anirban Singha <anirbansingha20@gmail.com>
Co-authored-by: Kartik Saini <41051387+kart1ka@users.noreply.github.com>

.github/workflows/all-checks.yml

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

.github/workflows/e2e-atoms.yml

@@ -1,15 +1,7 @@
 name: Atoms E2E Tests
 
 on:
-  pull_request:
+  workflow_call:
-    branches:
-      - main
-    paths:
-      - 'packages/platform/atoms/**'
-      - 'packages/platform/examples/base/**'
-      - 'apps/api/v2/**'
-      - '.github/workflows/atoms-e2e.yml'
-
 permissions:
   actions: write
   contents: read
@@ -25,7 +17,7 @@ env:
   DATABASE_URL: ${{ secrets.CI_DATABASE_URL }}
 
 jobs:
-  atoms-e2e:
+  e2e-atoms:
     timeout-minutes: 15
     name: Atoms E2E Tests
     runs-on: buildjet-4vcpu-ubuntu-2204
@@ -45,13 +37,13 @@ jobs:
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: atoms-e2e-test-results
+          name: e2e-atoms-test-results
           path: test-results
           retention-days: 7
       - name: Upload Playwright Report
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: atoms-e2e-playwright-report
+          name: e2e-atoms-playwright-report
           path: playwright-report
           retention-days: 7

.github/workflows/labeler.yml

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

.github/workflows/performance-tests.yml

@@ -0,0 +1,65 @@
+name: Performance Tests
+
+on:
+  release:
+    types: [created]
+  workflow_dispatch:
+    inputs:
+      base_url:
+        description: 'Base URL for performance tests'
+        required: false
+        default: 'https://cal.dev'
+
+jobs:
+  performance-tests:
+    runs-on: ubuntu-latest
+    env:
+      BASE_URL: ${{ github.event.inputs.base_url || 'https://cal.dev' }}
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Setup K6
+        uses: grafana/setup-k6-action@v1
+        with:
+          k6-version: '1.0.0'
+
+      - name: Run Smoke Tests
+        uses: grafana/run-k6-action@v1
+        env:
+          K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
+          K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}
+        with:
+          path: tests/performance/smoke/*.js
+          cloud-run-locally: true
+          fail-fast: true
+
+      - name: Run Load Tests
+        uses: grafana/run-k6-action@v1
+        env:
+          K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
+          K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}
+        with:
+          path: tests/performance/load/*.js
+          cloud-run-locally: true
+          fail-fast: true
+
+      - name: Run Stress Tests
+        uses: grafana/run-k6-action@v1
+        env:
+          K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
+          K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}
+        with:
+          path: tests/performance/stress/*.js
+          cloud-run-locally: true
+          fail-fast: true
+
+      - name: Run Spike Tests
+        uses: grafana/run-k6-action@v1
+        env:
+          K6_CLOUD_TOKEN: ${{ secrets.K6_CLOUD_TOKEN }}
+          K6_CLOUD_PROJECT_ID: ${{ secrets.K6_CLOUD_PROJECT_ID }}
+        with:
+          path: tests/performance/spike/*.js
+          cloud-run-locally: true
+          fail-fast: true

.github/workflows/pr.yml

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

.yarn/versions/27b1f95d.yml

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

.yarn/versions/446af0f7.yml

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

.yarn/versions/967d61fb.yml

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

.yarn/versions/eb32fb15.yml

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

apps/api/v2/package.json

@@ -38,7 +38,7 @@
     "@axiomhq/winston": "^1.2.0",
     "@calcom/platform-constants": "*",
     "@calcom/platform-enums": "*",
-    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.320",
+    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.335",
     "@calcom/platform-types": "*",
     "@calcom/platform-utils": "*",
     "@calcom/prisma": "*",

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

@@ -22,6 +22,7 @@ import { BookingSeatModule } from "@/modules/booking-seat/booking-seat.module";
 import { BookingSeatRepository } from "@/modules/booking-seat/booking-seat.repository";
 import { CredentialsRepository } from "@/modules/credentials/credentials.repository";
 import { KyselyModule } from "@/modules/kysely/kysely.module";
+import { MembershipsModule } from "@/modules/memberships/memberships.module";
 import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
 import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth-clients-users.service";
 import { OAuthFlowService } from "@/modules/oauth-clients/services/oauth-flow.service";
@@ -53,6 +54,7 @@ import { Module } from "@nestjs/common";
     StripeModule,
     TeamsModule,
     TeamsEventTypesModule,
+    MembershipsModule,
   ],
   providers: [
     TokensRepository,

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

@@ -13,10 +13,14 @@ import { CalVideoService } from "@/ee/bookings/2024-08-13/services/cal-video.ser
 import { VERSION_2024_08_13_VALUE, VERSION_2024_08_13 } from "@/lib/api-versions";
 import { API_KEY_OR_ACCESS_TOKEN_HEADER } from "@/lib/docs/headers";
 import { PlatformPlan } from "@/modules/auth/decorators/billing/platform-plan.decorator";
+import {
+  AuthOptionalUser,
+  GetOptionalUser,
+} from "@/modules/auth/decorators/get-optional-user/get-optional-user.decorator";
 import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
 import { Permissions } from "@/modules/auth/decorators/permissions/permissions.decorator";
-import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
 import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { OptionalApiAuthGuard } from "@/modules/auth/guards/optional-api-auth/optional-api-auth.guard";
 import { PermissionsGuard } from "@/modules/auth/guards/permissions/permissions.guard";
 import { UsersService } from "@/modules/users/services/users.service";
 import { UserWithProfile } from "@/modules/users/users.repository";
@@ -96,6 +100,7 @@ export class BookingsController_2024_08_13 {
   ) {}
 
   @Post("/")
+  @UseGuards(OptionalApiAuthGuard)
   @ApiOperation({
     summary: "Create a booking",
     description: `
@@ -138,9 +143,10 @@ export class BookingsController_2024_08_13 {
   async createBooking(
     @Body(new CreateBookingInputPipe())
     body: CreateBookingInput,
-    @Req() request: Request
+    @Req() request: Request,
+    @GetOptionalUser() user: AuthOptionalUser
   ): Promise<CreateBookingOutput_2024_08_13> {
-    const booking = await this.bookingsService.createBooking(request, body);
+    const booking = await this.bookingsService.createBooking(request, body, user);
 
     if (Array.isArray(booking)) {
       await this.bookingsService.billBookings(booking);

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

@@ -3,6 +3,7 @@ import { AppModule } from "@/app.module";
 import { HttpExceptionFilter } from "@/filters/http-exception.filter";
 import { PrismaExceptionFilter } from "@/filters/prisma-exception.filter";
 import { Locales } from "@/lib/enums/locales";
+import { MembershipsModule } from "@/modules/memberships/memberships.module";
 import {
   CreateManagedUserData,
   CreateManagedUserOutput,
@@ -80,7 +81,7 @@ describe("Managed user bookings 2024-08-13", () => {
   beforeAll(async () => {
     const moduleRef = await Test.createTestingModule({
       providers: [PrismaExceptionFilter, HttpExceptionFilter],
-      imports: [AppModule, UsersModule],
+      imports: [AppModule, UsersModule, MembershipsModule],
     }).compile();
 
     app = moduleRef.createNestApplication();
@@ -772,6 +773,77 @@ describe("Managed user bookings 2024-08-13", () => {
     });
   });
 
+  describe("event type booking requires authentication", () => {
+    let eventTypeRequiringAuthenticationId: number;
+
+    let body: CreateBookingInput_2024_08_13;
+
+    beforeAll(async () => {
+      const eventTypeRequiringAuthentication = await eventTypesRepositoryFixture.create(
+        {
+          title: `event-type-requiring-authentication-${randomString()}`,
+          slug: `event-type-requiring-authentication-${randomString()}`,
+          length: 60,
+          requiresConfirmation: true,
+          bookingRequiresAuthentication: true,
+        },
+        secondManagedUser.user.id
+      );
+      eventTypeRequiringAuthenticationId = eventTypeRequiringAuthentication.id;
+
+      body = {
+        start: new Date(Date.UTC(2030, 0, 9, 15, 0, 0)).toISOString(),
+        eventTypeId: eventTypeRequiringAuthenticationId,
+        attendee: {
+          email: "external@example.com",
+          name: "External Attendee",
+          timeZone: "Europe/Rome",
+        },
+      };
+    });
+
+    it("can't be booked without credentials", async () => {
+      await request(app.getHttpServer())
+        .post(`/v2/bookings`)
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .expect(401);
+    });
+
+    it("can't be booked with managed user credentials who is not admin and not event type owner", async () => {
+      await request(app.getHttpServer())
+        .post(`/v2/bookings`)
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${firstManagedUser.accessToken}`)
+        .expect(403);
+    });
+
+    it("can be booked with managed user credentials who is event type owner", async () => {
+      const response = await request(app.getHttpServer())
+        .post(`/v2/bookings`)
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${secondManagedUser.accessToken}`)
+        .expect(201);
+
+      const bookingId = response.body.data.id;
+      await bookingsRepositoryFixture.deleteById(bookingId);
+    });
+
+    it("can be booked with managed user credentials who is admin", async () => {
+      const response = await request(app.getHttpServer())
+        .post(`/v2/bookings`)
+        .send(body)
+        .set(CAL_API_VERSION_HEADER, VERSION_2024_08_13)
+        .set("Authorization", `Bearer ${orgAdminManagedUser.accessToken}`)
+        .expect(201);
+
+      const bookingId = response.body.data.id;
+      await bookingsRepositoryFixture.deleteById(bookingId);
+    });
+  });
+
   afterAll(async () => {
     await userRepositoryFixture.delete(firstManagedUser.user.id);
     await userRepositoryFixture.delete(secondManagedUser.user.id);

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

@@ -6,9 +6,12 @@ import { OutputBookingsService_2024_08_13 } from "@/ee/bookings/2024-08-13/servi
 import { PlatformBookingsService } from "@/ee/bookings/shared/platform-bookings.service";
 import { EventTypesRepository_2024_06_14 } from "@/ee/event-types/event-types_2024_06_14/event-types.repository";
 import { getPagination } from "@/lib/pagination/pagination";
+import { AuthOptionalUser } from "@/modules/auth/decorators/get-optional-user/get-optional-user.decorator";
 import { BillingService } from "@/modules/billing/services/billing.service";
 import { BookingSeatRepository } from "@/modules/booking-seat/booking-seat.repository";
 import { KyselyReadService } from "@/modules/kysely/kysely-read.service";
+import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
+import { MembershipsService } from "@/modules/memberships/services/memberships.service";
 import { OAuthClientRepository } from "@/modules/oauth-clients/oauth-client.repository";
 import { OAuthClientUsersService } from "@/modules/oauth-clients/services/oauth-clients-users.service";
 import { OrganizationsRepository } from "@/modules/organizations/index/organizations.repository";
@@ -18,7 +21,14 @@ import { TeamsEventTypesRepository } from "@/modules/teams/event-types/teams-eve
 import { TeamsRepository } from "@/modules/teams/teams/teams.repository";
 import { UsersService } from "@/modules/users/services/users.service";
 import { UsersRepository, UserWithProfile } from "@/modules/users/users.repository";
-import { ConflictException, Injectable, Logger, NotFoundException } from "@nestjs/common";
+import {
+  ConflictException,
+  ForbiddenException,
+  Injectable,
+  Logger,
+  NotFoundException,
+  UnauthorizedException,
+} from "@nestjs/common";
 import { BadRequestException } from "@nestjs/common";
 import { Request } from "express";
 import { DateTime } from "luxon";
@@ -95,10 +105,12 @@ export class BookingsService_2024_08_13 {
     private readonly organizationsRepository: OrganizationsRepository,
     private readonly teamsRepository: TeamsRepository,
     private readonly teamsEventTypesRepository: TeamsEventTypesRepository,
+    private readonly membershipsRepository: MembershipsRepository,
+    private readonly membershipsService: MembershipsService,
     private readonly errorsBookingsService: ErrorsBookingsService_2024_08_13
   ) {}
 
-  async createBooking(request: Request, body: CreateBookingInput) {
+  async createBooking(request: Request, body: CreateBookingInput, authUser: AuthOptionalUser) {
     let bookingTeamEventType = false;
     try {
       const eventType = await this.getBookedEventType(body);
@@ -108,6 +120,7 @@ export class BookingsService_2024_08_13 {
       if (!eventType) {
         this.errorsBookingsService.handleEventTypeToBeBookedNotFound(body);
       }
+      await this.checkBookingRequiresAuthenticationSetting(eventType, authUser);
 
       if (eventType.schedulingType === "MANAGED") {
         throw new BadRequestException(
@@ -142,6 +155,56 @@ export class BookingsService_2024_08_13 {
     }
   }
 
+  async checkBookingRequiresAuthenticationSetting(
+    eventType: EventTypeWithOwnerAndTeam,
+    authUser: AuthOptionalUser
+  ) {
+    if (!eventType.bookingRequiresAuthentication) return true;
+    if (!authUser) {
+      throw new UnauthorizedException(
+        "checkBookingRequiresAuthentication - request must be authenticated by passing credentials belonging to event type owner, host or team or org admin or owner."
+      );
+    }
+
+    const authUserId = authUser.id;
+    const authUserRole = authUser.role;
+    const eventTypeId = eventType.id;
+    const teamId = eventType.teamId;
+    const bookingUserId = eventType.owner?.id || null;
+
+    if (authUserRole === "ADMIN") return;
+
+    if (bookingUserId === authUserId) return;
+
+    if (eventTypeId) {
+      const [isUserHost, isUserAssigned] = await Promise.all([
+        this.eventTypesRepository.isUserHostOfEventType(authUserId, eventTypeId),
+        this.eventTypesRepository.isUserAssignedToEventType(authUserId, eventTypeId),
+      ]);
+
+      if (isUserHost || isUserAssigned) return;
+    }
+
+    if (teamId) {
+      const membership = await this.membershipsRepository.getUserAdminOrOwnerTeamMembership(
+        authUserId,
+        teamId
+      );
+      if (membership) return;
+    }
+
+    if (
+      bookingUserId &&
+      (await this.membershipsService.isUserOrgAdminOrOwnerOfAnotherUser(authUserId, bookingUserId))
+    ) {
+      return;
+    }
+
+    throw new ForbiddenException(
+      "checkBookingRequiresAuthentication - user is not authorized to access this event type. User has to be either event type owner, host, team admin or owner or org admin or owner."
+    );
+  }
+
   async getBookedEventType(body: CreateBookingInput) {
     if (body.eventTypeId) {
       return await this.eventTypesRepository.getEventTypeByIdWithOwnerAndTeam(body.eventTypeId);

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

@@ -498,6 +498,7 @@ describe("Event types Endpoints", () => {
           lightThemeHex: "#fafafa",
         },
         customName: `{Event type title} between {Organiser} and {Scheduler}`,
+        bookingRequiresAuthentication: true,
       };
 
       return request(app.getHttpServer())
@@ -570,6 +571,7 @@ describe("Event types Endpoints", () => {
           ];
 
           expect(createdEventType.bookingFields).toEqual(expectedBookingFields);
+          expect(createdEventType.bookingRequiresAuthentication).toEqual(true);
           eventType = responseBody.data;
         });
     });
@@ -1026,6 +1028,7 @@ describe("Event types Endpoints", () => {
           lightThemeHex: "#fafafa",
         },
         customName: `{Event type title} betweennnnnnnnnnn {Organiser} and {Scheduler}`,
+        bookingRequiresAuthentication: false,
       };
 
       return request(app.getHttpServer())
@@ -1120,6 +1123,8 @@ describe("Event types Endpoints", () => {
           eventType.color = updatedEventType.color;
           eventType.bookingFields = updatedEventType.bookingFields;
           eventType.calVideoSettings = updatedEventType.calVideoSettings;
+
+          expect(updatedEventType.bookingRequiresAuthentication).toEqual(false);
         });
     });
 
@@ -2028,7 +2033,6 @@ describe("Event types Endpoints", () => {
     const username = name;
     let user: User;
     let legacyEventTypeId1: number;
-    let legacyEventTypeId2: number;
 
     beforeAll(async () => {
       const moduleRef = await withApiAuth(

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

@@ -132,4 +132,26 @@ export class EventTypesRepository_2024_06_14 {
   async deleteEventType(eventTypeId: number) {
     return this.dbWrite.prisma.eventType.delete({ where: { id: eventTypeId } });
   }
+
+  async isUserHostOfEventType(userId: number, eventTypeId: number) {
+    const eventType = await this.dbRead.prisma.eventType.findFirst({
+      where: {
+        id: eventTypeId,
+        hosts: { some: { userId: userId } },
+      },
+      select: { id: true },
+    });
+    return !!eventType;
+  }
+
+  async isUserAssignedToEventType(userId: number, eventTypeId: number) {
+    const eventType = await this.dbRead.prisma.eventType.findFirst({
+      where: {
+        id: eventTypeId,
+        users: { some: { id: userId } },
+      },
+      select: { id: true },
+    });
+    return !!eventType;
+  }
 }

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

@@ -90,6 +90,7 @@ type Input = Pick<
   | "hideOrganizerEmail"
   | "calVideoSettings"
   | "hidden"
+  | "bookingRequiresAuthentication"
 >;
 
 @Injectable()
@@ -129,6 +130,7 @@ export class OutputEventTypesService_2024_06_14 {
       hideOrganizerEmail,
       calVideoSettings,
       hidden,
+      bookingRequiresAuthentication,
     } = databaseEventType;
 
     const locations = this.transformLocations(databaseEventType.locations);
@@ -206,6 +208,7 @@ export class OutputEventTypesService_2024_06_14 {
       hideOrganizerEmail,
       calVideoSettings,
       hidden,
+      bookingRequiresAuthentication,
     };
   }
 

apps/api/v2/src/ee/event-types/event-types_2024_06_14/transformers/internal-to-api/booking-fields.ts

@@ -520,6 +520,8 @@ export const systemBeforeFieldName: NameSystemField = {
             name: "fullName",
             type: "text",
             required: true,
+            label: "",
+            placeholder: "",
           },
         ],
       },

apps/api/v2/src/ee/event-types/event-types_2024_06_14/transformers/internal-to-api/internal-to-api.spec.ts

@@ -292,8 +292,8 @@ describe("transformBookingFieldsInternalToApi", () => {
         isDefault: true,
         required: true,
         disableOnPrefill: false,
-        label: undefined,
+        label: "",
-        placeholder: undefined,
+        placeholder: "",
       },
     ];
 

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

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

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

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

apps/api/v2/src/lib/services/lucky-user.service.ts

@@ -0,0 +1,27 @@
+import { PrismaAttributeRepository } from "@/lib/repositories/prisma-attribute.repository";
+import { PrismaBookingRepository } from "@/lib/repositories/prisma-booking.repository";
+import { PrismaHostRepository } from "@/lib/repositories/prisma-host.repository";
+import { PrismaOOORepository } from "@/lib/repositories/prisma-ooo.repository";
+import { PrismaUserRepository } from "@/lib/repositories/prisma-user.repository";
+import { Injectable } from "@nestjs/common";
+
+import { LuckyUserService as BaseLuckyUserService } from "@calcom/platform-libraries/bookings";
+
+@Injectable()
+export class LuckyUserService extends BaseLuckyUserService {
+  constructor(
+    bookingRepository: PrismaBookingRepository,
+    hostRepository: PrismaHostRepository,
+    oooRepository: PrismaOOORepository,
+    userRepository: PrismaUserRepository,
+    attributeRepository: PrismaAttributeRepository
+  ) {
+    super({
+      bookingRepository: bookingRepository,
+      hostRepository: hostRepository,
+      oooRepository: oooRepository,
+      userRepository: userRepository,
+      attributeRepository: attributeRepository,
+    });
+  }
+}

apps/api/v2/src/modules/auth/decorators/get-optional-user/get-optional-user.decorator.ts

@@ -2,6 +2,8 @@ import { ApiAuthGuardUser } from "@/modules/auth/strategies/api-auth/api-auth.st
 import { ExecutionContext } from "@nestjs/common";
 import { createParamDecorator } from "@nestjs/common";
 
+export type AuthOptionalUser = ApiAuthGuardUser | null;
+
 export const GetOptionalUser = createParamDecorator<
   keyof ApiAuthGuardUser | (keyof ApiAuthGuardUser)[],
   ExecutionContext

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

@@ -89,7 +89,6 @@ export class BillingService implements OnModuleDestroy {
         teamId: teamId.toString(),
         plan: plan.toString(),
       },
-      currency: "usd",
       subscription_data: {
         metadata: {
           teamId: teamId.toString(),
@@ -117,7 +116,6 @@ export class BillingService implements OnModuleDestroy {
         teamId: teamId.toString(),
         plan: plan.toString(),
       },
-      currency: "usd",
     });
 
     if (!url) throw new InternalServerErrorException("Failed to create Stripe session.");
@@ -403,7 +401,6 @@ export class BillingService implements OnModuleDestroy {
       fromReschedule?: string | null;
     }
   ) {
-
     if (this.configService.get("e2e")) {
       return true;
     }
@@ -465,7 +462,6 @@ export class BillingService implements OnModuleDestroy {
 
   async onModuleDestroy() {
     try {
-      
       await this.billingQueue.close();
     } catch (err) {
       this.logger.error(err);

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

@@ -1,7 +1,7 @@
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { Injectable } from "@nestjs/common";
 
-import { MembershipRole } from "@calcom/prisma/client";
+import { MembershipRole } from "@calcom/prisma/enums";
 
 @Injectable()
 export class MembershipsRepository {
@@ -90,6 +90,26 @@ export class MembershipsRepository {
     return !!adminMembership;
   }
 
+  async getOrgIdsWhereUserIsAdminOrOwner(userId: number) {
+    const userOrgAdminMemberships = await this.dbRead.prisma.membership.findMany({
+      where: {
+        userId: userId,
+        accepted: true,
+        role: {
+          in: ["OWNER", "ADMIN"],
+        },
+        team: {
+          parentId: null,
+        },
+      },
+      select: {
+        teamId: true,
+      },
+    });
+
+    return userOrgAdminMemberships.map((m) => m.teamId);
+  }
+
   async createMembership(teamId: number, userId: number, role: MembershipRole, accepted: boolean) {
     const membership = await this.dbRead.prisma.membership.create({
       data: {
@@ -103,4 +123,46 @@ export class MembershipsRepository {
 
     return membership;
   }
+
+  async getUserAdminOrOwnerTeamMembership(userId: number, teamId: number) {
+    return this.dbRead.prisma.membership.findFirst({
+      where: {
+        userId: userId,
+        teamId: teamId,
+        accepted: true,
+        role: {
+          in: ["OWNER", "ADMIN"],
+        },
+      },
+    });
+  }
+
+  async getUserMembershipInOneOfOrgs(userId: number, orgIds: number[]) {
+    return this.dbRead.prisma.membership.findFirst({
+      where: {
+        userId: userId,
+        accepted: true,
+        teamId: {
+          in: orgIds,
+        },
+        team: {
+          parentId: null,
+        },
+      },
+    });
+  }
+
+  async getUserMembershipInOneOfOrgsTeams(userId: number, orgIds: number[]) {
+    return this.dbRead.prisma.membership.findFirst({
+      where: {
+        userId: userId,
+        accepted: true,
+        team: {
+          parentId: {
+            in: orgIds,
+          },
+        },
+      },
+    });
+  }
 }

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

@@ -21,4 +21,28 @@ export class MembershipsService {
       "teamId"
     );
   }
+
+  async isUserOrgAdminOrOwnerOfAnotherUser(userId: number, anotherUserId: number) {
+    const orgIdsWhereUserIsAdminOrOwner = await this.membershipsRepository.getOrgIdsWhereUserIsAdminOrOwner(
+      userId
+    );
+
+    if (orgIdsWhereUserIsAdminOrOwner.length === 0) {
+      return false;
+    }
+
+    const anotherUserOrgMembership = await this.membershipsRepository.getUserMembershipInOneOfOrgs(
+      anotherUserId,
+      orgIdsWhereUserIsAdminOrOwner
+    );
+
+    if (anotherUserOrgMembership) return true;
+
+    const anotherUserOrgTeamMembership = await this.membershipsRepository.getUserMembershipInOneOfOrgsTeams(
+      anotherUserId,
+      orgIdsWhereUserIsAdminOrOwner
+    );
+
+    return !!anotherUserOrgTeamMembership;
+  }
 }

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

@@ -725,6 +725,8 @@ describe("Organizations Event Types Endpoints", () => {
               isDefault: true,
               type: "name",
               slug: "name",
+              label: "",
+              placeholder: "",
               required: true,
               disableOnPrefill: false,
             },
@@ -821,6 +823,8 @@ describe("Organizations Event Types Endpoints", () => {
               isDefault: true,
               type: "name",
               slug: "name",
+              label: "",
+              placeholder: "",
               required: true,
               disableOnPrefill: false,
             },

apps/api/v2/src/modules/organizations/event-types/services/output.service.ts

@@ -75,6 +75,7 @@ type Input = Pick<
   | "team"
   | "calVideoSettings"
   | "hidden"
+  | "bookingRequiresAuthentication"
 >;
 
 @Injectable()

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

@@ -43,6 +43,8 @@ export class OrganizationsTeamsSchedulesController {
   @DocsTags("Orgs / Teams / Schedules")
   @ApiOperation({ summary: "Get all team member schedules" })
   async getTeamSchedules(
+    // note(Lauirs): putting orgId so swagger is generacted correctly
+    @Param("orgId", ParseIntPipe) _orgId: number,
     @Param("teamId", ParseIntPipe) teamId: number,
     @Query() queryParams: SkipTakePagination
   ): Promise<GetSchedulesOutput_2024_06_11> {
@@ -65,6 +67,9 @@ export class OrganizationsTeamsSchedulesController {
     summary: "Get schedules of a team member",
   })
   async getUserSchedules(
+    // note(Lauirs): putting orgId and teamId so swagger is generacted correctly
+    @Param("orgId", ParseIntPipe) _orgId: number,
+    @Param("teamId", ParseIntPipe) _teamId: number,
     @Param("userId", ParseIntPipe) userId: number
   ): Promise<GetSchedulesOutput_2024_06_11> {
     const schedules = await this.schedulesService.getUserSchedules(userId);

apps/api/v2/src/modules/slots/slots-2024-09-04/controllers/slots.controller.ts

@@ -1,6 +1,9 @@
 import { VERSION_2024_09_04 } from "@/lib/api-versions";
 import { OPTIONAL_API_KEY_OR_ACCESS_TOKEN_HEADER, OPTIONAL_X_CAL_CLIENT_ID_HEADER } from "@/lib/docs/headers";
-import { GetOptionalUser } from "@/modules/auth/decorators/get-optional-user/get-optional-user.decorator";
+import {
+  AuthOptionalUser,
+  GetOptionalUser,
+} from "@/modules/auth/decorators/get-optional-user/get-optional-user.decorator";
 import { OptionalApiAuthGuard } from "@/modules/auth/guards/optional-api-auth/optional-api-auth.guard";
 import { GetReservedSlotOutput_2024_09_04 } from "@/modules/slots/slots-2024-09-04/outputs/get-reserved-slot.output";
 import { GetSlotsOutput_2024_09_04 } from "@/modules/slots/slots-2024-09-04/outputs/get-slots.output";
@@ -26,7 +29,6 @@ import {
   ApiResponse as DocsResponse,
   ApiQuery,
 } from "@nestjs/swagger";
-import { User } from "@prisma/client";
 import { plainToClass } from "class-transformer";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
@@ -261,7 +263,7 @@ export class SlotsController_2024_09_04 {
   @ApiHeader(OPTIONAL_API_KEY_OR_ACCESS_TOKEN_HEADER)
   async reserveSlot(
     @Body() body: ReserveSlotInput_2024_09_04,
-    @GetOptionalUser() user: User
+    @GetOptionalUser() user: AuthOptionalUser
   ): Promise<ReserveSlotOutputResponse_2024_09_04> {
     const reservedSlot = await this.slotsService.reserveSlot(body, user?.id);
 

apps/api/v2/swagger/documentation.json

@@ -5547,6 +5547,97 @@
         ]
       }
     },
+    "/v2/organizations/{orgId}/teams/{teamId}/schedules": {
+      "get": {
+        "operationId": "OrganizationsTeamsSchedulesController_getTeamSchedules",
+        "summary": "Get all team member schedules",
+        "parameters": [
+          {
+            "name": "Authorization",
+            "in": "header",
+            "description": "For non-platform customers - value must be `Bearer <token>` where `<token>` is api key prefixed with cal_",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "x-cal-secret-key",
+            "in": "header",
+            "description": "For platform customers - OAuth client secret key",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "x-cal-client-id",
+            "in": "header",
+            "description": "For platform customers - OAuth client ID",
+            "required": false,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "orgId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "name": "teamId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "name": "take",
+            "required": false,
+            "in": "query",
+            "description": "Maximum number of items to return",
+            "example": 25,
+            "schema": {
+              "minimum": 1,
+              "maximum": 250,
+              "default": 250,
+              "type": "number"
+            }
+          },
+          {
+            "name": "skip",
+            "required": false,
+            "in": "query",
+            "description": "Number of items to skip",
+            "example": 0,
+            "schema": {
+              "minimum": 0,
+              "default": 0,
+              "type": "number"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GetSchedulesOutput_2024_06_11"
+                }
+              }
+            }
+          }
+        },
+        "tags": [
+          "Orgs / Teams / Schedules"
+        ]
+      }
+    },
     "/v2/organizations/{orgId}/teams/{teamId}/stripe/connect": {
       "get": {
         "operationId": "OrganizationsStripeController_getTeamStripeConnectUrl",
@@ -5720,6 +5811,22 @@
               "type": "string"
             }
           },
+          {
+            "name": "orgId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "name": "teamId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          },
           {
             "name": "userId",
             "required": true,
@@ -13215,6 +13322,71 @@
         ]
       }
     },
+    "/v2/teams/{teamId}/schedules": {
+      "get": {
+        "operationId": "TeamsSchedulesController_getTeamSchedules",
+        "summary": "Get all team member schedules",
+        "parameters": [
+          {
+            "name": "Authorization",
+            "in": "header",
+            "description": "value must be `Bearer <token>` where `<token>` is api key prefixed with cal_ or managed user access token",
+            "required": true,
+            "schema": {
+              "type": "string"
+            }
+          },
+          {
+            "name": "teamId",
+            "required": true,
+            "in": "path",
+            "schema": {
+              "type": "number"
+            }
+          },
+          {
+            "name": "take",
+            "required": false,
+            "in": "query",
+            "description": "Maximum number of items to return",
+            "example": 25,
+            "schema": {
+              "minimum": 1,
+              "maximum": 250,
+              "default": 250,
+              "type": "number"
+            }
+          },
+          {
+            "name": "skip",
+            "required": false,
+            "in": "query",
+            "description": "Number of items to skip",
+            "example": 0,
+            "schema": {
+              "minimum": 0,
+              "default": 0,
+              "type": "number"
+            }
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "",
+            "content": {
+              "application/json": {
+                "schema": {
+                  "$ref": "#/components/schemas/GetSchedulesOutput_2024_06_11"
+                }
+              }
+            }
+          }
+        },
+        "tags": [
+          "Teams / Schedules"
+        ]
+      }
+    },
     "/v2/teams/{teamId}/verified-resources/emails/verification-code/request": {
       "post": {
         "operationId": "TeamsVerifiedResourcesController_requestEmailVerificationCode",
@@ -16504,6 +16676,14 @@
               }
             ]
           },
+          "hidden": {
+            "type": "boolean"
+          },
+          "bookingRequiresAuthentication": {
+            "type": "boolean",
+            "default": false,
+            "description": "Boolean to require authentication for booking this event type via api. If true, only authenticated users can book this event type."
+          },
           "locations": {
             "type": "array",
             "description": "Locations where the event will take place. If not provided, cal video link will be used as the location.",
@@ -18166,6 +18346,13 @@
               }
             ]
           },
+          "hidden": {
+            "type": "boolean"
+          },
+          "bookingRequiresAuthentication": {
+            "type": "boolean",
+            "description": "Boolean to require authentication for booking this event type via api. If true, only authenticated users can book this event type."
+          },
           "ownerId": {
             "type": "number",
             "example": 10
@@ -18195,6 +18382,8 @@
           "successRedirectUrl",
           "isInstantEvent",
           "scheduleId",
+          "hidden",
+          "bookingRequiresAuthentication",
           "ownerId",
           "users"
         ]
@@ -18515,6 +18704,14 @@
               }
             ]
           },
+          "hidden": {
+            "type": "boolean"
+          },
+          "bookingRequiresAuthentication": {
+            "type": "boolean",
+            "default": false,
+            "description": "Boolean to require authentication for booking this event type via api. If true, only authenticated users can book this event type."
+          },
           "locations": {
             "type": "array",
             "description": "Locations where the event will take place. If not provided, cal video link will be used as the location.",
@@ -20343,6 +20540,14 @@
               }
             ]
           },
+          "hidden": {
+            "type": "boolean"
+          },
+          "bookingRequiresAuthentication": {
+            "type": "boolean",
+            "default": false,
+            "description": "Boolean to require authentication for booking this event type via api. If true, only authenticated users can book this event type."
+          },
           "schedulingType": {
             "type": "string",
             "enum": [
@@ -20777,6 +20982,13 @@
               }
             ]
           },
+          "hidden": {
+            "type": "boolean"
+          },
+          "bookingRequiresAuthentication": {
+            "type": "boolean",
+            "description": "Boolean to require authentication for booking this event type via api. If true, only authenticated users can book this event type."
+          },
           "teamId": {
             "type": "number"
           },
@@ -21223,6 +21435,14 @@
               }
             ]
           },
+          "hidden": {
+            "type": "boolean"
+          },
+          "bookingRequiresAuthentication": {
+            "type": "boolean",
+            "default": false,
+            "description": "Boolean to require authentication for booking this event type via api. If true, only authenticated users can book this event type."
+          },
           "hosts": {
             "type": "array",
             "items": {
@@ -22589,6 +22809,11 @@
           },
           "unit": {
             "type": "object",
+            "enum": [
+              "hour",
+              "minute",
+              "day"
+            ],
             "description": "Unit for the offset time",
             "example": "hour"
           }
@@ -22612,6 +22837,9 @@
           "type": {
             "type": "string",
             "default": "beforeEvent",
+            "enum": [
+              "beforeEvent"
+            ],
             "description": "Trigger type for the workflow",
             "example": "beforeEvent"
           }
@@ -22635,6 +22863,9 @@
           "type": {
             "type": "string",
             "default": "afterEvent",
+            "enum": [
+              "afterEvent"
+            ],
             "description": "Trigger type for the workflow",
             "example": "afterEvent"
           }
@@ -22650,6 +22881,9 @@
           "type": {
             "type": "string",
             "default": "eventCancelled",
+            "enum": [
+              "eventCancelled"
+            ],
             "description": "Trigger type for the workflow"
           }
         },
@@ -22663,6 +22897,9 @@
           "type": {
             "type": "string",
             "default": "newEvent",
+            "enum": [
+              "newEvent"
+            ],
             "description": "Trigger type for the workflow"
           }
         },
@@ -22676,6 +22913,9 @@
           "type": {
             "type": "string",
             "default": "rescheduleEvent",
+            "enum": [
+              "rescheduleEvent"
+            ],
             "description": "Trigger type for the workflow"
           }
         },
@@ -22697,6 +22937,9 @@
           "type": {
             "type": "string",
             "default": "afterGuestsCalVideoNoShow",
+            "enum": [
+              "afterGuestsCalVideoNoShow"
+            ],
             "description": "Trigger type for the workflow",
             "example": "afterGuestsCalVideoNoShow"
           }
@@ -22720,6 +22963,9 @@
           "type": {
             "type": "string",
             "default": "afterHostsCalVideoNoShow",
+            "enum": [
+              "afterHostsCalVideoNoShow"
+            ],
             "description": "Trigger type for the workflow",
             "example": "afterHostsCalVideoNoShow"
           }
@@ -23314,6 +23560,17 @@
         "properties": {
           "type": {
             "type": "object",
+            "enum": [
+              [
+                "beforeEvent",
+                "eventCancelled",
+                "newEvent",
+                "afterEvent",
+                "rescheduleEvent",
+                "afterHostsCalVideoNoShow",
+                "afterGuestsCalVideoNoShow"
+              ]
+            ],
             "description": "Trigger type for the workflow"
           }
         },

apps/api/v2/test/fixtures/repository/api-keys.repository.fixture.ts

@@ -15,7 +15,6 @@ export class ApiKeysRepositoryFixture {
   async createApiKey(userId: number, expiresAt: Date | null, teamId?: number) {
     const keyString = randomBytes(16).toString("hex");
     const hashedKey = createHash("sha256").update(keyString).digest("hex");
-    console.log("createApiKey Fixutre", { hashedKey, keyString });
     const apiKey = await this.prismaWriteClient.apiKey.create({
       data: {
         userId,

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

@@ -1,32 +0,0 @@
-import { _generateMetadata, getTranslate } from "app/_utils";
-
-import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";
-import { Button } from "@calcom/ui/components/button";
-
-export const generateMetadata = () =>
-  _generateMetadata(
-    (t) => `${t("access_denied")} | ${APP_NAME}`,
-    () => "",
-    undefined,
-    undefined,
-    "/403"
-  );
-
-async function Error403() {
-  const t = await getTranslate();
-
-  return (
-    <div className="bg-subtle flex h-screen">
-      <div className="rtl: bg-default m-auto rounded-md p-10 text-right ltr:text-left">
-        <h1 className="font-cal text-emphasis text-6xl">403</h1>
-        <h2 className="text-emphasis mt-6 text-2xl font-medium">{t("dont_have_access_this_page")}</h2>
-        <p className="text-default mb-6 mt-4 max-w-2xl text-sm">
-          {t("you_need_admin_or_owner_privileges_to_access")}
-        </p>
-        <Button href={WEBAPP_URL}>{t("go_back_home")}</Button>
-      </div>
-    </div>
-  );
-}
-
-export default Error403;

apps/web/app/(use-page-wrapper)/500/copy-button.tsx

@@ -1,22 +0,0 @@
-"use client";
-
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button } from "@calcom/ui/components/button";
-import { showToast } from "@calcom/ui/components/toast";
-
-export default function CopyButton({ error }: { error: string }) {
-  const { t } = useLocale();
-
-  return (
-    <Button
-      color="secondary"
-      className="mt-2 border-0 font-sans font-normal hover:bg-gray-300"
-      StartIcon="copy"
-      onClick={() => {
-        navigator.clipboard.writeText(error);
-        showToast("Link copied!", "success");
-      }}>
-      {t("copy")}
-    </Button>
-  );
-}

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

@@ -1,47 +0,0 @@
-import { _generateMetadata, getTranslate } from "app/_utils";
-
-import { APP_NAME } from "@calcom/lib/constants";
-import { Button } from "@calcom/ui/components/button";
-
-import CopyButton from "./copy-button";
-
-export const generateMetadata = () =>
-  _generateMetadata(
-    (t) => `${t("something_unexpected_occurred")} | ${APP_NAME}`,
-    () => "",
-    undefined,
-    undefined,
-    "/500"
-  );
-
-async function Error500({ searchParams }: { searchParams: { error?: string } }) {
-  const t = await getTranslate();
-
-  return (
-    <div className="bg-subtle flex h-screen">
-      <div className="rtl: bg-default m-auto rounded-md p-10 text-right ltr:text-left">
-        <h1 className="font-cal text-emphasis text-6xl">500</h1>
-        <h2 className="text-emphasis mt-6 text-2xl font-medium">{t("500_error_message")}</h2>
-        <p className="text-default mb-6 mt-4 max-w-2xl text-sm">{t("something_went_wrong_on_our_end")}</p>
-        {searchParams?.error && (
-          <div className="mb-8 flex flex-col">
-            <p className="text-default mb-4 max-w-2xl text-sm">
-              {t("please_provide_following_text_to_suppport")}:
-            </p>
-            <pre className="bg-emphasis text-emphasis w-full max-w-2xl whitespace-normal break-words rounded-md p-4">
-              {searchParams.error}
-              <br />
-              <CopyButton error={searchParams.error} />
-            </pre>
-          </div>
-        )}
-        <Button href="mailto:support@cal.com">{t("contact_support")}</Button>
-        <Button color="secondary" href="javascript:history.back()" className="ml-2">
-          {t("go_back")}
-        </Button>
-      </div>
-    </div>
-  );
-}
-
-export default Error500;

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

@@ -1,7 +0,0 @@
-import { redirect } from "next/navigation";
-
-const Page = () => {
-  redirect("/apps/installed/calendar");
-};
-
-export default Page;

apps/web/app/(use-page-wrapper)/apps/routing-forms/page.tsx

@@ -1,7 +0,0 @@
-import { redirect } from "next/navigation";
-
-const ServerPage = async () => {
-  redirect("/apps/routing-forms/forms");
-};
-
-export default ServerPage;

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

@@ -1,17 +0,0 @@
-import { _generateMetadata } from "app/_utils";
-import { redirect } from "next/navigation";
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    (t) => t("apps"),
-    (t) => t("admin_apps_description"),
-    undefined,
-    undefined,
-    "/settings/admin/apps"
-  );
-
-const Page = () => {
-  redirect("/settings/admin/apps/calendar");
-};
-
-export default Page;

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

@@ -21,11 +21,13 @@ const Page = async () => {
     createRouterCaller(appsRouter),
   ]);
 
-  const connectedCalendars = await calendarsCaller.connectedCalendars();
+  const [connectedCalendars, installedCalendars] = await Promise.all([
-  const installedCalendars = await appsCaller.integrations({
+    calendarsCaller.connectedCalendars(),
-    variant: "calendar",
+    appsCaller.integrations({
-    onlyInstalled: true,
+      variant: "calendar",
-  });
+      onlyInstalled: true,
+    }),
+  ]);
   return (
     <CalendarListContainer connectedCalendars={connectedCalendars} installedCalendars={installedCalendars} />
   );

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

@@ -21,9 +21,9 @@ export const generateMetadata = async () =>
   );
 
 const Page = async () => {
-  const t = await getTranslate();
+  const [t, _headers, _cookies] = await Promise.all([getTranslate(), headers(), cookies()]);
 
-  const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });
+  const session = await getServerSession({ req: buildLegacyRequest(_headers, _cookies) });
 
   if (!session?.user.id || !session?.user.profile?.organizationId || !session?.user.org) {
     return redirect("/settings/profile");

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/AdvancedPermissionGroup.tsx

@@ -6,9 +6,9 @@ import type { Resource } from "@calcom/features/pbac/domain/types/permission-reg
 import { PERMISSION_REGISTRY, CrudAction } from "@calcom/features/pbac/domain/types/permission-registry";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import classNames from "@calcom/ui/classNames";
+import { Checkbox, Label } from "@calcom/ui/components/form";
 import { Icon } from "@calcom/ui/components/icon";
 import { Tooltip } from "@calcom/ui/components/tooltip";
-import { Checkbox, Label } from "@calcom/ui/form";
 
 import { usePermissions } from "./usePermissions";
 

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/CreateRoleCta.tsx

@@ -1,7 +1,7 @@
 "use client";
 
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Button } from "@calcom/ui/button";
+import { Button } from "@calcom/ui/components/button";
 
 import { useRoleSheetState } from "../hooks/useRoleQueryStates";
 

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/RoleSheet.tsx

@@ -14,10 +14,10 @@ import {
 } from "@calcom/features/pbac/domain/types/permission-registry";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc/react";
-import { Button } from "@calcom/ui/button";
+import { Button } from "@calcom/ui/components/button";
+import { Form, TextField, Checkbox, Label } from "@calcom/ui/components/form";
 import { Sheet, SheetContent, SheetFooter, SheetHeader, SheetTitle } from "@calcom/ui/components/sheet";
 import { showToast } from "@calcom/ui/components/toast";
-import { Form, TextField, Checkbox, Label } from "@calcom/ui/form";
 
 import { revalidateTeamRoles } from "../actions";
 import { AdvancedPermissionGroup } from "./AdvancedPermissionGroup";

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/RolesList.tsx

@@ -2,9 +2,9 @@
 
 import type { Scope } from "@calcom/features/pbac/domain/types/permission-registry";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { Badge } from "@calcom/ui/badge";
-import { Button } from "@calcom/ui/button";
 import classNames from "@calcom/ui/classNames";
+import { Badge } from "@calcom/ui/components/badge";
+import { Button } from "@calcom/ui/components/button";
 import {
   Dropdown,
   DropdownMenuContent,

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/__tests__/usePermissions.test.ts

@@ -44,17 +44,5 @@ describe("usePermissions", () => {
 
       expect(getResourcePermissionLevel("eventType", permissions)).toBe("all");
     });
-
-    it("should return 'all' for resource with manage permission", () => {
-      const permissions = ["eventType.manage"];
-
-      expect(getResourcePermissionLevel("eventType", permissions)).toBe("all");
-    });
-
-    it("should return 'all' for resource with manage permission even if other permissions are missing", () => {
-      const permissions = ["eventType.manage", "eventType.read"]; // Has manage and read, but missing create, update, delete
-
-      expect(getResourcePermissionLevel("eventType", permissions)).toBe("all");
-    });
   });
 });

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/roles/_components/usePermissions.ts

@@ -51,20 +51,14 @@ export function usePermissions(): UsePermissionsReturn {
       return "all";
     }
 
-    // Check if user has manage permission for this resource
+    // Filter out internal keys like _resource when checking permissions
-    const hasManagePermission = permissions.includes(`${resource}.manage`);
+    const allResourcePerms = Object.keys(resourceConfig)
-    if (hasManagePermission) {
+      .filter((action) => !action.startsWith("_"))
-      return "all";
-    }
-
-    // Filter out internal keys like _resource and manage when checking for individual permissions
-    const crudPermissions = Object.keys(resourceConfig)
-      .filter((action) => !action.startsWith("_") && action !== "manage")
       .map((action) => `${resource}.${action}`);
-    const hasAllCrudPerms = crudPermissions.every((p) => permissions.includes(p));
+    const hasAllPerms = allResourcePerms.every((p) => permissions.includes(p));
     const hasReadPerm = permissions.includes(`${resource}.${CrudAction.Read}`);
 
-    if (hasAllCrudPerms) return "all";
+    if (hasAllPerms) return "all";
     if (hasReadPerm) return "read";
     return "none";
   };

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

@@ -40,9 +40,7 @@ const getCachedRoles = unstable_cache(
 const Page = async () => {
   const orgCaller = await createRouterCaller(viewerOrganizationsRouter);
   const [org, teams] = await Promise.all([orgCaller.listCurrent(), orgCaller.getTeams()]);
-  const attributes = await getCachedAttributes(org.id);
+  const [attributes, roles] = await Promise.all([getCachedAttributes(org.id), getCachedRoles(org.id)]);
-
-  const roles = await getCachedRoles(org.id);
 
   const facetedTeamValues = {
     roles,

apps/web/app/_utils.tsx

@@ -80,6 +80,48 @@ export const _generateMetadata = async (
   };
 };
 
+export const _generateMetadataForStaticPage = (
+  title: string,
+  description: string,
+  hideBranding?: boolean,
+  origin?: string,
+  pathname?: string
+) => {
+  const _pathname = pathname ?? "";
+  const canonical = buildCanonical({ path: _pathname, origin: origin ?? CAL_URL });
+  const titleSuffix = `| ${APP_NAME}`;
+  const displayedTitle = title.includes(titleSuffix) || hideBranding ? title : `${title} ${titleSuffix}`;
+  const metadataBase = new URL(IS_CALCOM ? getCalcomUrl() : WEBAPP_URL);
+
+  const metadata = {
+    title: title.length === 0 ? APP_NAME : displayedTitle,
+    description,
+    alternates: { canonical },
+    openGraph: {
+      description: truncateOnWord(description, 158),
+      url: canonical,
+      type: "website",
+      siteName: APP_NAME,
+      title: displayedTitle,
+    },
+    metadataBase,
+  };
+  const image =
+    SEO_IMG_OGIMG +
+    constructGenericImage({
+      title: metadata.title,
+      description: metadata.description,
+    });
+
+  return {
+    ...metadata,
+    openGraph: {
+      ...metadata.openGraph,
+      images: [image],
+    },
+  };
+};
+
 export const generateMeetingMetadata = async (
   meeting: MeetingImageProps,
   getTitle: (t: TFunction<string, undefined>) => string,

apps/web/app/api/auth/saml/token/route.ts

@@ -1,7 +1,9 @@
 import { defaultResponderForAppDir } from "app/api/defaultResponderForAppDir";
 import { parseRequestData } from "app/api/parseRequestData";
+import * as jose from "jose";
 import type { NextRequest } from "next/server";
 import { NextResponse } from "next/server";
+import * as dummy from "openid-client";
 import { uuid } from "short-uuid";
 
 import jackson from "@calcom/features/ee/sso/lib/jackson";
@@ -9,6 +11,10 @@ import type { OAuthTokenReq } from "@calcom/features/ee/sso/lib/jackson";
 import logger from "@calcom/lib/logger";
 
 async function handler(req: NextRequest) {
+  // Need these imports to fix import errors with jackson
+  // https://github.com/ory/polis/blob/main/pages/api/import-hack.ts
+  const unused = dummy; // eslint-disable-line @typescript-eslint/no-unused-vars
+  const unused2 = jose; // eslint-disable-line @typescript-eslint/no-unused-vars
   const { oauthController } = await jackson();
   const log = logger.getSubLogger({ prefix: ["[SAML token]"] });
 

apps/web/app/api/link/route.ts

@@ -30,6 +30,10 @@ const querySchema = z.object({
 const decryptedSchema = z.object({
   bookingUid: z.string(),
   userId: z.number().int(),
+  platformClientId: z.string().optional(),
+  platformRescheduleUrl: z.string().optional(),
+  platformCancelUrl: z.string().optional(),
+  platformBookingUrl: z.string().optional(),
 });
 
 // Move the sessionGetter function outside the GET function
@@ -64,7 +68,14 @@ async function handler(request: NextRequest) {
     symmetricDecrypt(decodeURIComponent(token), process.env.CALENDSO_ENCRYPTION_KEY || "")
   );
 
-  const { bookingUid, userId } = decryptedSchema.parse(decryptedData);
+  const {
+    bookingUid,
+    userId,
+    platformClientId,
+    platformRescheduleUrl,
+    platformCancelUrl,
+    platformBookingUrl,
+  } = decryptedSchema.parse(decryptedData);
 
   const booking = await prisma.booking.findUniqueOrThrow({
     where: { uid: bookingUid },
@@ -97,6 +108,14 @@ async function handler(request: NextRequest) {
       recurringEventId: booking.recurringEventId || undefined,
       confirmed: action === DirectAction.ACCEPT,
       reason,
+      platformClientParams: platformClientId
+        ? {
+            platformClientId,
+            platformRescheduleUrl,
+            platformCancelUrl,
+            platformBookingUrl,
+          }
+        : undefined,
     });
   } catch (e) {
     let message = "Error confirming booking";

apps/web/app/api/logo/route.ts

@@ -193,25 +193,27 @@ async function getHandler(request: NextRequest) {
     const response = await fetch(filteredLogo);
     const arrayBuffer = await response.arrayBuffer();
     let buffer: Buffer = Buffer.from(arrayBuffer);
+    let contentType = response.headers.get("content-type") || "image/png";
 
-    // If we need to resize the team logos (via Next.js' built-in image processing)
+    // Resize the team logos if needed
     if (teamLogos[logoDefinition.source] && logoDefinition.w) {
-      const { detectContentType, optimizeImage } = await import("next/dist/server/image-optimizer");
+      const { resizeImage } = await import("@calcom/lib/server/imageUtils");
-
+      const { buffer: outBuffer, contentType: outContentType } = await resizeImage({
-      buffer = await optimizeImage({
         buffer,
-        contentType: (await detectContentType(buffer)) ?? "image/jpeg",
-        quality: 100,
         width: logoDefinition.w,
-        height: logoDefinition.h, // optional
+        height: logoDefinition.h,
+        quality: 100,
+        contentType,
       });
+      buffer = outBuffer;
+      contentType = outContentType;
     }
 
     // Create a new response with the image buffer
     const imageResponse = new NextResponse(buffer as BodyInit);
 
     // Set the appropriate headers
-    imageResponse.headers.set("Content-Type", response.headers.get("content-type") || "image/png");
+    imageResponse.headers.set("Content-Type", contentType);
     imageResponse.headers.set("Cache-Control", "s-maxage=86400, stale-while-revalidate=60");
 
     return imageResponse;

apps/web/app/api/teams/[team]/upgrade/route.ts

@@ -12,7 +12,7 @@ import stripe from "@calcom/features/ee/payments/server/stripe";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { HttpError } from "@calcom/lib/http-error";
 import prisma from "@calcom/prisma";
-import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
+import { teamMetadataStrictSchema } from "@calcom/prisma/zod-utils";
 
 import { buildLegacyRequest } from "@lib/buildLegacyCtx";
 
@@ -50,7 +50,7 @@ async function getHandler(req: NextRequest, { params }: { params: Promise<Params
     if (!team) {
       const prevTeam = await prisma.team.findFirstOrThrow({ where: { id } });
 
-      metadata = teamMetadataSchema.safeParse(prevTeam.metadata);
+      metadata = teamMetadataStrictSchema.safeParse(prevTeam.metadata);
       if (!metadata.success) {
         throw new HttpError({ statusCode: 400, message: "Invalid team metadata" });
       }
@@ -80,7 +80,7 @@ async function getHandler(req: NextRequest, { params }: { params: Promise<Params
     }
 
     if (!metadata) {
-      metadata = teamMetadataSchema.safeParse(team.metadata);
+      metadata = teamMetadataStrictSchema.safeParse(team.metadata);
       if (!metadata.success) {
         throw new HttpError({ statusCode: 400, message: "Invalid team metadata" });
       }

apps/web/app/auth/new/page.tsx

@@ -1,5 +0,0 @@
-import { redirect } from "next/navigation";
-
-export default function Page() {
-  redirect(process.env.NEXT_PUBLIC_WEBAPP_URL || "https://app.cal.com");
-}

apps/web/app/icons/page.tsx

@@ -1,4 +1,5 @@
-import { _generateMetadata, getTranslate } from "app/_utils";
+import { _generateMetadataForStaticPage } from "app/_utils";
+import type { Metadata } from "next";
 import { Inter } from "next/font/google";
 import localFont from "next/font/local";
 
@@ -8,6 +9,15 @@ import type { IconName } from "@calcom/ui/components/icon";
 import { lucideIconList } from "../../../../packages/ui/components/icon/icon-list.mjs";
 import { IconGrid } from "./IconGrid";
 
+export const dynamic = "force-static";
+export const metadata: Metadata = _generateMetadataForStaticPage(
+  "Icons Showcase",
+  "",
+  undefined,
+  undefined,
+  "/icons"
+);
+
 const interFont = Inter({ subsets: ["latin"], variable: "--font-inter", preload: true, display: "swap" });
 const calFont = localFont({
   src: "../../fonts/CalSans-SemiBold.woff2",
@@ -16,25 +26,16 @@ const calFont = localFont({
   display: "swap",
   weight: "600",
 });
-export const generateMetadata = async () => {
+
-  return await _generateMetadata(
+export default function IconsPage() {
-    (t) => t("icon_showcase"),
-    () => "",
-    undefined,
-    undefined,
-    "/icons"
-  );
-};
-export default async function IconsPage() {
   const icons = Array.from(lucideIconList).sort() as IconName[];
-  const t = await getTranslate();
 
   return (
     <div className={`${interFont.variable} ${calFont.variable}`}>
       <div className="bg-subtle flex h-screen">
         <IconSprites />
         <div className="bg-default m-auto min-w-full rounded-md p-10 text-right ltr:text-left">
-          <h1 className="text-emphasis font-cal text-2xl font-medium">{t("icons_showcase")}</h1>
+          <h1 className="text-emphasis font-cal text-2xl font-medium">Icons Showcase</h1>
           <IconGrid title="Regular Icons" icons={icons} />
           <IconGrid
             title="Filled Icons"

apps/web/app/providers.tsx

@@ -2,6 +2,7 @@
 
 import { TrpcProvider } from "app/_trpc/trpc-provider";
 import { SessionProvider } from "next-auth/react";
+import { usePathname } from "next/navigation";
 import CacheProvider from "react-inlinesvg/provider";
 
 import { WebPushProvider } from "@calcom/features/notifications/WebPushContext";
@@ -17,11 +18,13 @@ type ProvidersProps = {
 };
 export function Providers({ isEmbed, children, nonce }: ProvidersProps) {
   const isBookingPage = useIsBookingPage();
+  const pathname = usePathname();
+  const isOnboardingPage = pathname?.startsWith("/getting-started");
 
   return (
     <SessionProvider>
       <TrpcProvider>
-        {!isBookingPage ? <PlainChat nonce={nonce} /> : null}
+        {!isBookingPage && !isOnboardingPage ? <PlainChat nonce={nonce} /> : null}
         {!isEmbed && !isBookingPage && <NotificationSoundHandler />}
         {/* @ts-expect-error FIXME remove this comment when upgrading typescript to v5 */}
         <CacheProvider>

apps/web/app/routing-forms/page.tsx

@@ -1,7 +0,0 @@
-import { redirect } from "next/navigation";
-
-const Page = () => {
-  redirect("/apps/routing-forms/forms");
-};
-
-export default Page;

apps/web/components/dialog/ReassignDialog.tsx

@@ -218,7 +218,7 @@ export const ReassignDialog = ({
                     placeholder={t("search")}
                     onChange={(e) => setSearchTerm(e.target.value)}
                   />
-                  <div className="scroll-bar flex h-[150px] flex-col gap-0.5 overflow-y-scroll rounded-md border p-1">
+                  <div className="scroll-bar mt-2 flex h-[150px] flex-col gap-0.5 overflow-y-scroll rounded-md border p-1">
                     {teamMemberOptions.map((member) => (
                       <label
                         key={member.value}

apps/web/components/dialog/RerouteDialog.tsx

@@ -539,18 +539,11 @@ const NewRoutingManager = ({
       url: chosenEventUrls.eventBookingAbsoluteUrl,
     });
 
-    console.log("SETTING NEW VALUE", {
-      type: "reschedule_to_different_event_new_tab",
-      reschedulerWindow,
-      newBooking: null,
-    });
     reroutingState.setValue({
       type: "reschedule_to_different_event_new_tab",
       reschedulerWindow,
       newBooking: null,
     });
-
-    console.log("VALUE NOW", JSON.stringify(reroutingState));
   }
 
   function reroutingPreview() {

apps/web/components/getting-started/components/AppConnectionItem.tsx

@@ -84,6 +84,7 @@ const AppConnectionItem = (props: IAppConnectionItem) => {
                           {t("this_app_requires_connected_account", {
                             appName: title,
                             dependencyName: dependency.name,
+                            interpolation: { escapeValue: false },
                           })}
                         </span>
 

apps/web/components/getting-started/steps-views/ConnectCalendars.tsx

@@ -92,7 +92,7 @@ const ConnectedCalendars = (props: IConnectCalendarsProps) => {
         loading={isPageLoading}
         onClick={() => nextStep()}
         disabled={disabledNextButton}>
-        {firstCalendar ? `${t("continue")}` : `${t("next_step_text")}`}
+        {firstCalendar ? `${t("connect_your_video")}` : `${t("connect_calendar_first")}`}
       </Button>
     </>
   );

apps/web/components/getting-started/steps-views/ConnectedVideoStep.tsx

@@ -105,7 +105,7 @@ const ConnectedVideoStep = (props: ConnectedAppStepProps) => {
         disabled={!hasAnyInstalledVideoApps}
         loading={isPageLoading}
         onClick={() => nextStep()}>
-        {t("next_step_text")}
+        {t("set_availability")}
       </Button>
     </>
   );

apps/web/components/getting-started/steps-views/SetupAvailability.tsx

@@ -81,7 +81,7 @@ const SetupAvailability = (props: ISetupAvailabilityProps) => {
           className="mt-2 w-full justify-center p-2 text-sm sm:mt-8"
           loading={availabilityForm.formState.isSubmitting}
           disabled={availabilityForm.formState.isSubmitting}>
-          {t("next_step_text")}
+          {t("complete_profile")}
         </Button>
       </div>
     </Form>

apps/web/components/getting-started/steps-views/UserProfile.tsx

@@ -164,7 +164,7 @@ const UserProfile = ({ user }: UserProfileProps) => {
         EndIcon="arrow-right"
         type="submit"
         className="mt-8 w-full items-center justify-center">
-        {t("finish")}
+        {t("finish_and_start")}
       </Button>
     </form>
   );

apps/web/components/getting-started/steps-views/UserSettings.tsx

@@ -88,6 +88,7 @@ const UserSettings = (props: IUserSettingsProps) => {
             id="name"
             name="name"
             type="text"
+            placeholder="John Doe"
             autoComplete="off"
             autoCorrect="off"
           />
@@ -121,7 +122,7 @@ const UserSettings = (props: IUserSettingsProps) => {
         className="mt-8 flex w-full flex-row justify-center"
         loading={mutation.isPending}
         disabled={mutation.isPending}>
-        {t("next_step_text")}
+        {t("connect_your_calendar")}
       </Button>
     </form>
   );

apps/web/components/notification-sound-handler.tsx

@@ -22,7 +22,6 @@ export function NotificationSoundHandler() {
         const response = await fetch("/ring.mp3");
         const arrayBuffer = await response.arrayBuffer();
         audioBufferRef.current = await audioContextRef.current.decodeAudioData(arrayBuffer);
-        console.log("Audio file loaded and decoded");
       }
 
       return true;
@@ -62,7 +61,6 @@ export function NotificationSoundHandler() {
 
       source.loop = true;
       source.start(0);
-      console.log("Sound started playing");
 
       setTimeout(() => {
         if (sourceRef.current === source) {
@@ -101,7 +99,7 @@ export function NotificationSoundHandler() {
 
   useEffect(() => {
     if (!("serviceWorker" in navigator)) {
-      console.log("ServiceWorker not available");
+      console.warn("ServiceWorker not available");
       return;
     }
 

apps/web/components/ui/UsernameAvailability/UsernameTextfield.tsx

@@ -120,6 +120,7 @@ const UsernameTextfield = (props: ICustomUsernameProps & Partial<React.Component
           <TextField
             ref={usernameRef}
             name="username"
+            placeholder="john"
             value={inputUsernameValue}
             autoComplete="none"
             autoCapitalize="none"

apps/web/modules/auth/platform/authorize-view.tsx

@@ -6,9 +6,9 @@ import { APP_NAME } from "@calcom/lib/constants";
 import { useCompatSearchParams } from "@calcom/lib/hooks/useCompatSearchParams";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { PERMISSIONS_GROUPED_MAP } from "@calcom/platform-constants/permissions";
-import { Icon } from "@calcom/ui/components/icon";
 import { Avatar } from "@calcom/ui/components/avatar";
 import { Button } from "@calcom/ui/components/button";
+import { Icon } from "@calcom/ui/components/icon";
 
 import { hasPermission } from "../../../../../packages/platform/utils/permissions";
 
@@ -32,8 +32,6 @@ export default function Authorize() {
     permissions: 7,
   };
 
-  console.log("These are the search params:", queryString);
-
   const permissions = Object.values(PERMISSIONS_GROUPED_MAP).map((value) => {
     let permissionsMessage = "";
     const hasReadPermission = hasPermission(client.permissions, value.read);

apps/web/modules/bookings/views/bookings-single-view.tsx

@@ -26,6 +26,7 @@ import {
   SystemField,
   TITLE_FIELD,
 } from "@calcom/features/bookings/lib/SystemField";
+import { RATING_OPTIONS, validateRating } from "@calcom/features/bookings/lib/rating";
 import { getCalendarLinks, CalendarLinkType } from "@calcom/lib/bookings/getCalendarLinks";
 import { APP_NAME } from "@calcom/lib/constants";
 import { formatToLocalizedDate, formatToLocalizedTime, formatToLocalizedTimezone } from "@calcom/lib/dayjs";
@@ -179,14 +180,13 @@ export default function Success(props: PageProps) {
   const shouldAlignCentrally = !isEmbed || shouldAlignCentrallyInEmbed;
   const [calculatedDuration, setCalculatedDuration] = useState<number | undefined>(undefined);
   const [comment, setComment] = useState("");
-  const parsedRating = rating ? parseInt(rating, 10) : 3;
   const currentUserEmail =
     searchParams?.get("rescheduledBy") ??
     searchParams?.get("cancelledBy") ??
     session?.user?.email ??
     undefined;
 
-  const defaultRating = isNaN(parsedRating) ? 3 : parsedRating > 5 ? 5 : parsedRating < 1 ? 1 : parsedRating;
+  const defaultRating = validateRating(rating);
   const [rateValue, setRateValue] = useState<number>(defaultRating);
   const [isFeedbackSubmitted, setIsFeedbackSubmitted] = useState(false);
 
@@ -1026,61 +1026,20 @@ export default function Success(props: PageProps) {
                   ) : (
                     <>
                       <div className="my-3 flex justify-center space-x-1">
-                        <button
+                        {RATING_OPTIONS.map((option) => (
-                          className={classNames(
+                          <button
-                            "flex h-10 w-10 items-center justify-center rounded-full border text-2xl hover:opacity-100",
+                            key={option.value}
-                            rateValue === 1
+                            className={classNames(
-                              ? "border-emphasis bg-emphasis"
+                              "flex h-10 w-10 items-center justify-center rounded-full border text-2xl hover:opacity-100",
-                              : "border-muted bg-default opacity-50"
+                              rateValue === option.value
-                          )}
+                                ? "border-emphasis bg-emphasis"
-                          disabled={isFeedbackSubmitted}
+                                : "border-muted bg-default opacity-50"
-                          onClick={() => setRateValue(1)}>
+                            )}
-                          😠
+                            disabled={isFeedbackSubmitted}
-                        </button>
+                            onClick={() => setRateValue(option.value)}>
-                        <button
+                            {option.emoji}
-                          className={classNames(
+                          </button>
-                            "flex h-10 w-10 items-center justify-center rounded-full border text-2xl hover:opacity-100",
+                        ))}
-                            rateValue === 2
-                              ? "border-emphasis bg-emphasis"
-                              : "border-muted bg-default opacity-50"
-                          )}
-                          disabled={isFeedbackSubmitted}
-                          onClick={() => setRateValue(2)}>
-                          🙁
-                        </button>
-                        <button
-                          className={classNames(
-                            "flex h-10 w-10 items-center justify-center rounded-full border text-2xl hover:opacity-100",
-                            rateValue === 3
-                              ? "border-emphasis bg-emphasis"
-                              : " border-muted bg-default opacity-50"
-                          )}
-                          disabled={isFeedbackSubmitted}
-                          onClick={() => setRateValue(3)}>
-                          😐
-                        </button>
-                        <button
-                          className={classNames(
-                            "flex h-10 w-10 items-center justify-center rounded-full border text-2xl hover:opacity-100",
-                            rateValue === 4
-                              ? "border-emphasis bg-emphasis"
-                              : "border-muted bg-default opacity-50"
-                          )}
-                          disabled={isFeedbackSubmitted}
-                          onClick={() => setRateValue(4)}>
-                          😄
-                        </button>
-                        <button
-                          className={classNames(
-                            "flex h-10 w-10 items-center justify-center rounded-full border text-2xl hover:opacity-100",
-                            rateValue === 5
-                              ? "border-emphasis bg-emphasis"
-                              : "border-muted bg-default opacity-50"
-                          )}
-                          disabled={isFeedbackSubmitted}
-                          onClick={() => setRateValue(5)}>
-                          😍
-                        </button>
                       </div>
                       <div className="my-4 space-y-1 text-center">
                         <h2 className="font-cal text-lg">{t("submitted_feedback")}</h2>

apps/web/modules/getting-started/[[...step]]/onboarding-view.tsx

@@ -42,7 +42,7 @@ const getStepsAndHeadersForUser = (t: TFunction) => {
   }[] = [
     {
       title: t("welcome_to_cal_header", { appName: APP_NAME }),
-      subtitle: [t("we_just_need_basic_info"), t("edit_form_later_subtitle")],
+      subtitle: [t("we_just_need_basic_info")],
     },
     {
       title: t("connect_your_calendar"),
@@ -57,8 +57,9 @@ const getStepsAndHeadersForUser = (t: TFunction) => {
     {
       title: t("set_availability"),
       subtitle: [
-        t("set_availability_getting_started_subtitle_1"),
+        `${t("set_availability_getting_started_subtitle_1")} ${t(
-        t("set_availability_getting_started_subtitle_2"),
+          "set_availability_getting_started_subtitle_2"
+        )}`,
       ],
     },
     {

apps/web/modules/insights/insights-view.tsx

@@ -19,6 +19,8 @@ import {
   LowestRatedMembersTable,
   MostBookedTeamMembersTable,
   MostCancelledBookingsTables,
+  MostCompletedTeamMembersTable,
+  LeastCompletedTeamMembersTable,
   PopularEventsTable,
   RecentFeedbackTable,
   TimezoneBadge,
@@ -82,20 +84,23 @@ function InsightsPageContent() {
         </div>
 
         <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-4">
-          <div className="sm:col-span-2">
-            <PopularEventsTable />
-          </div>
           <MostBookedTeamMembersTable />
           <LeastBookedTeamMembersTable />
+          <MostCompletedTeamMembersTable />
+          <LeastCompletedTeamMembersTable />
         </div>
 
         <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-4">
           <MostCancelledBookingsTables />
           <HighestNoShowHostTable />
+          <div className="sm:col-span-2">
+            <PopularEventsTable />
+          </div>
+        </div>
+
+        <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-4">
           <HighestRatedMembersTable />
           <LowestRatedMembersTable />
-        </div>
-        <div className="grid grid-cols-1 gap-4 sm:grid-cols-2 md:grid-cols-4">
           <div className="sm:col-span-2">
             <RecentFeedbackTable />
           </div>

apps/web/modules/settings/billing/components/BillingCredits.tsx

@@ -16,7 +16,7 @@ import { Button } from "@calcom/ui/components/button";
 import { Select } from "@calcom/ui/components/form";
 import { TextField, Label, InputError } from "@calcom/ui/components/form";
 import { ProgressBar } from "@calcom/ui/components/progress-bar";
-import { showToast } from "@calcom/ui/toast";
+import { showToast } from "@calcom/ui/components/toast";
 
 import { BillingCreditsSkeleton } from "./BillingCreditsSkeleton";
 

apps/web/modules/signup-view.tsx

@@ -197,6 +197,7 @@ export default function Signup({
 
   useEffect(() => {
     if (redirectUrl) {
+      // eslint-disable-next-line @calcom/eslint/avoid-web-storage
       localStorage.setItem("onBoardingRedirect", redirectUrl);
     }
   }, [redirectUrl]);
@@ -216,7 +217,6 @@ export default function Signup({
       if (err.checkoutSessionId) {
         const stripe = await getStripe();
         if (stripe) {
-          console.log("Redirecting to stripe checkout");
           const { error } = await stripe.redirectToCheckout({
             sessionId: err.checkoutSessionId,
           });
@@ -470,6 +470,7 @@ export default function Signup({
                           showToast("error", t("username_required"));
                           return;
                         }
+                        // eslint-disable-next-line @calcom/eslint/avoid-web-storage
                         localStorage.setItem("username", username);
                         const sp = new URLSearchParams();
                         // @NOTE: don't remove username query param as it's required right now for stripe payment page
@@ -539,6 +540,7 @@ export default function Signup({
                         if (prepopulateFormValues?.username) {
                           // If username is present we save it in query params to check for premium
                           searchQueryParams.set("username", prepopulateFormValues.username);
+                          // eslint-disable-next-line @calcom/eslint/avoid-web-storage
                           localStorage.setItem("username", prepopulateFormValues.username);
                         }
                         if (token) {

apps/web/next.config.js

@@ -196,6 +196,8 @@ const nextConfig = (phase) => {
     experimental: {
       // externalize server-side node_modules with size > 1mb, to improve dev mode performance/RAM usage
       optimizePackageImports: ["@calcom/ui"],
+      webpackMemoryOptimizations: true,
+      webpackBuildWorker: true,
     },
     productionBrowserSourceMaps: true,
     /* We already do type check on GH actions */
@@ -231,7 +233,15 @@ const nextConfig = (phase) => {
     images: {
       unoptimized: true,
     },
-    webpack: (config, { webpack, buildId, isServer }) => {
+    webpack: (config, { webpack, buildId, isServer, dev }) => {
+      if (!dev) {
+        if (config.cache) {
+          config.cache = Object.freeze({
+            type: "memory",
+          });
+        }
+      }
+
       if (isServer) {
         // Module not found fix @see https://github.com/boxyhq/jackson/issues/1535#issuecomment-1704381612
         config.plugins.push(
@@ -285,6 +295,10 @@ const nextConfig = (phase) => {
           source: "/routing/:path*",
           destination: "/apps/routing-forms/:path*",
         },
+        {
+          source: "/routing-forms",
+          destination: "/apps/routing-forms/forms",
+        },
         {
           source: "/success/:path*",
           has: [
@@ -538,7 +552,7 @@ const nextConfig = (phase) => {
         },
         {
           source: "/apps/routing-forms",
-          destination: "/routing/forms",
+          destination: "/apps/routing-forms/forms",
           permanent: false,
         },
         {
@@ -546,6 +560,11 @@ const nextConfig = (phase) => {
           destination: "/app-store/:path*",
           permanent: true,
         },
+        {
+          source: "/auth/new",
+          destination: process.env.NEXT_PUBLIC_WEBAPP_URL || "https://app.cal.com",
+          permanent: true,
+        },
         {
           source: "/auth/signup",
           destination: "/signup",
@@ -643,6 +662,11 @@ const nextConfig = (phase) => {
           destination: "/settings/platform",
           permanent: true,
         },
+        {
+          source: "/settings/admin/apps",
+          destination: "/settings/admin/apps/calendar",
+          permanent: true,
+        },
         // OAuth callbacks when sent to localhost:3000(w would be expected) should be redirected to corresponding to WEBAPP_URL
         ...(process.env.NODE_ENV === "development" &&
         // Safer to enable the redirect only when the user is opting to test out organizations

apps/web/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@calcom/web",
-  "version": "5.6.4",
+  "version": "5.6.8",
   "private": true,
   "scripts": {
     "analyze": "ANALYZE=true next build",
@@ -44,8 +44,8 @@
     "@calcom/trpc": "*",
     "@calcom/tsconfig": "*",
     "@calcom/ui": "*",
-    "@daily-co/daily-js": "^0.76.0",
+    "@daily-co/daily-js": "^0.83.1",
-    "@daily-co/daily-react": "^0.22.0",
+    "@daily-co/daily-react": "^0.23.2",
     "@dub/analytics": "^0.0.27",
     "@dub/embed-core": "^0.0.10",
     "@dub/embed-react": "^0.0.10",
@@ -76,6 +76,7 @@
     "@stripe/stripe-js": "^1.35.0",
     "@tanstack/react-query": "^5.17.15",
     "@team-plain/typescript-sdk": "^5.9.0",
+    "@todesktop/client-core": "^1.20.0",
     "@types/turndown": "^5.0.1",
     "@upstash/redis": "^1.35.2",
     "@vercel/edge-config": "^0.1.1",
@@ -114,6 +115,7 @@
     "next-themes": "^0.2.0",
     "nodemailer": "^6.7.8",
     "nuqs": "^1.20.0",
+    "openid-client": "6.5.0",
     "otplib": "^12.0.1",
     "posthog-js": "^1.164.1",
     "posthog-node": "^4.2.0",

apps/web/pages/_applyThemeForDocument.ts

@@ -62,7 +62,7 @@ export const applyTheme = function () {
 export const applyToDesktopClass = function () {
   try {
     const onReady = () => {
-      if (typeof window !== "undefined" && window.todesktop && document.documentElement) {
+      if (typeof window !== "undefined" && window.calIsDesktopApp && document.documentElement) {
         document.documentElement.classList.add("todesktop");
       } else if (document.documentElement) {
         return;

apps/web/pages/_document.tsx

@@ -1,3 +1,4 @@
+import { platform } from "@todesktop/client-core";
 import type { IncomingMessage } from "http";
 import { dir } from "i18next";
 import type { DocumentContext, DocumentProps } from "next/document";
@@ -37,6 +38,14 @@ class MyDocument extends Document<Props> {
     const newLocale = this.props.newLocale || "en";
     const newDir = dir(newLocale);
 
+    const isDesktopApp = (() => {
+      try {
+        return platform.todesktop.isDesktopApp();
+      } catch {
+        return false;
+      }
+    })();
+
     return (
       <Html
         lang={newLocale}
@@ -49,6 +58,7 @@ class MyDocument extends Document<Props> {
             dangerouslySetInnerHTML={{
               __html: `
               window.calNewLocale = "${newLocale}";
+              window.calIsDesktopApp = ${isDesktopApp};
               (${applyTheme.toString()})();
               (${applyToDesktopClass.toString()})();
             `,

apps/web/playwright/booking-duplicate-api-calls.e2e.ts

@@ -0,0 +1,145 @@
+import { expect } from "@playwright/test";
+
+import { createTeamEventType } from "./fixtures/users";
+import { test } from "./lib/fixtures";
+
+test.describe("Duplicate API Calls Prevention", () => {
+  test.afterEach(({ users }) => users.deleteAll());
+
+  test("should detect when schedule endpoints are called multiple times for individual user events", async ({
+    page,
+    users,
+  }) => {
+    const user = await users.create();
+    const eventType = user.eventTypes.find((e) => e.slug === "30-min");
+
+    const trpcCalls: string[] = [];
+    const apiV2Calls: string[] = [];
+
+    // Intercept tRPC getSchedule calls - pattern matches trpc.viewer.slots.getSchedule.useQuery()
+    await page.route("**/api/trpc/viewer.slots.getSchedule**", async (route) => {
+      trpcCalls.push(route.request().url());
+      await route.continue();
+    });
+
+    await page.route("**/api/v2/slots/available**", async (route) => {
+      apiV2Calls.push(route.request().url());
+      await route.continue();
+    });
+
+    await page.goto(`/${user.username}/${eventType?.slug}`);
+
+    await page.waitForTimeout(5000);
+
+    const totalCalls = trpcCalls.length + apiV2Calls.length;
+
+    if (totalCalls === 0) {
+      console.log("No API calls detected - environment may have issues preventing page load");
+      expect(totalCalls).toBeGreaterThanOrEqual(0);
+    } else {
+      expect(totalCalls).toBeLessThanOrEqual(1);
+      expect(trpcCalls.length).toBeLessThanOrEqual(1);
+      expect(apiV2Calls.length).toBeLessThanOrEqual(1);
+    }
+  });
+
+  test("should detect when schedule endpoints are called multiple times for team events", async ({
+    page,
+    users,
+  }) => {
+    const teamOwner = await users.create(
+      { name: "Team Owner" },
+      {
+        hasTeam: true,
+        teammates: [{ name: "teammate-1" }],
+      }
+    );
+
+    const { team } = await teamOwner.getFirstTeamMembership();
+    const teamEvent = await createTeamEventType(
+      { id: teamOwner.id },
+      { id: team.id },
+      { teamEventSlug: "team-event-test", teamEventTitle: "Team Event Test" }
+    );
+
+    const trpcCalls: string[] = [];
+    const apiV2Calls: string[] = [];
+
+    await page.route("**/api/trpc/viewer.slots.getSchedule**", async (route) => {
+      trpcCalls.push(route.request().url());
+      await route.continue();
+    });
+
+    await page.route("**/api/v2/slots/available**", async (route) => {
+      apiV2Calls.push(route.request().url());
+      await route.continue();
+    });
+
+    await page.goto(`/team/${team.slug}/${teamEvent.slug}`);
+
+    await page.waitForTimeout(5000);
+
+    const totalCalls = trpcCalls.length + apiV2Calls.length;
+
+    if (totalCalls === 0) {
+      console.log("No API calls detected - environment may have issues preventing page load");
+      expect(totalCalls).toBeGreaterThanOrEqual(0);
+    } else {
+      expect(totalCalls).toBeLessThanOrEqual(1);
+      expect(trpcCalls.length).toBeLessThanOrEqual(1);
+      expect(apiV2Calls.length).toBeLessThanOrEqual(1);
+    }
+  });
+
+  test("should detect when schedule endpoints are called multiple times for organization team events", async ({
+    page,
+    users,
+  }) => {
+    const orgOwner = await users.create(
+      { name: "Org Owner" },
+      {
+        hasTeam: true,
+        teammates: [{ name: "teammate-1" }],
+        isOrg: true,
+        isOrgVerified: true,
+        hasSubteam: true,
+      }
+    );
+
+    const { team } = await orgOwner.getFirstTeamMembership();
+    const { team: org } = await orgOwner.getOrgMembership();
+    const teamEvent = await createTeamEventType(
+      { id: orgOwner.id },
+      { id: team.id },
+      { teamEventSlug: "org-team-event", teamEventTitle: "Org Team Event" }
+    );
+
+    const trpcCalls: string[] = [];
+    const apiV2Calls: string[] = [];
+
+    await page.route("**/api/trpc/viewer.slots.getSchedule**", async (route) => {
+      trpcCalls.push(route.request().url());
+      await route.continue();
+    });
+
+    await page.route("**/api/v2/slots/available**", async (route) => {
+      apiV2Calls.push(route.request().url());
+      await route.continue();
+    });
+
+    await page.goto(`/org/${org.slug}/${team.slug}/${teamEvent.slug}`);
+
+    await page.waitForTimeout(5000);
+
+    const totalCalls = trpcCalls.length + apiV2Calls.length;
+
+    if (totalCalls === 0) {
+      console.log("No API calls detected - environment may have issues preventing page load");
+      expect(totalCalls).toBeGreaterThanOrEqual(0);
+    } else {
+      expect(totalCalls).toBeLessThanOrEqual(1);
+      expect(trpcCalls.length).toBeLessThanOrEqual(1);
+      expect(apiV2Calls.length).toBeLessThanOrEqual(1);
+    }
+  });
+});

apps/web/playwright/bookings-list.e2e.ts

@@ -5,7 +5,7 @@ import prisma from "@calcom/prisma";
 import { BookingStatus } from "@calcom/prisma/client";
 import { MembershipRole, SchedulingType } from "@calcom/prisma/enums";
 
-import { addFilter, openFilter } from "./filter-helpers";
+import { addFilter } from "./filter-helpers";
 import { createTeamEventType } from "./fixtures/users";
 import type { Fixtures } from "./lib/fixtures";
 import { test } from "./lib/fixtures";
@@ -78,7 +78,6 @@ test.describe("Bookings", () => {
       await bookingsGetResponse;
 
       await addFilter(page, "dateRange");
-      await openFilter(page, "dateRange");
 
       await expect(page.locator('[data-testid="date-range-options-c"]')).toBeHidden();
       await expect(page.locator('[data-testid="date-range-options-w"]')).toBeHidden();
@@ -244,7 +243,6 @@ test.describe("Bookings", () => {
       await bookingsGetResponse;
 
       await addFilter(page, "dateRange");
-      await openFilter(page, "dateRange");
 
       await expect(page.locator('[data-testid="date-range-options-c"]')).toBeVisible();
       await expect(page.locator('[data-testid="date-range-options-w"]')).toBeVisible();
@@ -354,7 +352,6 @@ test.describe("Bookings", () => {
     await bookingsGetResponse;
 
     await addFilter(page, "userId");
-    await openFilter(page, "userId");
 
     const bookingsGetResponse2 = page.waitForResponse(
       (response) => response.url().includes("/api/trpc/bookings/get?batch=1") && response.status() === 200
@@ -463,7 +460,6 @@ test.describe("Bookings", () => {
     await bookingsGetResponse1;
 
     await addFilter(page, "userId");
-    await openFilter(page, "userId");
     const bookingsGetResponse2 = page.waitForResponse((response) =>
       /\/api\/trpc\/bookings\/get.*/.test(response.url())
     );

apps/web/playwright/dynamic-booking-pages.e2e.ts

@@ -109,10 +109,7 @@ test("multiple duration selection updates event length correctly", async ({ page
     await page.waitForSelector('[data-testid="event-types"]');
     await page.click(`text=Multiple duration`);
     await page.waitForSelector('[data-testid="event-title"]');
-    await expect(page.getByTestId("vertical-tab-event_setup_tab_title")).toHaveAttribute(
+    await expect(page.getByTestId("vertical-tab-basics")).toHaveAttribute("aria-current", "page");
-      "aria-current",
-      "page"
-    );
     await page.getByTestId("vertical-tab-event_advanced_tab_title").click();
     await page.fill('[name="eventName"]', "{Event duration} event btwn {Organiser} {Scheduler}");
     await page.locator('[data-testid="update-eventtype"]').click();

apps/web/playwright/event-types.e2e.ts

@@ -77,10 +77,7 @@ test.describe("Event Types tests", () => {
 
       // fix the race condition
       await page.waitForSelector('[data-testid="event-title"]');
-      await expect(page.getByTestId("vertical-tab-event_setup_tab_title")).toHaveAttribute(
+      await expect(page.getByTestId("vertical-tab-basics")).toHaveAttribute("aria-current", "page");
-        "aria-current",
-        "page"
-      );
 
       await page.click("[data-testid=vertical-tab-recurring]");
       await expect(page.locator("[data-testid=recurring-event-collapsible]")).toBeHidden();
@@ -447,6 +444,37 @@ test.describe("Event Types tests", () => {
       await expect(currentTimezone).toHaveClass(/cursor-not-allowed/);
       await expect(page.getByText("New York")).toBeVisible();
     });
+    test("should create recurring event and successfully book multiple occurrences", async ({ page }) => {
+      const nonce = randomString(3);
+      const eventTitle = `Recurring Event Test ${nonce}`;
+
+      await createNewUserEventType(page, { eventTitle });
+
+      await page.waitForSelector('[data-testid="event-title"]');
+      await expect(page.getByTestId("vertical-tab-basics")).toHaveAttribute("aria-current", "page");
+      await page.click("[data-testid=vertical-tab-recurring]");
+      await expect(page.locator("[data-testid=recurring-event-collapsible]")).toBeHidden();
+      await page.click("[data-testid=recurring-event-check]");
+      await expect(page.locator("[data-testid=recurring-event-collapsible]")).toBeVisible();
+
+      await page.locator("[data-testid=recurring-event-collapsible] input[type=number]").nth(1).fill("3");
+
+      await saveEventType(page);
+
+      await gotoBookingPage(page);
+
+      await expect(page.locator("[data-testid=occurrence-input]")).toHaveValue("3");
+
+      await selectFirstAvailableTimeSlotNextMonth(page);
+
+      await expect(page.locator("[data-testid=recurring-dates]")).toBeVisible();
+
+      await bookTimeSlot(page, { isRecurringEvent: true });
+
+      await expect(page.locator("[data-testid=success-page]")).toBeVisible();
+
+      await expect(page.locator("text=3 occurrences")).toBeVisible();
+    });
   });
 
   test.describe("Interface Language Tests", () => {

apps/web/playwright/filter-helpers.ts

@@ -17,15 +17,20 @@ export async function openFilter(page: Page, columnId: string) {
   await page.getByTestId(`filter-popover-trigger-${columnId}`).click();
 }
 
+export async function addOrOpenFilter(page: Page, columnId: string) {
+  const existingFilter = page.getByTestId(`filter-popover-trigger-${columnId}`);
+  if (await existingFilter.isVisible()) {
+    await openFilter(page, columnId);
+  } else {
+    await addFilter(page, columnId);
+  }
+}
+
 /**
  * Apply a filter with a specific value
  */
 export async function applySelectFilter(page: Page, columnId: string, value: string) {
-  const existingFilter = page.getByTestId(`filter-popover-trigger-${columnId}`);
+  await addOrOpenFilter(page, columnId);
-  if (!(await existingFilter.isVisible())) {
-    await addFilter(page, columnId);
-  }
-  await openFilter(page, columnId);
   await selectOptionValue(page, columnId, value);
   await page.keyboard.press("Escape");
 }
@@ -36,11 +41,7 @@ export async function selectOptionValue(page: Page, columnId: string, value: str
 }
 
 export async function applyTextFilter(page: Page, columnId: string, operator: string, operand?: string) {
-  const existingFilter = page.getByTestId(`filter-popover-trigger-${columnId}`);
+  await addOrOpenFilter(page, columnId);
-  if (!(await existingFilter.isVisible())) {
-    await addFilter(page, columnId);
-  }
-  await openFilter(page, columnId);
 
   await page.getByTestId(`text-filter-options-select-${columnId}`).click();
   await page
@@ -58,11 +59,7 @@ export async function applyTextFilter(page: Page, columnId: string, operator: st
 }
 
 export async function applyNumberFilter(page: Page, columnId: string, operator: string, operand: number) {
-  const existingFilter = page.getByTestId(`filter-popover-trigger-${columnId}`);
+  await addOrOpenFilter(page, columnId);
-  if (!(await existingFilter.isVisible())) {
-    await addFilter(page, columnId);
-  }
-  await openFilter(page, columnId);
 
   await page.getByTestId(`number-filter-options-select-${columnId}`).click();
   await page

apps/web/playwright/fixtures/apps.ts

@@ -123,7 +123,7 @@ export function createAppsFixture(page: Page) {
     },
     verifyAppsInfoNew: async (app: string, eventTypeId: number) => {
       await page.goto(`event-types/${eventTypeId}?tabName=apps`);
-      await expect(page.getByTestId("vertical-tab-event_setup_tab_title")).toContainText("Event Setup"); // fix the race condition
+      await expect(page.getByTestId("vertical-tab-basics")).toContainText("Basics"); // fix the race condition
       await expect(page.locator(`[data-testid='${app}-app-switch'][data-state="checked"]`)).toBeVisible();
     },
   };

apps/web/playwright/hash-my-url.e2e.ts

@@ -69,7 +69,7 @@ test.describe("private links creation and usage", () => {
 
     // Ensure that private URL is enabled after modifying the event type.
     // Additionally, if the slug is changed, ensure that the private URL is updated accordingly.
-    await page.getByTestId("vertical-tab-event_setup_tab_title").click();
+    await page.getByTestId("vertical-tab-basics").click();
     await page.locator("[data-testid=event-title]").first().fill("somethingrandom");
     await page.locator("[data-testid=event-slug]").first().fill("somethingrandom");
     await expect(page.locator('[data-testid="event-slug"]').first()).toHaveValue("somethingrandom");

apps/web/playwright/insights-routing-filters.e2e.ts

@@ -288,7 +288,6 @@ test.describe("Insights > Routing Filters", () => {
     await page.goto(`/insights/routing`);
 
     await addFilter(page, "bookingAttendees");
-    await openFilter(page, "bookingAttendees");
     await page.getByPlaceholder("Filter attendees by name or email").fill("John");
     await page.keyboard.press("Enter");
 
@@ -297,7 +296,6 @@ test.describe("Insights > Routing Filters", () => {
 
     await clearFilters(page);
     await addFilter(page, "bookingAttendees");
-    await openFilter(page, "bookingAttendees");
     await page.getByPlaceholder("Filter attendees by name or email").fill("jane.smith@example");
     await page.keyboard.press("Enter");
 
@@ -306,7 +304,6 @@ test.describe("Insights > Routing Filters", () => {
 
     await clearFilters(page);
     await addFilter(page, "bookingAttendees");
-    await openFilter(page, "bookingAttendees");
     await page.getByPlaceholder("Filter attendees by name or email").fill("JANE");
     await page.keyboard.press("Enter");
 

apps/web/playwright/lib/orgMigration.ts

@@ -9,7 +9,7 @@ import type { Team, User } from "@calcom/prisma/client";
 import { RedirectType } from "@calcom/prisma/client";
 import { Prisma } from "@calcom/prisma/client";
 import type { MembershipRole } from "@calcom/prisma/enums";
-import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
+import { teamMetadataSchema, teamMetadataStrictSchema } from "@calcom/prisma/zod-utils";
 
 const log = logger.getSubLogger({ prefix: ["orgMigration"] });
 
@@ -588,7 +588,7 @@ async function dbRemoveTeamFromOrg({ teamId }: { teamId: number }) {
     });
   }
 
-  const teamMetadata = teamMetadataSchema.parse(team?.metadata);
+  const teamMetadata = teamMetadataStrictSchema.parse(team?.metadata);
   try {
     return await prisma.team.update({
       where: {

apps/web/playwright/lib/testUtils.ts

@@ -155,6 +155,7 @@ export const bookTimeSlot = async (
     title?: string;
     attendeePhoneNumber?: string;
     expectedStatusCode?: number;
+    isRecurringEvent?: boolean;
   }
 ) => {
   // --- fill form
@@ -166,8 +167,9 @@ export const bookTimeSlot = async (
   if (opts?.attendeePhoneNumber) {
     await page.fill('[name="attendeePhoneNumber"]', opts.attendeePhoneNumber ?? "+918888888888");
   }
-  await submitAndWaitForResponse(page, "/api/book/event", {
+  const url = opts?.isRecurringEvent ? "/api/book/recurring-event" : "/api/book/event";
-    action: () => page.locator('[name="email"]').press("Enter"),
+  await submitAndWaitForResponse(page, url, {
+    action: () => page.locator('[data-testid="confirm-book-button"]').click(),
     expectedStatusCode: opts?.expectedStatusCode,
   });
 };
@@ -222,10 +224,7 @@ export const createNewSeatedEventType = async (page: Page, args: { eventTitle: s
   const eventTitle = args.eventTitle;
   await createNewUserEventType(page, { eventTitle });
   await page.waitForSelector('[data-testid="event-title"]');
-  await expect(page.getByTestId("vertical-tab-event_setup_tab_title")).toHaveAttribute(
+  await expect(page.getByTestId("vertical-tab-basics")).toHaveAttribute("aria-current", "page");
-    "aria-current",
-    "page"
-  );
   await page.locator('[data-testid="vertical-tab-event_advanced_tab_title"]').click();
   await page.locator('[data-testid="offer-seats-toggle"]').click();
   await page.locator('[data-testid="update-eventtype"]').click();

apps/web/playwright/manage-booking-questions.e2e.ts

@@ -70,10 +70,7 @@ test.describe("Manage Booking Questions", () => {
         const firstEventTypeElement = $eventTypes.first();
 
         await firstEventTypeElement.click();
-        await expect(page.getByTestId("vertical-tab-event_setup_tab_title")).toHaveAttribute(
+        await expect(page.getByTestId("vertical-tab-basics")).toHaveAttribute("aria-current", "page");
-          "aria-current",
-          "page"
-        );
         await page.getByTestId("vertical-tab-event_advanced_tab_title").click();
       });
 
@@ -117,10 +114,7 @@ test.describe("Manage Booking Questions", () => {
         const firstEventTypeElement = $eventTypes.first();
 
         await firstEventTypeElement.click();
-        await expect(page.getByTestId("vertical-tab-event_setup_tab_title")).toHaveAttribute(
+        await expect(page.getByTestId("vertical-tab-basics")).toHaveAttribute("aria-current", "page");
-          "aria-current",
-          "page"
-        );
       });
 
       await test.step("Open the 'Name' field dialog", async () => {
@@ -642,8 +636,8 @@ async function toggleQuestionRequireStatusAndSave({
   await page.locator(`[data-testid="field-${name}"]`).locator('[data-testid="edit-field-action"]').click();
   await page
     .locator('[data-testid="edit-field-dialog"]')
-    .locator('[data-testid="field-required"] button')
+    .locator('[data-testid="field-required"]')
-    .locator(`text=${required ? "Yes" : "No"}`)
+    .first()
     .click();
   await page.locator('[data-testid="field-add-save"]').click();
   await saveEventType(page);
@@ -754,11 +748,8 @@ test.describe("Text area min and max characters text", () => {
     await page.waitForSelector('[data-testid="event-types"]');
     await createNewUserEventType(page, { eventTitle });
     await page.waitForSelector('[data-testid="event-title"]');
-    await expect(page.getByTestId("vertical-tab-event_setup_tab_title")).toContainText("Event Setup"); //fix the race condition
+    await expect(page.getByTestId("vertical-tab-basics")).toContainText("Basics"); //fix the race condition
-    await expect(page.getByTestId("vertical-tab-event_setup_tab_title")).toHaveAttribute(
+    await expect(page.getByTestId("vertical-tab-basics")).toHaveAttribute("aria-current", "page");
-      "aria-current",
-      "page"
-    );
     await page.getByTestId("vertical-tab-event_advanced_tab_title").click();
     const insertQuestion = async (questionName: string) => {
       const element = page.locator('[data-testid="add-field"]');

apps/web/playwright/managed-event-types.e2e.ts

@@ -79,11 +79,8 @@ test.describe("Managed Event Types", () => {
     const { adminUser, managedEvent } = await setupManagedEvent({ users });
     await adminUser.apiLogin();
     await page.goto(`/event-types/${managedEvent.id}?tabName=setup`);
-    await expect(page.getByTestId("vertical-tab-event_setup_tab_title")).toHaveAttribute(
+    await expect(page.getByTestId("vertical-tab-basics")).toHaveAttribute("aria-current", "page"); // fix the race condition
-      "aria-current",
+    await expect(page.getByTestId("vertical-tab-basics")).toContainText("Basics"); //fix the race condition
-      "page"
-    ); // fix the race condition
-    await expect(page.getByTestId("vertical-tab-event_setup_tab_title")).toContainText("Event Setup"); //fix the race condition
     await page.locator("#location-select").click();
     const optionText = await getByKey(page, "organizer_default_conferencing_app");
     await expect(optionText).toBeVisible();

apps/web/playwright/onboarding.e2e.ts

@@ -21,7 +21,7 @@ test.describe("Onboarding", () => {
       // tests whether the user makes it to /getting-started
       // after login with completedOnboarding false
       await page.waitForURL("/getting-started");
-      await expect(page.locator('text="Next Step"')).toBeVisible(); // Fix race condition
+      await expect(page.locator('text="Connect your calendar"')).toBeVisible(); // Fix race condition
 
       await test.step("step 1 - User Settings", async () => {
         // Check required fields

apps/web/playwright/organization/booking.e2e.ts

@@ -780,8 +780,8 @@ const markPhoneNumberAsRequiredAndEmailAsOptional = async (page: Page, eventId:
 
   // Make email as not required
   await page.locator('[data-testid="field-email"] [data-testid="edit-field-action"]').click();
-  const emailRequiredFiled = await page.locator('[data-testid="field-required"]');
+  const emailRequiredFiled = await page.locator('[data-testid="field-required"]').first();
-  await emailRequiredFiled.locator("> :nth-child(2)").click();
+  await emailRequiredFiled.click();
   await page.getByTestId("field-add-save").click();
   await submitAndWaitForResponse(page, "/api/trpc/eventTypes/update?batch=1", {
     action: () => page.locator("[data-testid=update-eventtype]").click(),
@@ -790,12 +790,12 @@ const markPhoneNumberAsRequiredAndEmailAsOptional = async (page: Page, eventId:
 
 const markPhoneNumberAsRequiredField = async (page: Page, eventId: number) => {
   await page.goto(`/event-types/${eventId}?tabName=advanced`);
-  await expect(page.getByTestId("vertical-tab-event_setup_tab_title")).toContainText("Event Setup"); // fix the race condition
+  await expect(page.getByTestId("vertical-tab-basics")).toContainText("Basics"); // fix the race condition
 
   await page.locator('[data-testid="field-attendeePhoneNumber"] [data-testid="toggle-field"]').click();
   await page.locator('[data-testid="field-attendeePhoneNumber"] [data-testid="edit-field-action"]').click();
-  const phoneRequiredFiled = await page.locator('[data-testid="field-required"]');
+  const phoneRequiredFiled = await page.locator('[data-testid="field-required"]').first();
-  await phoneRequiredFiled.locator("> :nth-child(1)").click();
+  await phoneRequiredFiled.click();
   await page.getByTestId("field-add-save").click();
   await submitAndWaitForResponse(page, "/api/trpc/eventTypes/update?batch=1", {
     action: () => page.locator("[data-testid=update-eventtype]").click(),

apps/web/playwright/out-of-office.e2e.ts

@@ -7,7 +7,7 @@ import { randomString } from "@calcom/lib/random";
 import prisma from "@calcom/prisma";
 import { MembershipRole } from "@calcom/prisma/enums";
 
-import { addFilter, openFilter } from "./filter-helpers";
+import { addFilter } from "./filter-helpers";
 import { test } from "./lib/fixtures";
 import { localize } from "./lib/localize";
 import { submitAndWaitForResponse } from "./lib/testUtils";
@@ -673,7 +673,6 @@ test.describe("Out of office", () => {
         (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
       );
       await addFilter(page, "dateRange");
-      await openFilter(page, "dateRange");
 
       await expect(page.locator('[data-testid="date-range-options-tdy"]')).toBeVisible(); //Today
       await expect(page.locator('[data-testid="date-range-options-w"]')).toBeVisible(); //Last 7 Days
@@ -843,7 +842,6 @@ test.describe("Out of office", () => {
         );
         await entriesListRespPromise1;
 
-        await openFilter(page, "dateRange");
         const entriesListRespPromise2 = page.waitForResponse(
           (response) => response.url().includes("outOfOfficeEntriesList") && response.status() === 200
         );

apps/web/public/static/locales/ar/common.json

@@ -1489,7 +1489,7 @@
   "connect_your_calendar_and_link": "يمكنك ربط رزنامتك من <1>هنا</1>.",
   "default_calendar_selected": "الرزنامة الافتراضية",
   "hide_from_profile": "إخفاء من الملف الشخصي",
-  "event_setup_tab_title": "إعداد الحدث",
+  "basics": "إعداد الحدث",
   "availability_not_found_in_schedule_error": "لا يوجد مواعيد متاحة",
   "event_limit_tab_title": "الحدود",
   "event_limit_tab_description": "ما تواتر مرات الحجز",

apps/web/public/static/locales/az/common.json

@@ -1489,7 +1489,7 @@
   "connect_your_calendar_and_link": "Təqviminizi <1>buradan</1> əlaqələndirə bilərsiniz.",
   "default_calendar_selected": "Varsayılan təqvim seçildi",
   "hide_from_profile": "Profildən gizlət",
-  "event_setup_tab_title": "Tədbir Quraşdırması",
+  "basics": "Tədbir Quraşdırması",
   "availability_not_found_in_schedule_error": "Cədvəldə mövcudluq tapılmadı",
   "event_limit_tab_title": "Limitlər",
   "event_limit_tab_description": "Nə qədər tez-tez rezervasiya edilə bilərsiniz",