chore: release v4.8.13

* fix: zoho calendar allowing to book busy schedule

* Improved more readable version

---------

Co-authored-by: Alex van Andel <me@alexvanandel.com>

.env.example

@@ -112,6 +112,9 @@ NEXT_PUBLIC_POSTHOG_HOST=
 PLAIN_API_KEY=
 PLAIN_API_URL=https://api.plain.com/v1
 PLAIN_HMAC_SECRET_KEY=
+PLAIN_CHAT_ID=
+PLAIN_CHAT_HMAC_SECRET_KEY=
+NEXT_PUBLIC_PLAIN_CHAT_EXCLUDED_PATHS=
 
 # Zendesk Config
 NEXT_PUBLIC_ZENDESK_KEY=
@@ -361,9 +364,7 @@ APP_ROUTER_APPS_SLUG_SETUP_ENABLED=0
 APP_ROUTER_APPS_CATEGORIES_ENABLED=0
 # whether we redirect to the future/apps/categories/[category] from /apps/categories/[category] or not
 APP_ROUTER_APPS_CATEGORIES_CATEGORY_ENABLED=0
-APP_ROUTER_BOOKINGS_STATUS_ENABLED=0
 APP_ROUTER_APPS_ENABLED=0
-APP_ROUTER_TEAM_ENABLED=0
 APP_ROUTER_AUTH_FORGOT_PASSWORD_ENABLED=0
 APP_ROUTER_AUTH_LOGIN_ENABLED=0
 APP_ROUTER_AUTH_LOGOUT_ENABLED=0

.yarn/versions/52e3b28d.yml

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

.yarn/versions/8e04affb.yml

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

.yarn/versions/aecb4352.yml

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

.yarn/versions/c8975f9d.yml

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

.yarn/versions/c92a78d0.yml

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

apps/api/v2/package.json

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

apps/api/v2/src/app.ts

@@ -18,6 +18,7 @@ import {
   CAL_API_VERSION_HEADER,
   X_CAL_CLIENT_ID,
   X_CAL_SECRET_KEY,
+  X_CAL_PLATFORM_EMBED,
 } from "@calcom/platform-constants";
 
 import { TRPCExceptionFilter } from "./filters/trpc-exception.filter";
@@ -45,6 +46,7 @@ export const bootstrap = (app: NestExpressApplication): NestExpressApplication =
     allowedHeaders: [
       X_CAL_CLIENT_ID,
       X_CAL_SECRET_KEY,
+      X_CAL_PLATFORM_EMBED,
       CAL_API_VERSION_HEADER,
       "Accept",
       "Authorization",

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

@@ -37,7 +37,7 @@ import { Request } from "express";
 import { NextApiRequest } from "next/types";
 import { v4 as uuidv4 } from "uuid";
 
-import { X_CAL_CLIENT_ID } from "@calcom/platform-constants";
+import { X_CAL_CLIENT_ID, X_CAL_PLATFORM_EMBED } from "@calcom/platform-constants";
 import { BOOKING_READ, SUCCESS_STATUS, BOOKING_WRITE } from "@calcom/platform-constants";
 import {
   handleNewRecurringBooking,
@@ -161,14 +161,15 @@ export class BookingsController_2024_04_15 {
   async createBooking(
     @Req() req: BookingRequest,
     @Body() body: CreateBookingInput_2024_04_15,
-    @Headers(X_CAL_CLIENT_ID) clientId?: string
+    @Headers(X_CAL_CLIENT_ID) clientId?: string,
+    @Headers(X_CAL_PLATFORM_EMBED) isEmbed?: string
   ): Promise<ApiResponse<Partial<BookingResponse>>> {
     const oAuthClientId = clientId?.toString();
     const { orgSlug, locationUrl } = body;
     req.headers["x-cal-force-slug"] = orgSlug;
     try {
       const booking = await handleNewBooking(
-        await this.createNextApiBookingRequest(req, oAuthClientId, locationUrl)
+        await this.createNextApiBookingRequest(req, oAuthClientId, locationUrl, isEmbed)
       );
       if (booking.userId && booking.uid && booking.startTime) {
         void (await this.billingService.increaseUsageByUserId(booking.userId, {
@@ -192,13 +193,16 @@ export class BookingsController_2024_04_15 {
     @Req() req: BookingRequest,
     @Param("bookingId") bookingId: string,
     @Body() _: CancelBookingInput_2024_04_15,
-    @Headers(X_CAL_CLIENT_ID) clientId?: string
+    @Headers(X_CAL_CLIENT_ID) clientId?: string,
+    @Headers(X_CAL_PLATFORM_EMBED) isEmbed?: string
   ): Promise<ApiResponse<{ bookingId: number; bookingUid: string; onlyRemovedAttendee: boolean }>> {
     const oAuthClientId = clientId?.toString();
     if (bookingId) {
       try {
         req.body.id = parseInt(bookingId);
-        const res = await handleCancelBooking(await this.createNextApiBookingRequest(req, oAuthClientId));
+        const res = await handleCancelBooking(
+          await this.createNextApiBookingRequest(req, oAuthClientId, undefined, isEmbed)
+        );
         if (!res.onlyRemovedAttendee) {
           void (await this.billingService.cancelUsageByBookingUid(res.bookingUid));
         }
@@ -246,7 +250,8 @@ export class BookingsController_2024_04_15 {
   async createRecurringBooking(
     @Req() req: BookingRequest,
     @Body() _: CreateRecurringBookingInput_2024_04_15[],
-    @Headers(X_CAL_CLIENT_ID) clientId?: string
+    @Headers(X_CAL_CLIENT_ID) clientId?: string,
+    @Headers(X_CAL_PLATFORM_EMBED) isEmbed?: string
   ): Promise<ApiResponse<BookingResponse[]>> {
     const oAuthClientId = clientId?.toString();
     try {
@@ -258,7 +263,7 @@ export class BookingsController_2024_04_15 {
       }
 
       const createdBookings: BookingResponse[] = await handleNewRecurringBooking(
-        await this.createNextApiRecurringBookingRequest(req, oAuthClientId)
+        await this.createNextApiRecurringBookingRequest(req, oAuthClientId, undefined, isEmbed)
       );
 
       createdBookings.forEach(async (booking) => {
@@ -284,13 +289,14 @@ export class BookingsController_2024_04_15 {
   async createInstantBooking(
     @Req() req: BookingRequest,
     @Body() _: CreateBookingInput_2024_04_15,
-    @Headers(X_CAL_CLIENT_ID) clientId?: string
+    @Headers(X_CAL_CLIENT_ID) clientId?: string,
+    @Headers(X_CAL_PLATFORM_EMBED) isEmbed?: string
   ): Promise<ApiResponse<Awaited<ReturnType<typeof handleInstantMeeting>>>> {
     const oAuthClientId = clientId?.toString();
     req.userId = (await this.getOwnerId(req)) ?? -1;
     try {
       const instantMeeting = await handleInstantMeeting(
-        await this.createNextApiBookingRequest(req, oAuthClientId)
+        await this.createNextApiBookingRequest(req, oAuthClientId, undefined, isEmbed)
       );
 
       if (instantMeeting.userId && instantMeeting.bookingUid) {
@@ -332,8 +338,14 @@ export class BookingsController_2024_04_15 {
     }
   }
 
-  private async getOAuthClientsParams(clientId: string): Promise<OAuthRequestParams> {
+  private async getOAuthClientsParams(clientId: string, isEmbed = false): Promise<OAuthRequestParams> {
     const res = { ...DEFAULT_PLATFORM_PARAMS };
+
+    if (isEmbed) {
+      // embed should ignore oauth client settings and enable emails by default
+      return { ...res, arePlatformEmailsEnabled: true };
+    }
+
     try {
       const client = await this.oAuthClientRepository.getOAuthClient(clientId);
       // fetch oAuthClient from db and use data stored in db to set these values
@@ -354,13 +366,14 @@ export class BookingsController_2024_04_15 {
   private async createNextApiBookingRequest(
     req: BookingRequest,
     oAuthClientId?: string,
-    platformBookingLocation?: string
+    platformBookingLocation?: string,
+    isEmbed?: string
   ): Promise<NextApiRequest & { userId?: number } & OAuthRequestParams> {
     const requestId = req.get("X-Request-Id");
     const clone = { ...req };
     const userId = (await this.getOwnerId(req)) ?? -1;
     const oAuthParams = oAuthClientId
-      ? await this.getOAuthClientsParams(oAuthClientId)
+      ? await this.getOAuthClientsParams(oAuthClientId, this.transformToBoolean(isEmbed))
       : DEFAULT_PLATFORM_PARAMS;
     this.logger.log(`createNextApiBookingRequest_2024_04_15`, {
       requestId,
@@ -377,12 +390,13 @@ export class BookingsController_2024_04_15 {
   private async createNextApiRecurringBookingRequest(
     req: BookingRequest,
     oAuthClientId?: string,
-    platformBookingLocation?: string
+    platformBookingLocation?: string,
+    isEmbed?: string
   ): Promise<NextApiRequest & { userId?: number } & OAuthRequestParams> {
     const clone = { ...req };
     const userId = (await this.getOwnerId(req)) ?? -1;
     const oAuthParams = oAuthClientId
-      ? await this.getOAuthClientsParams(oAuthClientId)
+      ? await this.getOAuthClientsParams(oAuthClientId, this.transformToBoolean(isEmbed))
       : DEFAULT_PLATFORM_PARAMS;
     const requestId = req.get("X-Request-Id");
     this.logger.log(`createNextApiRecurringBookingRequest_2024_04_15`, {
@@ -424,4 +438,8 @@ export class BookingsController_2024_04_15 {
 
     throw new InternalServerErrorException(errMsg);
   }
+
+  private transformToBoolean(v?: string): boolean {
+    return v && typeof v === "string" ? v.toLowerCase() === "true" : false;
+  }
 }

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

@@ -5,7 +5,7 @@ import { MarkAbsentBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/out
 import { ReassignBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reassign-booking.output";
 import { RescheduleBookingOutput_2024_08_13 } from "@/ee/bookings/2024-08-13/outputs/reschedule-booking.output";
 import { BookingsService_2024_08_13 } from "@/ee/bookings/2024-08-13/services/bookings.service";
-import { VERSION_2024_08_13_VALUE } from "@/lib/api-versions";
+import { VERSION_2024_08_13_VALUE, VERSION_2024_08_13 } from "@/lib/api-versions";
 import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
 import { Permissions } from "@/modules/auth/decorators/permissions/permissions.decorator";
 import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
@@ -65,6 +65,7 @@ import {
 @ApiHeader({
   name: "cal-api-version",
   description: `Must be set to \`2024-08-13\``,
+  example: VERSION_2024_08_13,
   required: true,
 })
 export class BookingsController_2024_08_13 {

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

@@ -952,7 +952,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
               slug: recurringSeatedTventTypeSlug,
             });
             expect(firstBooking.attendees.length).toEqual(2);
-            expect(firstBooking.attendees[0]).toEqual({
+            const firstAttendee = firstBooking.attendees.find(
+              (attendee) => attendee.name === nameAttendeeOne
+            );
+            expect(firstAttendee).toEqual({
               name: nameAttendeeOne,
               email: emailAttendeeOne,
               timeZone: body.attendee.timeZone,
@@ -965,7 +968,10 @@ describe("Bookings Endpoints 2024-08-13", () => {
               },
               metadata: createdRecurringSeatedBooking[0].attendees[0].metadata,
             });
-            expect(firstBooking.attendees[1]).toEqual({
+            const secondAttendee = firstBooking.attendees.find(
+              (attendee) => attendee.name === nameAttendeeTwo
+            );
+            expect(secondAttendee).toEqual({
               name: nameAttendeeTwo,
               email: emailAttendeeTwo,
               timeZone: body.attendee.timeZone,

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

@@ -33,11 +33,18 @@ import {
   ApiSuccessResponse,
   CreateEventTypeInput_2024_06_14,
   EventTypeOutput_2024_06_14,
-  NameFieldInput_2024_06_14,
+  NameDefaultFieldInput_2024_06_14,
+  NotesDefaultFieldInput_2024_06_14,
   UpdateEventTypeInput_2024_06_14,
 } from "@calcom/platform-types";
 import { SchedulingType } from "@calcom/prisma/enums";
 
+const orderBySlug = (a: { slug: string }, b: { slug: string }) => {
+  if (a.slug < b.slug) return -1;
+  if (a.slug > b.slug) return 1;
+  return 0;
+};
+
 describe("Event types Endpoints", () => {
   describe("Not authenticated", () => {
     let app: INestApplication;
@@ -93,6 +100,68 @@ describe("Event types Endpoints", () => {
     let orgUserEventType1: EventType;
     let orgUserEventType2: EventType;
     let orgUserEventType3: EventType;
+
+    const defaultResponseBookingFieldName = {
+      isDefault: true,
+      type: "name",
+      slug: "name",
+      required: true,
+      disableOnPrefill: false,
+    };
+
+    const defaultResponseBookingFieldEmail = {
+      isDefault: true,
+      type: "email",
+      slug: "email",
+      required: true,
+      disableOnPrefill: false,
+    };
+
+    const defaultResponseBookingFieldLocation = {
+      isDefault: true,
+      type: "radioInput",
+      slug: "location",
+      required: false,
+      hidden: false,
+      disableOnPrefill: false,
+    };
+
+    const defaultResponseBookingFieldTitle = {
+      isDefault: true,
+      type: "text",
+      slug: "title",
+      required: true,
+      hidden: true,
+      disableOnPrefill: false,
+    };
+
+    const defaultResponseBookingFieldNotes = {
+      isDefault: true,
+      type: "textarea",
+      slug: "notes",
+      required: false,
+      hidden: false,
+      disableOnPrefill: false,
+    };
+
+    const defaultResponseBookingFieldGuests = {
+      isDefault: true,
+      type: "multiemail",
+      slug: "guests",
+      required: false,
+      hidden: false,
+      disableOnPrefill: false,
+    };
+
+    const defaultResponseBookingFieldRescheduleReason = {
+      isDefault: true,
+      type: "textarea",
+      slug: "rescheduleReason",
+      required: false,
+      hidden: false,
+      disableOnPrefill: false,
+    };
+
     beforeAll(async () => {
       const moduleRef = await withApiAuth(
         userEmail,
@@ -253,7 +322,7 @@ describe("Event types Endpoints", () => {
     });
 
     it("should create an event type", async () => {
-      const nameBookingField: NameFieldInput_2024_06_14 = {
+      const nameBookingField: NameDefaultFieldInput_2024_06_14 = {
         type: "name",
         label: "Your name sir / madam",
         placeholder: "john doe",
@@ -379,30 +448,25 @@ describe("Event types Endpoints", () => {
           );
           expect(createdEventType.color).toEqual(body.color);
 
-          const requestBookingFields = body.bookingFields || [];
           const expectedBookingFields = [
-            { isDefault: true, required: true, slug: "name", ...nameBookingField },
-            { isDefault: true, required: true, slug: "email", type: "email", disableOnPrefill: false },
-            // note(Lauris): location booking field is added if multiple locations are passed
+            { ...defaultResponseBookingFieldName, ...nameBookingField },
+            { ...defaultResponseBookingFieldEmail },
+            { ...defaultResponseBookingFieldLocation },
+            { ...defaultResponseBookingFieldTitle },
+            { ...defaultResponseBookingFieldGuests },
+            { ...defaultResponseBookingFieldRescheduleReason },
             {
-              isDefault: true,
-              required: false,
-              slug: "location",
-              type: "radioInput",
-              disableOnPrefill: false,
+              type: "select",
+              label: "select which language you want to learn",
+              slug: "select-language",
+              required: true,
+              placeholder: "select language",
+              options: ["javascript", "python", "cobol"],
+              disableOnPrefill: true,
               hidden: false,
+              isDefault: false,
             },
-            {
-              isDefault: true,
-              required: false,
-              slug: "rescheduleReason",
-              type: "textarea",
-              disableOnPrefill: false,
-              hidden: false,
-            },
-            ...requestBookingFields
-              .filter((field) => field.type !== "name" && field.type !== "email")
-              .map((field) => ({ isDefault: false, ...field })),
+            { ...defaultResponseBookingFieldNotes },
           ];
 
           expect(createdEventType.bookingFields).toEqual(expectedBookingFields);
@@ -432,7 +496,9 @@ describe("Event types Endpoints", () => {
       expect(fetchedEventType?.lengthInMinutes).toEqual(eventType.lengthInMinutes);
       expect(fetchedEventType?.lengthInMinutesOptions).toEqual(eventType.lengthInMinutesOptions);
       expect(fetchedEventType?.locations).toEqual(eventType.locations);
-      expect(fetchedEventType?.bookingFields).toEqual(eventType.bookingFields);
+      expect(fetchedEventType?.bookingFields.sort(orderBySlug)).toEqual(
+        eventType.bookingFields.sort(orderBySlug).filter((f) => ("hidden" in f ? !f?.hidden : true))
+      );
       expect(fetchedEventType?.ownerId).toEqual(user.id);
       expect(fetchedEventType.bookingLimitsCount).toEqual(eventType.bookingLimitsCount);
       expect(fetchedEventType.onlyShowFirstAvailableSlot).toEqual(eventType.onlyShowFirstAvailableSlot);
@@ -455,7 +521,6 @@ describe("Event types Endpoints", () => {
     });
 
     it(`/GET/event-types by username and orgSlug`, async () => {
-      console.log(organization);
       const response = await request(app.getHttpServer())
         .get(`/api/v2/event-types?username=${orgUser.username}&orgSlug=${organization.slug}`)
         .set(CAL_API_VERSION_HEADER, VERSION_2024_06_14)
@@ -636,7 +701,6 @@ describe("Event types Endpoints", () => {
         .expect(201);
 
       const createdEventType = createResponse.body.data;
-      console.log("createdEventType: ", createdEventType);
 
       expect(createdEventType).toMatchObject({
         id: expect.any(Number),
@@ -779,13 +843,20 @@ describe("Event types Endpoints", () => {
     });
 
     it("should update event type", async () => {
-      const nameBookingField: NameFieldInput_2024_06_14 = {
+      const nameBookingField: NameDefaultFieldInput_2024_06_14 = {
         type: "name",
         label: "Your name sir / madam",
         placeholder: "john doe",
         disableOnPrefill: true,
       };
 
+      const notesBookingField: NotesDefaultFieldInput_2024_06_14 = {
+        slug: "notes",
+        label: "lemme take some notes",
+        placeholder: "write your notes here",
+        required: true,
+      };
+
       const newTitle = "Coding class in Italian!";
 
       const body: UpdateEventTypeInput_2024_06_14 = {
@@ -804,6 +875,7 @@ describe("Event types Endpoints", () => {
             disableOnPrefill: false,
             hidden: false,
           },
+          notesBookingField,
         ],
         bookingLimitsCount: {
           day: 4,
@@ -866,21 +938,25 @@ describe("Event types Endpoints", () => {
           expect(updatedEventType.lengthInMinutes).toEqual(eventType.lengthInMinutes);
           expect(updatedEventType.locations).toEqual(eventType.locations);
 
-          const requestBookingFields = body.bookingFields || [];
           const expectedBookingFields = [
-            { isDefault: true, required: true, slug: "name", ...nameBookingField },
-            { isDefault: true, required: true, slug: "email", type: "email", disableOnPrefill: false },
+            { ...defaultResponseBookingFieldName, ...nameBookingField },
+            { ...defaultResponseBookingFieldEmail },
+            { ...defaultResponseBookingFieldLocation },
+            { ...defaultResponseBookingFieldTitle },
+            { ...defaultResponseBookingFieldGuests },
+            { ...defaultResponseBookingFieldRescheduleReason },
             {
-              isDefault: true,
-              required: false,
-              slug: "rescheduleReason",
-              type: "textarea",
+              type: "select",
+              label: "select which language you want to learn",
+              slug: "select-language",
+              required: true,
+              placeholder: "select language",
+              options: ["javascript", "python", "cobol"],
               disableOnPrefill: false,
               hidden: false,
+              isDefault: false,
             },
-            ...requestBookingFields
-              .filter((field) => field.type !== "name" && field.type !== "email")
-              .map((field) => ({ isDefault: false, ...field })),
+            { ...defaultResponseBookingFieldNotes, ...notesBookingField },
           ];
 
           expect(updatedEventType.bookingFields).toEqual(expectedBookingFields);
@@ -997,7 +1073,9 @@ describe("Event types Endpoints", () => {
       expect(fetchedEventType?.lengthInMinutes).toEqual(eventType.lengthInMinutes);
       expect(fetchedEventType?.lengthInMinutesOptions).toEqual(eventType.lengthInMinutesOptions);
       expect(fetchedEventType?.locations).toEqual(eventType.locations);
-      expect(fetchedEventType?.bookingFields).toEqual(eventType.bookingFields);
+      expect(fetchedEventType?.bookingFields.sort(orderBySlug)).toEqual(
+        eventType.bookingFields.sort(orderBySlug).filter((f) => ("hidden" in f ? !f?.hidden : true))
+      );
       expect(fetchedEventType?.ownerId).toEqual(user.id);
       expect(fetchedEventType.bookingLimitsCount).toEqual(eventType.bookingLimitsCount);
       expect(fetchedEventType.onlyShowFirstAvailableSlot).toEqual(eventType.onlyShowFirstAvailableSlot);
@@ -1091,14 +1169,6 @@ describe("Event types Endpoints", () => {
         placeholder: "",
       },
       { isDefault: true, required: true, slug: "title", type: "text", disableOnPrefill: false, hidden: true },
-      {
-        isDefault: true,
-        required: false,
-        slug: "notes",
-        type: "textarea",
-        disableOnPrefill: false,
-        hidden: false,
-      },
       {
         isDefault: true,
         required: false,
@@ -1116,6 +1186,14 @@ describe("Event types Endpoints", () => {
         hidden: false,
       },
       { isDefault: true, type: "phone", slug: "attendeePhoneNumber", required: false, hidden: true },
+      {
+        isDefault: true,
+        required: false,
+        slug: "notes",
+        type: "textarea",
+        disableOnPrefill: false,
+        hidden: false,
+      },
     ];
 
     beforeAll(async () => {
@@ -1239,15 +1317,6 @@ describe("Event types Endpoints", () => {
             defaultLabel: "what_is_this_meeting_about",
             defaultPlaceholder: "",
           },
-          {
-            name: "notes",
-            type: "textarea",
-            sources: [{ id: "default", type: "default", label: "Default" }],
-            editable: "system-but-optional",
-            required: false,
-            defaultLabel: "additional_notes",
-            defaultPlaceholder: "share_additional_notes",
-          },
           {
             name: "guests",
             type: "multiemail",
@@ -1283,6 +1352,15 @@ describe("Event types Endpoints", () => {
             required: false,
             defaultLabel: "phone_number",
           },
+          {
+            name: "notes",
+            type: "textarea",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system-but-optional",
+            required: false,
+            defaultLabel: "additional_notes",
+            defaultPlaceholder: "share_additional_notes",
+          },
         ],
       };
       const legacyEventType = await eventTypesRepositoryFixture.create(legacyEventTypeInput, user.id);
@@ -1369,15 +1447,6 @@ describe("Event types Endpoints", () => {
             defaultLabel: "what_is_this_meeting_about",
             defaultPlaceholder: "",
           },
-          {
-            name: "notes",
-            type: "textarea",
-            sources: [{ id: "default", type: "default", label: "Default" }],
-            editable: "system-but-optional",
-            required: false,
-            defaultLabel: "additional_notes",
-            defaultPlaceholder: "share_additional_notes",
-          },
           {
             name: "guests",
             type: "multiemail",
@@ -1413,6 +1482,15 @@ describe("Event types Endpoints", () => {
             required: false,
             defaultLabel: "phone_number",
           },
+          {
+            name: "notes",
+            type: "textarea",
+            sources: [{ id: "default", type: "default", label: "Default" }],
+            editable: "system-but-optional",
+            required: false,
+            defaultLabel: "additional_notes",
+            defaultPlaceholder: "share_additional_notes",
+          },
         ],
       };
       const legacyEventType = await eventTypesRepositoryFixture.create(legacyEventTypeInput, user.id);
@@ -1426,19 +1504,21 @@ describe("Event types Endpoints", () => {
           const responseBody: ApiSuccessResponse<EventTypeOutput_2024_06_14> = response.body;
           const fetchedEventType = responseBody.data;
 
-          expect(fetchedEventType.bookingFields).toEqual([
-            ...expectedReturnSystemFields,
-            {
-              isDefault: false,
-              type: userDefinedBookingField.type,
-              slug: userDefinedBookingField.name,
-              label: userDefinedBookingField.label,
-              required: userDefinedBookingField.required,
-              placeholder: userDefinedBookingField.placeholder,
-              disableOnPrefill: false,
-              hidden: false,
-            },
-          ]);
+          expect(fetchedEventType.bookingFields.sort(orderBySlug)).toEqual(
+            [
+              {
+                isDefault: false,
+                type: userDefinedBookingField.type,
+                slug: userDefinedBookingField.name,
+                label: userDefinedBookingField.label,
+                required: userDefinedBookingField.required,
+                placeholder: userDefinedBookingField.placeholder,
+                disableOnPrefill: false,
+                hidden: false,
+              },
+              ...expectedReturnSystemFields,
+            ].sort(orderBySlug)
+          );
         });
     });
 
@@ -1541,14 +1621,6 @@ describe("Event types Endpoints", () => {
               disableOnPrefill: false,
               hidden: true,
             },
-            {
-              isDefault: true,
-              type: "textarea",
-              slug: "notes",
-              required: false,
-              disableOnPrefill: false,
-              hidden: false,
-            },
             {
               isDefault: true,
               type: "multiemail",
@@ -1565,6 +1637,14 @@ describe("Event types Endpoints", () => {
               disableOnPrefill: false,
               hidden: false,
             },
+            {
+              isDefault: true,
+              type: "textarea",
+              slug: "notes",
+              required: false,
+              disableOnPrefill: false,
+              hidden: false,
+            },
           ]);
         });
     });

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

@@ -34,6 +34,7 @@ import {
   UpdateEventTypeInput_2024_06_14,
   GetEventTypesQuery_2024_06_14,
   CreateEventTypeInput_2024_06_14,
+  EventTypeOutput_2024_06_14,
 } from "@calcom/platform-types";
 
 @Controller({
@@ -113,10 +114,26 @@ export class EventTypesController_2024_06_14 {
     @Query() queryParams: GetEventTypesQuery_2024_06_14
   ): Promise<GetEventTypesOutput_2024_06_14> {
     const eventTypes = await this.eventTypesService.getEventTypes(queryParams);
+    const eventTypesFormatted = this.eventTypeResponseTransformPipe.transform(eventTypes);
+    const eventTypesWithoutHiddenFields = eventTypesFormatted.map((eventType) => {
+      return {
+        ...eventType,
+        bookingFields: Array.isArray(eventType?.bookingFields)
+          ? eventType?.bookingFields
+              .map((field) => {
+                if ("hidden" in field) {
+                  return field.hidden !== true ? field : null;
+                }
+                return field;
+              })
+              .filter((f) => f)
+          : [],
+      };
+    }) as EventTypeOutput_2024_06_14[];
 
     return {
       status: SUCCESS_STATUS,
-      data: this.eventTypeResponseTransformPipe.transform(eventTypes),
+      data: eventTypesWithoutHiddenFields,
     };
   }
 

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

@@ -5,16 +5,19 @@ import { UserWithProfile } from "@/modules/users/users.repository";
 import { Injectable, BadRequestException } from "@nestjs/common";
 
 import {
-  transformBookingFieldsApiRequestToInternal,
+  transformBookingFieldsApiToInternal,
   transformLocationsApiToInternal,
   transformIntervalLimitsApiToInternal,
   transformFutureBookingLimitsApiToInternal,
   transformRecurrenceApiToInternal,
   systemBeforeFieldName,
   systemBeforeFieldEmail,
+  systemBeforeFieldLocation,
+  systemAfterFieldTitle,
+  systemAfterFieldNotes,
+  systemAfterFieldGuests,
   systemAfterFieldRescheduleReason,
   EventTypeMetaDataSchema,
-  systemBeforeFieldLocation,
   transformBookerLayoutsApiToInternal,
   transformConfirmationPolicyApiToInternal,
   transformEventColorsApiToInternal,
@@ -217,27 +220,46 @@ export class InputEventTypesService_2024_06_14 {
     inputBookingFields: CreateEventTypeInput_2024_06_14["bookingFields"],
     hasMultipleLocations: boolean
   ) {
-    const customFields: (SystemField | CustomField)[] = inputBookingFields
-      ? transformBookingFieldsApiRequestToInternal(inputBookingFields)
+    const internalFields: (SystemField | CustomField)[] = inputBookingFields
+      ? transformBookingFieldsApiToInternal(inputBookingFields)
       : [];
-    const customFieldsWithoutNameEmail = customFields.filter(
-      (field) => field.type !== "name" && field.type !== "email"
+    const systemCustomFields = internalFields.filter((field) => !this.isUserCustomField(field));
+    const userCustomFields = internalFields.filter((field) => this.isUserCustomField(field));
+
+    const systemCustomNameField = systemCustomFields?.find((field) => field.type === "name");
+    const systemCustomEmailField = systemCustomFields?.find((field) => field.type === "email");
+    const systemCustomTitleField = systemCustomFields?.find((field) => field.name === "title");
+    const systemCustomNotesField = systemCustomFields?.find((field) => field.name === "notes");
+    const systemCustomGuestsField = systemCustomFields?.find((field) => field.name === "guests");
+    const systemCustomRescheduleReasonField = systemCustomFields?.find(
+      (field) => field.name === "rescheduleReason"
     );
-    const customNameField = customFields?.find((field) => field.type === "name");
-    const customEmailField = customFields?.find((field) => field.type === "email");
 
     const defaultFieldsBefore: (SystemField | CustomField)[] = [
-      customNameField || systemBeforeFieldName,
-      customEmailField || systemBeforeFieldEmail,
+      systemCustomNameField || systemBeforeFieldName,
+      systemCustomEmailField || systemBeforeFieldEmail,
+      systemBeforeFieldLocation,
     ];
-    // note(Lauris): if event type has multiple locations then a radio button booking field has to be displayed to allow booker to pick location
-    if (hasMultipleLocations) {
-      defaultFieldsBefore.push(systemBeforeFieldLocation);
-    }
 
-    const defaultFieldsAfter = [systemAfterFieldRescheduleReason];
+    const defaultFieldsAfter = [
+      systemCustomTitleField || systemAfterFieldTitle,
+      systemCustomNotesField || systemAfterFieldNotes,
+      systemCustomGuestsField || systemAfterFieldGuests,
+      systemCustomRescheduleReasonField || systemAfterFieldRescheduleReason,
+    ];
 
-    return [...defaultFieldsBefore, ...customFieldsWithoutNameEmail, ...defaultFieldsAfter];
+    return [...defaultFieldsBefore, ...userCustomFields, ...defaultFieldsAfter];
+  }
+
+  isUserCustomField(field: SystemField | CustomField): field is CustomField {
+    return (
+      field.type !== "name" &&
+      field.type !== "email" &&
+      field.name !== "title" &&
+      field.name !== "notes" &&
+      field.name !== "guests" &&
+      field.name !== "rescheduleReason"
+    );
   }
 
   transformInputIntervalLimits(inputBookingFields: CreateEventTypeInput_2024_06_14["bookingLimitsCount"]) {

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

@@ -242,7 +242,19 @@ export class OutputEventTypesService_2024_06_14 {
       }
     }
 
-    return [...transformBookingFieldsInternalToApi(knownBookingFields), ...unknownBookingFields];
+    const fields = [...transformBookingFieldsInternalToApi(knownBookingFields), ...unknownBookingFields];
+
+    // ensure additional notes are always at the end
+    return fields.sort((a, b) => {
+      if (!a?.slug || !b?.slug) return 0;
+      if (a.slug === "notes" && b.slug !== "notes") {
+        return 1;
+      }
+      if (b.slug === "notes" && a.slug !== "notes") {
+        return -1;
+      }
+      return 0;
+    });
   }
 
   getDefaultBookingFields(isOrgTeamEvent: boolean) {

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

@@ -41,6 +41,18 @@ describe("isOriginAllowed", () => {
       const origin = "https://sub.mydomain.com/path/to/resource";
       expect(isOriginAllowed(origin, allowedOrigins)).toBe(true);
     });
+
+    it("should handle patterns with wildcard for routes correctly", () => {
+      const allowedOrigins = ["https://domain.com/*"];
+      const origin = "https://domain.com/dashboard";
+      expect(isOriginAllowed(origin, allowedOrigins)).toBe(true);
+    });
+
+    it("should handle patterns with wildcard for root route correctly", () => {
+      const allowedOrigins = ["https://domain.com*"];
+      const origin = "https://domain.com";
+      expect(isOriginAllowed(origin, allowedOrigins)).toBe(true);
+    });
   });
 
   describe("is not allowed", () => {

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

@@ -179,7 +179,7 @@ export class ApiAuthStrategy extends PassportStrategy(BaseStrategy, "api-auth")
 
     if (origin && !isOriginAllowed(origin, client.redirectUris)) {
       throw new UnauthorizedException(
-        `Invalid request origin - please open https://app.cal.com/settings/platform and add the origin '${origin}' to the 'Redirect uris' of your OAuth client.`
+        `Invalid request origin - please open https://app.cal.com/settings/platform and add the origin '${origin}' to the 'Redirect uris' of your OAuth client with ID '${client.id}'`
       );
     }
 

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

@@ -677,27 +677,9 @@ describe("Organizations Event Types Endpoints", () => {
           const fetchedEventType = responseBody.data;
 
           expect(fetchedEventType.bookingFields).toEqual([
-            {
-              isDefault: true,
-              type: "name",
-              slug: "name",
-              required: true,
-              disableOnPrefill: false,
-            },
-            {
-              isDefault: true,
-              type: "email",
-              slug: "email",
-              required: true,
-              disableOnPrefill: false,
-            },
-            {
-              isDefault: true,
-              type: "phone",
-              slug: "attendeePhoneNumber",
-              required: false,
-              hidden: true,
-            },
+            { isDefault: true, required: true, slug: "name", type: "name", disableOnPrefill: false },
+            { isDefault: true, required: true, slug: "email", type: "email", disableOnPrefill: false },
+            { isDefault: true, type: "phone", slug: "attendeePhoneNumber", required: false, hidden: true },
             {
               isDefault: true,
               type: "radioInput",
@@ -708,33 +690,33 @@ describe("Organizations Event Types Endpoints", () => {
             },
             {
               isDefault: true,
-              type: "text",
-              slug: "title",
               required: true,
+              slug: "title",
+              type: "text",
               disableOnPrefill: false,
               hidden: true,
             },
             {
               isDefault: true,
-              type: "textarea",
-              slug: "notes",
               required: false,
-              disableOnPrefill: false,
-              hidden: false,
-            },
-            {
-              isDefault: true,
-              type: "multiemail",
               slug: "guests",
-              required: false,
+              type: "multiemail",
               disableOnPrefill: false,
               hidden: false,
             },
             {
               isDefault: true,
-              type: "textarea",
-              slug: "rescheduleReason",
               required: false,
+              slug: "rescheduleReason",
+              type: "textarea",
+              disableOnPrefill: false,
+              hidden: false,
+            },
+            {
+              isDefault: true,
+              required: false,
+              slug: "notes",
+              type: "textarea",
               disableOnPrefill: false,
               hidden: false,
             },

apps/api/v2/swagger/documentation.json

@@ -7741,7 +7741,7 @@
           "type"
         ]
       },
-      "NameFieldInput_2024_06_14": {
+      "NameDefaultFieldInput_2024_06_14": {
         "type": "object",
         "properties": {
           "type": {
@@ -7766,7 +7766,7 @@
           "placeholder"
         ]
       },
-      "EmailFieldInput_2024_06_14": {
+      "EmailDefaultFieldInput_2024_06_14": {
         "type": "object",
         "properties": {
           "type": {
@@ -7791,6 +7791,126 @@
           "placeholder"
         ]
       },
+      "TitleDefaultFieldInput_2024_06_14": {
+        "type": "object",
+        "properties": {
+          "slug": {
+            "type": "string",
+            "example": "title",
+            "description": "only allowed value for type is `title`"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "hidden": {
+            "type": "boolean",
+            "description": "If true show under event type settings but don't show this booking field in the Booker. If false show in both."
+          },
+          "label": {
+            "type": "string"
+          },
+          "placeholder": {
+            "type": "string"
+          },
+          "disableOnPrefill": {
+            "type": "boolean",
+            "description": "Disable this booking field if the URL contains query parameter with key equal to the slug and prefill it with the provided value.      For example, if URL contains query parameter `&title=journey`,      the title field will be prefilled with this value and disabled."
+          }
+        },
+        "required": [
+          "slug"
+        ]
+      },
+      "NotesDefaultFieldInput_2024_06_14": {
+        "type": "object",
+        "properties": {
+          "slug": {
+            "type": "string",
+            "example": "notes",
+            "description": "only allowed value for type is `notes`"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "hidden": {
+            "type": "boolean",
+            "description": "If true show under event type settings but don't show this booking field in the Booker. If false show in both."
+          },
+          "label": {
+            "type": "string"
+          },
+          "placeholder": {
+            "type": "string"
+          },
+          "disableOnPrefill": {
+            "type": "boolean",
+            "description": "Disable this booking field if the URL contains query parameter with key equal to the slug and prefill it with the provided value.      For example, if URL contains query parameter `&notes=journey`,      the notes field will be prefilled with this value and disabled."
+          }
+        },
+        "required": [
+          "slug"
+        ]
+      },
+      "GuestsDefaultFieldInput_2024_06_14": {
+        "type": "object",
+        "properties": {
+          "slug": {
+            "type": "string",
+            "example": "guests",
+            "description": "only allowed value for type is `guests`"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "hidden": {
+            "type": "boolean",
+            "description": "If true show under event type settings but don't show this booking field in the Booker. If false show in both."
+          },
+          "label": {
+            "type": "string"
+          },
+          "placeholder": {
+            "type": "string"
+          },
+          "disableOnPrefill": {
+            "type": "boolean",
+            "description": "Disable this booking field if the URL contains query parameter with key equal to the slug and prefill it with the provided value.      For example, if URL contains query parameter `&guests=bob@cal.com`,      the guests field will be prefilled with this value and disabled."
+          }
+        },
+        "required": [
+          "slug"
+        ]
+      },
+      "RescheduleReasonDefaultFieldInput_2024_06_14": {
+        "type": "object",
+        "properties": {
+          "slug": {
+            "type": "string",
+            "example": "rescheduleReason",
+            "description": "only allowed value for type is `rescheduleReason`"
+          },
+          "required": {
+            "type": "boolean"
+          },
+          "hidden": {
+            "type": "boolean",
+            "description": "If true show under event type settings but don't show this booking field in the Booker. If false show in both."
+          },
+          "label": {
+            "type": "string"
+          },
+          "placeholder": {
+            "type": "string"
+          },
+          "disableOnPrefill": {
+            "type": "boolean",
+            "description": "Disable this booking field if the URL contains query parameter with key equal to the slug and prefill it with the provided value.      For example, if URL contains query parameter `&rescheduleReason=travel`,      the rescheduleReason field will be prefilled with this value and disabled."
+          }
+        },
+        "required": [
+          "slug"
+        ]
+      },
       "BookerLayouts_2024_06_14": {
         "type": "object",
         "properties": {
@@ -7921,10 +8041,22 @@
             "items": {
               "oneOf": [
                 {
-                  "$ref": "#/components/schemas/NameFieldInput_2024_06_14"
+                  "$ref": "#/components/schemas/NameDefaultFieldInput_2024_06_14"
                 },
                 {
-                  "$ref": "#/components/schemas/EmailFieldInput_2024_06_14"
+                  "$ref": "#/components/schemas/EmailDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/TitleDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/NotesDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/GuestsDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/RescheduleReasonDefaultFieldInput_2024_06_14"
                 },
                 {
                   "$ref": "#/components/schemas/PhoneFieldInput_2024_06_14"
@@ -8475,20 +8607,19 @@
       "RescheduleReasonDefaultFieldOutput_2024_06_14": {
         "type": "object",
         "properties": {
-          "isDefault": {
-            "type": "object",
-            "default": true,
-            "description": "This property is always true because it's a default field",
-            "example": true
-          },
           "slug": {
             "type": "string",
+            "enum": [
+              "name",
+              "email",
+              "title",
+              "notes",
+              "guests"
+            ],
+            "example": "rescheduleReason",
+            "description": "only allowed value for type is `rescheduleReason`",
             "default": "rescheduleReason"
           },
-          "type": {
-            "type": "string",
-            "default": "textarea"
-          },
           "required": {
             "type": "boolean"
           },
@@ -8505,33 +8636,39 @@
           "disableOnPrefill": {
             "type": "boolean",
             "description": "Disable this booking field if the URL contains query parameter with key equal to the slug and prefill it with the provided value.      For example, if URL contains query parameter `&rescheduleReason=busy`,      the reschedule reason field will be prefilled with this value and disabled."
-          }
-        },
-        "required": [
-          "isDefault",
-          "slug",
-          "type",
-          "required",
-          "hidden",
-          "disableOnPrefill"
-        ]
-      },
-      "TitleDefaultFieldOutput_2024_06_14": {
-        "type": "object",
-        "properties": {
+          },
           "isDefault": {
             "type": "object",
             "default": true,
             "description": "This property is always true because it's a default field",
             "example": true
           },
-          "slug": {
-            "type": "string",
-            "default": "title"
-          },
           "type": {
             "type": "string",
-            "default": "text"
+            "default": "textarea"
+          }
+        },
+        "required": [
+          "slug",
+          "isDefault",
+          "type"
+        ]
+      },
+      "TitleDefaultFieldOutput_2024_06_14": {
+        "type": "object",
+        "properties": {
+          "slug": {
+            "type": "string",
+            "enum": [
+              "name",
+              "email",
+              "title",
+              "notes",
+              "guests"
+            ],
+            "example": "title",
+            "description": "only allowed value for type is `title`",
+            "default": "title"
           },
           "required": {
             "type": "boolean"
@@ -8549,33 +8686,39 @@
           "disableOnPrefill": {
             "type": "boolean",
             "description": "Disable this booking field if the URL contains query parameter with key equal to the slug and prefill it with the provided value.      For example, if URL contains query parameter `&title=masterclass`,      the title field will be prefilled with this value and disabled."
-          }
-        },
-        "required": [
-          "isDefault",
-          "slug",
-          "type",
-          "required",
-          "hidden",
-          "disableOnPrefill"
-        ]
-      },
-      "NotesDefaultFieldOutput_2024_06_14": {
-        "type": "object",
-        "properties": {
+          },
           "isDefault": {
             "type": "object",
             "default": true,
             "description": "This property is always true because it's a default field",
             "example": true
           },
-          "slug": {
-            "type": "string",
-            "default": "notes"
-          },
           "type": {
             "type": "string",
-            "default": "textarea"
+            "default": "text"
+          }
+        },
+        "required": [
+          "slug",
+          "isDefault",
+          "type"
+        ]
+      },
+      "NotesDefaultFieldOutput_2024_06_14": {
+        "type": "object",
+        "properties": {
+          "slug": {
+            "type": "string",
+            "enum": [
+              "name",
+              "email",
+              "title",
+              "notes",
+              "guests"
+            ],
+            "example": "notes",
+            "description": "only allowed value for type is `notes`",
+            "default": "notes"
           },
           "required": {
             "type": "boolean"
@@ -8593,33 +8736,39 @@
           "disableOnPrefill": {
             "type": "boolean",
             "description": "Disable this booking field if the URL contains query parameter with key equal to the slug and prefill it with the provided value.      For example, if URL contains query parameter `&notes=hello`,      the notes field will be prefilled with this value and disabled."
-          }
-        },
-        "required": [
-          "isDefault",
-          "slug",
-          "type",
-          "required",
-          "hidden",
-          "disableOnPrefill"
-        ]
-      },
-      "GuestsDefaultFieldOutput_2024_06_14": {
-        "type": "object",
-        "properties": {
+          },
           "isDefault": {
             "type": "object",
             "default": true,
             "description": "This property is always true because it's a default field",
             "example": true
           },
-          "slug": {
-            "type": "string",
-            "default": "guests"
-          },
           "type": {
             "type": "string",
-            "default": "multiemail"
+            "default": "textarea"
+          }
+        },
+        "required": [
+          "slug",
+          "isDefault",
+          "type"
+        ]
+      },
+      "GuestsDefaultFieldOutput_2024_06_14": {
+        "type": "object",
+        "properties": {
+          "slug": {
+            "type": "string",
+            "enum": [
+              "name",
+              "email",
+              "title",
+              "notes",
+              "guests"
+            ],
+            "example": "guests",
+            "description": "only allowed value for type is `guests`",
+            "default": "guests"
           },
           "required": {
             "type": "boolean"
@@ -8637,15 +8786,22 @@
           "disableOnPrefill": {
             "type": "boolean",
             "description": "Disable this booking field if the URL contains query parameter with key equal to the slug and prefill it with the provided value.      For example, if URL contains query parameter `&guests=lauris@cal.com`,      the guests field will be prefilled with this value and disabled."
+          },
+          "isDefault": {
+            "type": "object",
+            "default": true,
+            "description": "This property is always true because it's a default field",
+            "example": true
+          },
+          "type": {
+            "type": "string",
+            "default": "multiemail"
           }
         },
         "required": [
-          "isDefault",
           "slug",
-          "type",
-          "required",
-          "hidden",
-          "disableOnPrefill"
+          "isDefault",
+          "type"
         ]
       },
       "AddressFieldOutput_2024_06_14": {
@@ -9776,10 +9932,22 @@
             "items": {
               "oneOf": [
                 {
-                  "$ref": "#/components/schemas/NameFieldInput_2024_06_14"
+                  "$ref": "#/components/schemas/NameDefaultFieldInput_2024_06_14"
                 },
                 {
-                  "$ref": "#/components/schemas/EmailFieldInput_2024_06_14"
+                  "$ref": "#/components/schemas/EmailDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/TitleDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/NotesDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/GuestsDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/RescheduleReasonDefaultFieldInput_2024_06_14"
                 },
                 {
                   "$ref": "#/components/schemas/PhoneFieldInput_2024_06_14"
@@ -11353,10 +11521,22 @@
             "items": {
               "oneOf": [
                 {
-                  "$ref": "#/components/schemas/NameFieldInput_2024_06_14"
+                  "$ref": "#/components/schemas/NameDefaultFieldInput_2024_06_14"
                 },
                 {
-                  "$ref": "#/components/schemas/EmailFieldInput_2024_06_14"
+                  "$ref": "#/components/schemas/EmailDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/TitleDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/NotesDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/GuestsDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/RescheduleReasonDefaultFieldInput_2024_06_14"
                 },
                 {
                   "$ref": "#/components/schemas/PhoneFieldInput_2024_06_14"
@@ -12178,10 +12358,22 @@
             "items": {
               "oneOf": [
                 {
-                  "$ref": "#/components/schemas/NameFieldInput_2024_06_14"
+                  "$ref": "#/components/schemas/NameDefaultFieldInput_2024_06_14"
                 },
                 {
-                  "$ref": "#/components/schemas/EmailFieldInput_2024_06_14"
+                  "$ref": "#/components/schemas/EmailDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/TitleDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/NotesDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/GuestsDefaultFieldInput_2024_06_14"
+                },
+                {
+                  "$ref": "#/components/schemas/RescheduleReasonDefaultFieldInput_2024_06_14"
                 },
                 {
                   "$ref": "#/components/schemas/PhoneFieldInput_2024_06_14"

apps/web/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @calcom/web
 
+## 4.8.7
+
+### Patch Changes
+
+- Updated dependencies
+  - @calcom/embed-core@1.5.2
+  - @calcom/embed-react@1.5.2
+  - @calcom/embed-snippet@1.3.2
+
 ## 4.5.2
 
 ### Patch Changes

apps/web/abTest/middlewareFactory.ts

@@ -20,8 +20,6 @@ const ROUTES: [URLPattern, boolean][] = [
   ["/auth/error", process.env.APP_ROUTER_AUTH_ERROR_ENABLED === "1"] as const,
   ["/auth/platform/:path*", process.env.APP_ROUTER_AUTH_PLATFORM_ENABLED === "1"] as const,
   ["/auth/oauth2/:path*", process.env.APP_ROUTER_AUTH_OAUTH2_ENABLED === "1"] as const,
-  ["/bookings/:status", process.env.APP_ROUTER_BOOKINGS_STATUS_ENABLED === "1"] as const,
-  ["/team", process.env.APP_ROUTER_TEAM_ENABLED === "1"] as const,
 ].map(([pathname, enabled]) => [
   new URLPattern({
     pathname,

apps/web/app/403/page.tsx

@@ -1,20 +1,20 @@
-import Head from "next/head";
+import { _generateMetadata, getTranslate } from "app/_utils";
+import { WithLayout } from "app/layoutHOC";
 
 import { APP_NAME, WEBAPP_URL } from "@calcom/lib/constants";
-import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button } from "@calcom/ui";
 
-import PageWrapper from "@components/PageWrapper";
+export const generateMetadata = () =>
+  _generateMetadata(
+    (t) => `${t("access_denied")} | ${APP_NAME}`,
+    () => ""
+  );
 
-export default function AccessDenied() {
-  const { t } = useLocale();
+async function Error403() {
+  const t = await getTranslate();
 
   return (
     <div className="bg-subtle flex h-screen">
-      <Head>
-        <title>{`${t("access_denied")} | ${APP_NAME}`}</title>
-        <link rel="icon" href="/favicon.ico" />
-      </Head>
       <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>
@@ -27,4 +27,4 @@ export default function AccessDenied() {
   );
 }
 
-AccessDenied.PageWrapper = PageWrapper;
+export default WithLayout({ ServerPage: Error403 });

apps/web/app/500/copy-button.tsx

@@ -0,0 +1,21 @@
+"use client";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Button, showToast } from "@calcom/ui";
+
+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/500/page.tsx

@@ -0,0 +1,47 @@
+import { _generateMetadata, getTranslate } from "app/_utils";
+import { WithLayout } from "app/layoutHOC";
+
+import { APP_NAME } from "@calcom/lib/constants";
+import { Button } from "@calcom/ui";
+
+import CopyButton from "./copy-button";
+
+export const generateMetadata = () =>
+  _generateMetadata(
+    (t) => `${t("something_unexpected_occurred")} | ${APP_NAME}`,
+    () => ""
+  );
+
+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 WithLayout({
+  ServerPage: Error500,
+});

apps/web/app/WithAppDirSsg.tsx

@@ -1,24 +1,31 @@
 import type { GetStaticProps, GetStaticPropsContext } from "next";
+import { unstable_cache } from "next/cache";
 import { notFound, redirect } from "next/navigation";
 
 export const withAppDirSsg =
-  <T extends Record<string, any>>(getStaticProps: GetStaticProps<T>) =>
+  <T extends Record<string, any>>(getStaticProps: GetStaticProps<T>, routePath: string) =>
   async (context: GetStaticPropsContext) => {
-    const ssgResponse = await getStaticProps(context);
+    const cacheKey = JSON.stringify({
+      route: routePath,
+      params: context.params || {},
+    });
 
-    if ("redirect" in ssgResponse) {
-      redirect(ssgResponse.redirect.destination);
-    }
+    const getCachedProps = unstable_cache(async () => {
+      const ssgResponse = await getStaticProps(context);
 
-    if ("notFound" in ssgResponse) {
-      notFound();
-    }
+      if ("redirect" in ssgResponse) {
+        redirect(ssgResponse.redirect.destination);
+      }
 
-    const props = await Promise.resolve(ssgResponse.props);
+      if ("notFound" in ssgResponse) {
+        notFound();
+      }
 
-    return {
-      ...ssgResponse.props,
-      // includes dehydratedState required for future page trpcPropvider
-      ...("trpcState" in props && { dehydratedState: props.trpcState }),
-    };
+      return {
+        ...ssgResponse.props,
+        ...("trpcState" in ssgResponse.props && { dehydratedState: ssgResponse.props.trpcState }),
+      };
+    }, [`ssg-${cacheKey}`]);
+
+    return getCachedProps();
   };

apps/web/app/WithEmbedSSR.test.ts

@@ -0,0 +1,250 @@
+import type { Request, Response } from "express";
+import type { NextApiRequest, NextApiResponse, Redirect } from "next";
+import { redirect, notFound } from "next/navigation";
+import { createMocks } from "node-mocks-http";
+import { describe, expect, it, vi } from "vitest";
+
+import withEmbedSsrAppDir from "./WithEmbedSSR";
+
+export type CustomNextApiRequest = NextApiRequest & Request;
+export type CustomNextApiResponse = NextApiResponse & Response;
+
+export function createMockNextJsRequest(...args: Parameters<typeof createMocks>) {
+  return createMocks<CustomNextApiRequest, CustomNextApiResponse>(...args);
+}
+
+// eslint-disable-next-line @typescript-eslint/no-empty-function
+const noop = () => {};
+
+vi.mock("next/navigation", () => ({
+  redirect: vi.fn(),
+  notFound: vi.fn(),
+}));
+
+function getServerSidePropsFnGenerator(
+  config:
+    | { redirectUrl: string }
+    | { props: Record<string, unknown> }
+    | {
+        notFound: true;
+      }
+) {
+  if ("redirectUrl" in config)
+    return async () => {
+      return {
+        redirect: {
+          permanent: false,
+          destination: config.redirectUrl,
+        } satisfies Redirect,
+      };
+    };
+
+  if ("props" in config)
+    return async () => {
+      return {
+        props: config.props,
+      };
+    };
+
+  if ("notFound" in config)
+    return async () => {
+      return {
+        notFound: true as const,
+      };
+    };
+
+  throw new Error("Invalid config");
+}
+
+interface ServerSidePropsContext {
+  embedRelatedParams?: Record<string, string>;
+}
+
+function getServerSidePropsContextArg({ embedRelatedParams = {} }: ServerSidePropsContext) {
+  const { req, res } = createMockNextJsRequest();
+  return {
+    req,
+    res,
+    query: {
+      ...embedRelatedParams,
+    },
+    resolvedUrl: "/MOCKED_RESOLVED_URL",
+  };
+}
+
+describe("withEmbedSsrAppDir", () => {
+  describe("when gSSP returns redirect", () => {
+    describe("when redirect destination is relative", () => {
+      it("should redirect with layout and embed params from the current query", async () => {
+        const withEmbedGetSsr = withEmbedSsrAppDir(
+          getServerSidePropsFnGenerator({
+            redirectUrl: "/reschedule",
+          })
+        );
+
+        await withEmbedGetSsr(
+          getServerSidePropsContextArg({
+            embedRelatedParams: {
+              layout: "week_view",
+              embed: "namespace1",
+            },
+          })
+        ).catch(noop);
+
+        expect(redirect).toHaveBeenCalledWith("/reschedule/embed?layout=week_view&embed=namespace1");
+      });
+
+      it("should preserve existing query params in redirect URL", async () => {
+        const withEmbedGetSsr = withEmbedSsrAppDir(
+          getServerSidePropsFnGenerator({
+            redirectUrl: "/reschedule?redirectParam=1",
+          })
+        );
+
+        await withEmbedGetSsr(
+          getServerSidePropsContextArg({
+            embedRelatedParams: {
+              layout: "week_view",
+              embed: "namespace1",
+            },
+          })
+        ).catch(noop);
+
+        expect(redirect).toHaveBeenCalledWith(
+          "/reschedule/embed?redirectParam=1&layout=week_view&embed=namespace1"
+        );
+      });
+
+      it("should handle empty embed namespace", async () => {
+        const withEmbedGetSsr = withEmbedSsrAppDir(
+          getServerSidePropsFnGenerator({
+            redirectUrl: "/reschedule?redirectParam=1",
+          })
+        );
+
+        await withEmbedGetSsr(
+          getServerSidePropsContextArg({
+            embedRelatedParams: {
+              layout: "week_view",
+              embed: "",
+            },
+          })
+        ).catch(noop);
+
+        expect(redirect).toHaveBeenCalledWith("/reschedule/embed?redirectParam=1&layout=week_view&embed=");
+      });
+    });
+
+    describe("when redirect destination is absolute", () => {
+      it("should handle HTTPS URLs", async () => {
+        const withEmbedGetSsr = withEmbedSsrAppDir(
+          getServerSidePropsFnGenerator({
+            redirectUrl: "https://calcom.cal.local/owner",
+          })
+        );
+
+        await withEmbedGetSsr(
+          getServerSidePropsContextArg({
+            embedRelatedParams: {
+              layout: "week_view",
+              embed: "namespace1",
+            },
+          })
+        ).catch(noop);
+
+        expect(redirect).toHaveBeenCalledWith(
+          "https://calcom.cal.local/owner/embed?layout=week_view&embed=namespace1"
+        );
+      });
+
+      it("should handle HTTP URLs", async () => {
+        const withEmbedGetSsr = withEmbedSsrAppDir(
+          getServerSidePropsFnGenerator({
+            redirectUrl: "http://calcom.cal.local/owner",
+          })
+        );
+
+        await withEmbedGetSsr(
+          getServerSidePropsContextArg({
+            embedRelatedParams: {
+              layout: "week_view",
+              embed: "namespace1",
+            },
+          })
+        ).catch(noop);
+
+        expect(redirect).toHaveBeenCalledWith(
+          "http://calcom.cal.local/owner/embed?layout=week_view&embed=namespace1"
+        );
+      });
+
+      it("should treat URLs without protocol as relative", async () => {
+        const withEmbedGetSsr = withEmbedSsrAppDir(
+          getServerSidePropsFnGenerator({
+            redirectUrl: "calcom.cal.local/owner",
+          })
+        );
+
+        await withEmbedGetSsr(
+          getServerSidePropsContextArg({
+            embedRelatedParams: {
+              layout: "week_view",
+              embed: "namespace1",
+            },
+          })
+        ).catch(noop);
+
+        expect(redirect).toHaveBeenCalledWith(
+          "/calcom.cal.local/owner/embed?layout=week_view&embed=namespace1"
+        );
+      });
+    });
+  });
+
+  describe("when gSSP returns props", () => {
+    it("should add isEmbed=true prop", async () => {
+      const withEmbedGetSsr = withEmbedSsrAppDir(
+        getServerSidePropsFnGenerator({
+          props: {
+            prop1: "value1",
+          },
+        })
+      );
+
+      const ret = await withEmbedGetSsr(
+        getServerSidePropsContextArg({
+          embedRelatedParams: {
+            layout: "week_view",
+            embed: "",
+          },
+        })
+      );
+
+      expect(ret).toEqual({
+        prop1: "value1",
+        isEmbed: true,
+      });
+    });
+  });
+
+  describe("when gSSP returns notFound", () => {
+    it("should throw notFound", async () => {
+      const withEmbedGetSsr = withEmbedSsrAppDir(
+        getServerSidePropsFnGenerator({
+          notFound: true,
+        })
+      );
+
+      await withEmbedGetSsr(
+        getServerSidePropsContextArg({
+          embedRelatedParams: {
+            layout: "week_view",
+            embed: "",
+          },
+        })
+      ).catch(noop);
+
+      expect(notFound).toHaveBeenCalled();
+    });
+  });
+});

apps/web/app/WithEmbedSSR.tsx

@@ -1,6 +1,4 @@
-import type { GetServerSidePropsContext } from "next";
-import { isNotFoundError } from "next/dist/client/components/not-found";
-import { getURLFromRedirectError, isRedirectError } from "next/dist/client/components/redirect";
+import type { GetServerSideProps, GetServerSidePropsContext } from "next";
 import { notFound, redirect } from "next/navigation";
 
 import { WebAppURL } from "@calcom/lib/WebAppURL";
@@ -9,48 +7,46 @@ export type EmbedProps = {
   isEmbed?: boolean;
 };
 
-export default function withEmbedSsrAppDir<T extends Record<string, any>>(
-  getData: (context: GetServerSidePropsContext) => Promise<T>
-) {
-  return async (context: GetServerSidePropsContext): Promise<T> => {
+const withEmbedSsrAppDir =
+  <T extends Record<string, any>>(getServerSideProps: GetServerSideProps<T>) =>
+  async (context: GetServerSidePropsContext): Promise<T> => {
     const { embed, layout } = context.query;
-    try {
-      const props = await getData(context);
+    const ssrResponse = await getServerSideProps(context);
 
-      return {
-        ...props,
-        isEmbed: true,
-      };
-    } catch (e) {
-      if (isRedirectError(e)) {
-        const destinationUrl = getURLFromRedirectError(e);
-        let urlPrefix = "";
+    if ("redirect" in ssrResponse) {
+      const destinationUrl = ssrResponse.redirect.destination;
+      let urlPrefix = "";
 
-        // Get the URL parsed from URL so that we can reliably read pathname and searchParams from it.
-        const destinationUrlObj = new WebAppURL(destinationUrl);
+      // Get the URL parsed from URL so that we can reliably read pathname and searchParams from it.
+      const destinationUrlObj = new WebAppURL(ssrResponse.redirect.destination);
 
-        // If it's a complete URL, use the origin as the prefix to ensure we redirect to the same domain.
-        if (destinationUrl.search(/^(http:|https:).*/) !== -1) {
-          urlPrefix = destinationUrlObj.origin;
-        } else {
-          // Don't use any prefix for relative URLs to ensure we stay on the same domain
-          urlPrefix = "";
-        }
-
-        const destinationQueryStr = destinationUrlObj.searchParams.toString();
-        // Make sure that redirect happens to /embed page and pass on embed query param as is for preserving Cal JS API namespace
-        const newDestinationUrl = `${urlPrefix}${destinationUrlObj.pathname}/embed?${
-          destinationQueryStr ? `${destinationQueryStr}&` : ""
-        }layout=${layout}&embed=${embed}`;
-
-        redirect(newDestinationUrl);
+      // If it's a complete URL, use the origin as the prefix to ensure we redirect to the same domain.
+      if (destinationUrl.search(/^(http:|https:).*/) !== -1) {
+        urlPrefix = destinationUrlObj.origin;
+      } else {
+        // Don't use any prefix for relative URLs to ensure we stay on the same domain
+        urlPrefix = "";
       }
 
-      if (isNotFoundError(e)) {
-        notFound();
-      }
-
-      throw e;
+      const destinationQueryStr = destinationUrlObj.searchParams.toString();
+      // Make sure that redirect happens to /embed page and pass on embed query param as is for preserving Cal JS API namespace
+      const newDestinationUrl = `${urlPrefix}${destinationUrlObj.pathname}/embed?${
+        destinationQueryStr ? `${destinationQueryStr}&` : ""
+      }layout=${layout}&embed=${embed}`;
+      redirect(newDestinationUrl);
     }
+
+    if ("notFound" in ssrResponse) {
+      notFound();
+    }
+
+    return {
+      ...ssrResponse.props,
+      ...("trpcState" in ssrResponse.props && {
+        dehydratedState: ssrResponse.props.trpcState,
+      }),
+      isEmbed: true,
+    };
   };
-}
+
+export default withEmbedSsrAppDir;

apps/web/app/[user]/[type]/page.tsx

@@ -1,6 +1,6 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
 import type { PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
+import { generateEventBookingPageMetadata } from "app/generateBookingPageMetadata";
 import { WithLayout } from "app/layoutHOC";
 import { headers, cookies } from "next/headers";
 
@@ -18,7 +18,7 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => {
   const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams);
   const props = await getData(legacyCtx);
 
-  const { booking, user: username, slug: eventSlug } = props;
+  const { booking, user: username, slug: eventSlug, isSEOIndexable, eventData, isBrandingHidden } = props;
   const rescheduleUid = booking?.uid;
   const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(legacyCtx.req, legacyCtx.params?.orgSlug);
 
@@ -31,12 +31,21 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => {
   });
 
   const profileName = event?.profile?.name ?? "";
+  const profileImage = event?.profile.image;
   const title = event?.title ?? "";
-
-  return await _generateMetadata(
-    (t) => `${rescheduleUid && !!booking ? t("reschedule") : ""} ${title} | ${profileName}`,
-    (t) => `${rescheduleUid ? t("reschedule") : ""} ${title}`
-  );
+  const metadata = await generateEventBookingPageMetadata({
+    event: {
+      hidden: event?.hidden ?? false,
+      title,
+      users: event?.users ?? [],
+    },
+    hideBranding: isBrandingHidden,
+    orgSlug: eventData?.entity.orgSlug ?? null,
+    isSEOIndexable: !!isSEOIndexable,
+    profile: { name: profileName, image: profileImage ?? "" },
+    isReschedule: !!rescheduleUid,
+  });
+  return metadata;
 };
 const getData = withAppDirSsr<LegacyPageProps>(getServerSideProps);
 

apps/web/app/[user]/page.tsx

@@ -0,0 +1,39 @@
+import { withAppDirSsr } from "app/WithAppDirSsr";
+import type { PageProps } from "app/_types";
+import { generateUserProfilePageMetadata } from "app/generateBookingPageMetadata";
+import { WithLayout } from "app/layoutHOC";
+import { headers, cookies } from "next/headers";
+
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+
+import { getServerSideProps } from "@server/lib/[user]/getServerSideProps";
+
+import type { PageProps as LegacyPageProps } from "~/users/views/users-public-view";
+import LegacyPage from "~/users/views/users-public-view";
+
+export const generateMetadata = async ({ params, searchParams }: PageProps) => {
+  const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
+
+  const { profile, markdownStrippedBio, isOrgSEOIndexable, entity } = props;
+
+  const isOrg = !!profile?.organization;
+  const allowSEOIndexing = !!(
+    (!isOrg && profile.allowSEOIndexing) ||
+    (isOrg && isOrgSEOIndexable && profile.allowSEOIndexing)
+  );
+  return await generateUserProfilePageMetadata({
+    profile: {
+      name: profile.name,
+      image: profile.image ?? "",
+      username: profile.username ?? "",
+      markdownStrippedBio: markdownStrippedBio,
+    },
+    event: null,
+    hideBranding: false,
+    orgSlug: entity.orgSlug ?? null,
+    isSEOIndexable: allowSEOIndexing,
+  });
+};
+
+const getData = withAppDirSsr<LegacyPageProps>(getServerSideProps);
+export default WithLayout({ getData, Page: LegacyPage })<"P">;

apps/web/app/_utils.tsx

@@ -3,28 +3,41 @@ import i18next from "i18next";
 import { serverSideTranslations } from "next-i18next/serverSideTranslations";
 import { headers } from "next/headers";
 
-import { constructGenericImage } from "@calcom/lib/OgImages";
-import { IS_CALCOM, WEBAPP_URL, APP_NAME, SEO_IMG_OGIMG } from "@calcom/lib/constants";
+import type { MeetingImageProps } from "@calcom/lib/OgImages";
+import { constructGenericImage, constructMeetingImage } from "@calcom/lib/OgImages";
+import { IS_CALCOM, WEBAPP_URL, APP_NAME, SEO_IMG_OGIMG, CAL_URL } from "@calcom/lib/constants";
+import { buildCanonical } from "@calcom/lib/next-seo.config";
 import { truncateOnWord } from "@calcom/lib/text";
 //@ts-expect-error no type definitions
 import config from "@calcom/web/next-i18next.config";
 
-const create = async (locale: string, ns: string) => {
+const i18nInstanceCache: Record<string, any> = {};
+
+const createI18nInstance = async (locale: string, ns: string) => {
+  const cacheKey = `${locale}-${ns}`;
+  // Check module-level cache first
+  if (i18nInstanceCache[cacheKey]) {
+    return i18nInstanceCache[cacheKey];
+  }
+
   const { _nextI18Next } = await serverSideTranslations(locale, [ns], config);
 
   const _i18n = i18next.createInstance();
-  _i18n.init({
+  await _i18n.init({
     lng: locale,
     resources: _nextI18Next?.initialI18nStore,
     fallbackLng: _nextI18Next?.userConfig?.i18n.defaultLocale,
   });
+
+  // Cache the instance
+  i18nInstanceCache[cacheKey] = _i18n;
   return _i18n;
 };
 
-export const getFixedT = async (locale: string, ns = "common") => {
-  const i18n = await create(locale, ns);
-
-  return i18n.getFixedT(locale, ns);
+const getTranslationWithCache = async (locale: string, ns = "common") => {
+  const localeWithFallback = locale ?? "en";
+  const i18n = await createI18nInstance(localeWithFallback, ns);
+  return i18n.getFixedT(localeWithFallback, ns);
 };
 
 export const getTranslate = async () => {
@@ -32,51 +45,80 @@ export const getTranslate = async () => {
   // If "x-locale" does not exist in header,
   // ensure that config.matcher in middleware includes the page you are testing
   const locale = headersList.get("x-locale");
-  const t = await getFixedT(locale ?? "en");
+  const t = await getTranslationWithCache(locale ?? "en");
   return t;
 };
 
-export const _generateMetadata = async (
+const _generateMetadataWithoutImage = async (
   getTitle: (t: TFunction<string, undefined>) => string,
   getDescription: (t: TFunction<string, undefined>) => string,
-  excludeAppNameFromTitle?: boolean
+  hideBranding?: boolean,
+  origin?: string
 ) => {
   const h = headers();
-  const canonical = h.get("x-pathname") ?? "";
+  const pathname = h.get("x-pathname") ?? "";
+  const canonical = buildCanonical({ path: pathname, origin: origin ?? CAL_URL });
   const locale = h.get("x-locale") ?? "en";
-
-  const t = await getFixedT(locale, "common");
+  const t = await getTranslationWithCache(locale);
 
   const title = getTitle(t);
   const description = getDescription(t);
-
-  const metadataBase = new URL(IS_CALCOM ? "https://cal.com" : WEBAPP_URL);
-
-  const image =
-    SEO_IMG_OGIMG +
-    constructGenericImage({
-      title,
-      description,
-    });
-
   const titleSuffix = `| ${APP_NAME}`;
-  const displayedTitle =
-    title.includes(titleSuffix) || excludeAppNameFromTitle ? title : `${title} ${titleSuffix}`;
+  const displayedTitle = title.includes(titleSuffix) || hideBranding ? title : `${title} ${titleSuffix}`;
+  const metadataBase = new URL(IS_CALCOM ? "https://cal.com" : WEBAPP_URL);
 
   return {
     title: title.length === 0 ? APP_NAME : displayedTitle,
     description,
-    alternates: {
-      canonical,
-    },
+    alternates: { canonical },
     openGraph: {
       description: truncateOnWord(description, 158),
       url: canonical,
       type: "website",
       siteName: APP_NAME,
-      title,
-      images: [image],
+      title: displayedTitle,
     },
     metadataBase,
   };
 };
+
+export const _generateMetadata = async (
+  getTitle: (t: TFunction<string, undefined>) => string,
+  getDescription: (t: TFunction<string, undefined>) => string,
+  hideBranding?: boolean,
+  origin?: string
+) => {
+  const metadata = await _generateMetadataWithoutImage(getTitle, getDescription, hideBranding, origin);
+  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,
+  getDescription: (t: TFunction<string, undefined>) => string,
+  hideBranding?: boolean,
+  origin?: string
+) => {
+  const metadata = await _generateMetadataWithoutImage(getTitle, getDescription, hideBranding, origin);
+  const image = SEO_IMG_OGIMG + constructMeetingImage(meeting);
+  return {
+    ...metadata,
+    openGraph: {
+      ...metadata.openGraph,
+      images: [image],
+    },
+  };
+};

apps/web/app/api/customer-card/route.ts

@@ -20,12 +20,13 @@ const inputSchema = z.object({
   cardKeys: z.array(z.string()),
 });
 
-export async function handler(request: Request) {
+async function handler(request: Request) {
   const headersList = headers();
   const requestBody = await request.json();
 
   // HMAC verification
   const incomingSignature = headersList.get("plain-request-signature");
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
   const expectedSignature = createHmac("sha-256", process.env.PLAIN_HMAC_SECRET_KEY!)
     .update(JSON.stringify(requestBody))
     .digest("hex");
@@ -88,18 +89,8 @@ export async function handler(request: Request) {
                 rowAsideContent: [
                   {
                     componentBadge: {
-                      badgeLabel:
-                        customer.emailVerified === undefined
-                          ? "Unknown"
-                          : customer.emailVerified
-                          ? "Yes"
-                          : "No",
-                      badgeColor:
-                        customer.emailVerified === undefined
-                          ? "YELLOW"
-                          : customer.emailVerified
-                          ? "GREEN"
-                          : "RED",
+                      badgeLabel: customer.emailVerified ? "Yes" : "No",
+                      badgeColor: customer.emailVerified ? "GREEN" : "RED",
                     },
                   },
                 ],
@@ -195,18 +186,8 @@ export async function handler(request: Request) {
                 rowAsideContent: [
                   {
                     componentBadge: {
-                      badgeLabel:
-                        customer.twoFactorEnabled === undefined
-                          ? "Unknown"
-                          : customer.twoFactorEnabled
-                          ? "Yes"
-                          : "No",
-                      badgeColor:
-                        customer.twoFactorEnabled === undefined
-                          ? "YELLOW"
-                          : customer.twoFactorEnabled
-                          ? "GREEN"
-                          : "RED",
+                      badgeLabel: customer.twoFactorEnabled ? "Yes" : "No",
+                      badgeColor: customer.twoFactorEnabled ? "GREEN" : "RED",
                     },
                   },
                 ],

apps/web/app/api/plain-hash/route.ts

@@ -0,0 +1,49 @@
+import { createHmac } from "crypto";
+import { NextResponse } from "next/server";
+import { z } from "zod";
+
+import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { apiRouteMiddleware } from "@calcom/lib/server/apiRouteMiddleware";
+
+const responseSchema = z.object({
+  hash: z.string(),
+  email: z.string().email(),
+  shortName: z.string(),
+  appId: z.string(),
+  fullName: z.string(),
+  chatAvatarUrl: z.string(),
+});
+
+async function handler(request: Request) {
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  const session = await getServerSession({ req: request as any });
+  if (!session?.user?.email) {
+    return new Response("Unauthorized - No session email found", { status: 401 });
+  }
+
+  const secret = process.env.PLAIN_CHAT_HMAC_SECRET_KEY;
+  if (!secret) {
+    return new Response("Missing Plain Chat secret", { status: 500 });
+  }
+
+  const hmac = createHmac("sha256", secret);
+  hmac.update(session.user.email.toLowerCase().trim());
+  const hash = hmac.digest("hex");
+
+  const shortName =
+    (session.user.name?.split(" ")[0] || session.user.email).charAt(0).toUpperCase() +
+      (session.user.name?.split(" ")[0] || session.user.email).slice(1) || "User";
+
+  const response = responseSchema.parse({
+    hash,
+    email: session.user.email || "user@example.com",
+    shortName,
+    appId: process.env.PLAIN_CHAT_ID,
+    fullName: session.user.name || "User",
+    chatAvatarUrl: session.user.avatarUrl || "",
+  });
+
+  return NextResponse.json(response);
+}
+
+export const POST = apiRouteMiddleware(handler);

apps/web/app/booking/[uid]/embed/page.tsx

@@ -1,12 +1,9 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
 import withEmbedSsrAppDir from "app/WithEmbedSSR";
 import { WithLayout } from "app/layoutHOC";
 
 import OldPage from "~/bookings/views/bookings-single-view";
 import { getServerSideProps, type PageProps } from "~/bookings/views/bookings-single-view.getServerSideProps";
 
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
-
-const getEmbedData = withEmbedSsrAppDir(getData);
+const getEmbedData = withEmbedSsrAppDir<PageProps>(getServerSideProps);
 
 export default WithLayout({ getLayout: null, getData: getEmbedData, Page: OldPage });

apps/web/app/booking/[uid]/page.tsx

@@ -4,6 +4,7 @@ import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
 import { cookies, headers } from "next/headers";
 
+import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";
 import { BookingStatus } from "@calcom/prisma/enums";
 
 import { buildLegacyCtx } from "@lib/buildLegacyCtx";
@@ -12,7 +13,7 @@ import OldPage from "~/bookings/views/bookings-single-view";
 import { getServerSideProps, type PageProps } from "~/bookings/views/bookings-single-view.getServerSideProps";
 
 export const generateMetadata = async ({ params, searchParams }: _PageProps) => {
-  const { bookingInfo, eventType, recurringBookings } = await getData(
+  const { bookingInfo, eventType, recurringBookings, orgSlug } = await getData(
     buildLegacyCtx(headers(), cookies(), params, searchParams)
   );
   const needsConfirmation = bookingInfo.status === BookingStatus.PENDING && eventType.requiresConfirmation;
@@ -21,7 +22,9 @@ export const generateMetadata = async ({ params, searchParams }: _PageProps) =>
     (t) =>
       t(`booking_${needsConfirmation ? "submitted" : "confirmed"}${recurringBookings ? "_recurring" : ""}`),
     (t) =>
-      t(`booking_${needsConfirmation ? "submitted" : "confirmed"}${recurringBookings ? "_recurring" : ""}`)
+      t(`booking_${needsConfirmation ? "submitted" : "confirmed"}${recurringBookings ? "_recurring" : ""}`),
+    false,
+    getOrgFullOrigin(orgSlug)
   );
 };
 

apps/web/app/booking/dry-run-successful/page.tsx

@@ -0,0 +1,17 @@
+import { _generateMetadata } from "app/_utils";
+import { WithLayout } from "app/layoutHOC";
+
+import BookingDryRunSuccessView from "~/bookings/views/booking-dry-run-success-view";
+
+export const generateMetadata = async () => {
+  return await _generateMetadata(
+    (t) => t("booking_dry_run_successful"),
+    (t) => t("booking_dry_run_successful_description")
+  );
+};
+
+const Page = async () => {
+  return <BookingDryRunSuccessView />;
+};
+
+export default WithLayout({ ServerPage: Page });

apps/web/app/bookings/[status]/page.tsx

@@ -0,0 +1,33 @@
+import type { PageProps } from "app/_types";
+import { _generateMetadata } from "app/_utils";
+import { WithLayout } from "app/layoutHOC";
+import { redirect } from "next/navigation";
+import { z } from "zod";
+
+import { validStatuses } from "~/bookings/lib/validStatuses";
+import BookingsList from "~/bookings/views/bookings-listing-view";
+
+const querySchema = z.object({
+  status: z.enum(validStatuses),
+});
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("bookings"),
+    (t) => t("bookings_description")
+  );
+
+export const generateStaticParams = async () => {
+  return validStatuses.map((status) => ({ status }));
+};
+
+const Page = async ({ params, searchParams }: PageProps) => {
+  const parsed = querySchema.safeParse({ ...params, ...searchParams });
+  if (!parsed.success) {
+    redirect("/bookings/upcoming");
+  }
+
+  return <BookingsList status={parsed.data.status} />;
+};
+
+export default WithLayout({ ServerPage: Page })<"P">;

apps/web/app/d/[link]/[slug]/page.tsx

@@ -17,7 +17,7 @@ export const generateMetadata = async ({ params, searchParams }: _PageProps) =>
   const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams);
   const pageProps = await getData(legacyCtx);
 
-  const { booking, user: username, slug: eventSlug, isTeamEvent } = pageProps;
+  const { booking, user: username, slug: eventSlug, isTeamEvent, isBrandingHidden } = pageProps;
   const rescheduleUid = booking?.uid;
   const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(legacyCtx.req);
   const org = isValidOrgDomain ? currentOrgDomain : null;
@@ -34,7 +34,8 @@ export const generateMetadata = async ({ params, searchParams }: _PageProps) =>
   const title = event?.title ?? "";
   return await _generateMetadata(
     (t) => `${rescheduleUid && !!booking ? t("reschedule") : ""} ${title} | ${profileName}`,
-    (t) => `${rescheduleUid ? t("reschedule") : ""} ${title}`
+    (t) => `${rescheduleUid ? t("reschedule") : ""} ${title}`,
+    isBrandingHidden
   );
 };
 

apps/web/app/future/[user]/[type]/embed/page.tsx

@@ -1,4 +1,3 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
 import withEmbedSsrAppDir from "app/WithEmbedSSR";
 import { WithLayout } from "app/layoutHOC";
 
@@ -6,10 +5,6 @@ import { getServerSideProps } from "@server/lib/[user]/[type]/getServerSideProps
 
 import LegacyPage, { type PageProps } from "~/users/views/users-type-public-view";
 
-export { generateMetadata } from "../page";
-
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
-
-const getEmbedData = withEmbedSsrAppDir(getData);
+const getEmbedData = withEmbedSsrAppDir<PageProps>(getServerSideProps);
 
 export default WithLayout({ getLayout: null, getData: getEmbedData, Page: LegacyPage })<"P">;

apps/web/app/future/[user]/embed/page.tsx

@@ -1,4 +1,3 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
 import withEmbedSsrAppDir from "app/WithEmbedSSR";
 import { WithLayout } from "app/layoutHOC";
 
@@ -7,10 +6,6 @@ import { getServerSideProps } from "@server/lib/[user]/getServerSideProps";
 import type { PageProps as UserPageProps } from "~/users/views/users-public-view";
 import LegacyPage from "~/users/views/users-public-view";
 
-export { generateMetadata } from "../page";
-
-const getData = withAppDirSsr<UserPageProps>(getServerSideProps);
-
-const getEmbedData = withEmbedSsrAppDir(getData);
+const getEmbedData = withEmbedSsrAppDir<UserPageProps>(getServerSideProps);
 
 export default WithLayout({ getLayout: null, getData: getEmbedData, Page: LegacyPage })<"P">;

apps/web/app/future/[user]/page.tsx

@@ -1,27 +0,0 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
-import type { PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-import { headers, cookies } from "next/headers";
-
-import { getLayout } from "@calcom/features/MainLayoutAppDir";
-
-import { buildLegacyCtx } from "@lib/buildLegacyCtx";
-
-import { getServerSideProps } from "@server/lib/[user]/getServerSideProps";
-
-import type { PageProps as LegacyPageProps } from "~/users/views/users-public-view";
-import LegacyPage from "~/users/views/users-public-view";
-
-export const generateMetadata = async ({ params, searchParams }: PageProps) => {
-  const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
-
-  const { profile, markdownStrippedBio } = props;
-  return await _generateMetadata(
-    () => profile.name,
-    () => markdownStrippedBio
-  );
-};
-
-const getData = withAppDirSsr<LegacyPageProps>(getServerSideProps);
-export default WithLayout({ getLayout, getData, Page: LegacyPage })<"P">;

apps/web/app/future/apps/[slug]/page.tsx

@@ -13,7 +13,7 @@ import { buildLegacyCtx } from "@lib/buildLegacyCtx";
 import type { PageProps } from "~/apps/[slug]/slug-view";
 import Page from "~/apps/[slug]/slug-view";
 
-const getData = withAppDirSsg<PageProps>(getStaticProps);
+const getData = withAppDirSsg<PageProps>(getStaticProps, "future/apps/[slug]");
 
 export const generateMetadata = async ({ params, searchParams }: _PageProps) => {
   const legacyContext = buildLegacyCtx(headers(), cookies(), params, searchParams);

apps/web/app/future/apps/categories/[category]/page.tsx

@@ -28,7 +28,7 @@ export const generateStaticParams = async () => {
   return paths.map((category) => ({ category }));
 };
 
-const getData = withAppDirSsg<PageProps>(getStaticProps);
+const getData = withAppDirSsg<PageProps>(getStaticProps, "future/apps/categories/[category]");
 
 export default WithLayout({ getData, Page: CategoryPage, getLayout: null })<"P">;
 export const dynamic = "force-static";

apps/web/app/future/auth/error/page.tsx

@@ -13,7 +13,7 @@ export const generateMetadata = async () => {
   );
 };
 
-const getData = withAppDirSsg(getStaticProps);
+const getData = withAppDirSsg(getStaticProps, "future/auth/error");
 
 export default WithLayout({ getData, Page, getLayout: null })<"P">;
 export const dynamic = "force-static";

apps/web/app/future/bookings/[status]/page.tsx

@@ -1,25 +0,0 @@
-import { withAppDirSsg } from "app/WithAppDirSsg";
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-import type { InferGetStaticPropsType } from "next";
-
-import { validStatuses } from "~/bookings/lib/validStatuses";
-import Page from "~/bookings/views/bookings-listing-view";
-import { getStaticProps } from "~/bookings/views/bookings-listing-view.getStaticProps";
-
-type Y = InferGetStaticPropsType<typeof getStaticProps>;
-const getData = withAppDirSsg<Y>(getStaticProps);
-
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    (t) => t("bookings"),
-    (t) => t("bookings_description")
-  );
-
-export const generateStaticParams = async () => {
-  return validStatuses.map((status) => ({ status }));
-};
-
-export default WithLayout({ getLayout: null, getData, Page })<"P">;
-
-export const dynamic = "force-static";

apps/web/app/future/org/[orgSlug]/[user]/[type]/embed/page.tsx

@@ -1,12 +1,9 @@
-import { type PageProps } from "@pages/org/[orgSlug]/[user]/[type]";
-import Page from "@pages/org/[orgSlug]/[user]/[type]/embed";
-import { withAppDirSsr } from "app/WithAppDirSsr";
 import withEmbedSsrAppDir from "app/WithEmbedSSR";
 import { WithLayout } from "app/layoutHOC";
+import { Page, type OrgTypePageProps } from "app/org/[orgSlug]/[user]/[type]/page";
 
 import { getServerSideProps } from "@lib/org/[orgSlug]/[user]/[type]/getServerSideProps";
 
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
-const getEmbedData = withEmbedSsrAppDir(getData);
+const getEmbedData = withEmbedSsrAppDir<OrgTypePageProps>(getServerSideProps);
 
-export default WithLayout({ getLayout: null, getData: getEmbedData, isBookingPage: true, Page });
+export default WithLayout({ getLayout: null, getData: getEmbedData, isBookingPage: true, ServerPage: Page });

apps/web/app/future/org/[orgSlug]/[user]/[type]/page.tsx

@@ -1,9 +0,0 @@
-import Page, { type PageProps } from "@pages/org/[orgSlug]/[user]/[type]";
-import { withAppDirSsr } from "app/WithAppDirSsr";
-import { WithLayout } from "app/layoutHOC";
-
-import { getServerSideProps } from "@lib/org/[orgSlug]/[user]/[type]/getServerSideProps";
-
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
-
-export default WithLayout({ getLayout: null, getData, Page });

apps/web/app/future/org/[orgSlug]/[user]/embed/page.tsx

@@ -1,11 +1,9 @@
-import { getServerSideProps, type PageProps } from "@pages/org/[orgSlug]/[user]";
-import Page from "@pages/org/[orgSlug]/[user]/embed";
-import { withAppDirSsr } from "app/WithAppDirSsr";
 import withEmbedSsrAppDir from "app/WithEmbedSSR";
 import { WithLayout } from "app/layoutHOC";
+import { Page, type OrgPageProps } from "app/org/[orgSlug]/[user]/page";
 
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
+import { getServerSideProps } from "@lib/org/[orgSlug]/[user]/getServerSideProps";
 
-const getEmbedData = withEmbedSsrAppDir(getData);
+const getEmbedData = withEmbedSsrAppDir<OrgPageProps>(getServerSideProps);
 
-export default WithLayout({ getLayout: null, getData: getEmbedData, isBookingPage: true, Page });
+export default WithLayout({ getLayout: null, getData: getEmbedData, isBookingPage: true, ServerPage: Page });

apps/web/app/future/org/[orgSlug]/[user]/page.tsx

@@ -1,7 +0,0 @@
-import Page, { getServerSideProps, type PageProps } from "@pages/org/[orgSlug]/[user]";
-import { withAppDirSsr } from "app/WithAppDirSsr";
-import { WithLayout } from "app/layoutHOC";
-
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
-
-export default WithLayout({ getLayout: null, getData, Page });

apps/web/app/future/org/[orgSlug]/embed/page.tsx

@@ -1,28 +1,12 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
 import withEmbedSsrAppDir from "app/WithEmbedSSR";
-import type { PageProps as _PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
-import { cookies, headers } from "next/headers";
 
-import { buildLegacyCtx } from "@lib/buildLegacyCtx";
 import { getServerSideProps } from "@lib/team/[slug]/getServerSideProps";
 
 import type { PageProps } from "~/team/team-view";
 import TeamPage from "~/team/team-view";
 
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
-
-export const generateMetadata = async ({ params, searchParams }: _PageProps) => {
-  const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
-
-  return await _generateMetadata(
-    (t) => props.team.name || t("nameless_team"),
-    (t) => props.team.name || t("nameless_team")
-  );
-};
-
-const getEmbedData = withEmbedSsrAppDir(getData);
+const getEmbedData = withEmbedSsrAppDir<PageProps>(getServerSideProps);
 
 export default WithLayout({
   Page: TeamPage,

apps/web/app/future/org/[orgSlug]/page.tsx

@@ -1,29 +0,0 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
-import type { PageProps as _PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-import { cookies, headers } from "next/headers";
-
-import { buildLegacyCtx } from "@lib/buildLegacyCtx";
-import { getServerSideProps } from "@lib/team/[slug]/getServerSideProps";
-
-import type { PageProps } from "~/team/team-view";
-import TeamPage from "~/team/team-view";
-
-export const generateMetadata = async ({ params, searchParams }: _PageProps) => {
-  const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
-
-  return await _generateMetadata(
-    (t) => props.team.name || t("nameless_team"),
-    (t) => props.team.name || t("nameless_team")
-  );
-};
-
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
-
-export default WithLayout({
-  Page: TeamPage,
-  getData,
-  getLayout: null,
-  isBookingPage: true,
-})<"P">;

apps/web/app/future/org/[orgSlug]/team/[slug]/[type]/page.tsx

@@ -1,45 +0,0 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
-import type { PageProps as _PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-import { cookies, headers } from "next/headers";
-
-import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
-import { EventRepository } from "@calcom/lib/server/repository/event";
-
-import { buildLegacyCtx } from "@lib/buildLegacyCtx";
-import { getServerSideProps } from "@lib/team/[slug]/[type]/getServerSideProps";
-
-import type { PageProps } from "~/team/type-view";
-import TypePage from "~/team/type-view";
-
-export const generateMetadata = async ({ params, searchParams }: _PageProps) => {
-  const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams);
-  const props = await getData(legacyCtx);
-  const { user: username, slug: eventSlug, booking } = props;
-  const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(legacyCtx.req, legacyCtx.params?.orgSlug);
-
-  const event = await EventRepository.getPublicEvent({
-    username,
-    eventSlug,
-    isTeamEvent: true,
-    org: isValidOrgDomain ? currentOrgDomain : null,
-    fromRedirectOfNonOrgLink: legacyCtx.query.orgRedirection === "true",
-  });
-
-  const profileName = event?.profile?.name ?? "";
-  const title = event?.title ?? "";
-
-  return await _generateMetadata(
-    (t) => `${booking?.uid && !!booking ? t("reschedule") : ""} ${title} | ${profileName}`,
-    (t) => `${booking?.uid ? t("reschedule") : ""} ${title}`
-  );
-};
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
-
-export default WithLayout({
-  Page: TypePage,
-  getData,
-  getLayout: null,
-  isBookingPage: true,
-})<"P">;

apps/web/app/future/org/[orgSlug]/team/[slug]/page.tsx

@@ -1,29 +0,0 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
-import type { PageProps as _PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
-import { WithLayout } from "app/layoutHOC";
-import { cookies, headers } from "next/headers";
-
-import { buildLegacyCtx } from "@lib/buildLegacyCtx";
-import { getServerSideProps } from "@lib/team/[slug]/getServerSideProps";
-
-import type { PageProps } from "~/team/team-view";
-import TeamPage from "~/team/team-view";
-
-export const generateMetadata = async ({ params, searchParams }: _PageProps) => {
-  const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
-
-  return await _generateMetadata(
-    (t) => props.team.name || t("nameless_team"),
-    (t) => props.team.name || t("nameless_team")
-  );
-};
-
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
-
-export default WithLayout({
-  Page: TeamPage,
-  getData,
-  getLayout: null,
-  isBookingPage: true,
-})<"P">;

apps/web/app/future/team/[slug]/[type]/embed/page.tsx

@@ -1,43 +1,11 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
 import withEmbedSsrAppDir from "app/WithEmbedSSR";
-import type { PageProps as _PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
-import { cookies, headers } from "next/headers";
 
-import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
-import { EventRepository } from "@calcom/lib/server/repository/event";
-
-import { buildLegacyCtx } from "@lib/buildLegacyCtx";
 import { getServerSideProps } from "@lib/team/[slug]/[type]/getServerSideProps";
 
 import type { PageProps } from "~/team/type-view";
 import LegacyPage from "~/team/type-view";
 
-export const generateMetadata = async ({ params, searchParams }: _PageProps) => {
-  const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams);
-  const props = await getData(legacyCtx);
-  const { user: username, slug: eventSlug, booking } = props;
-  const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(legacyCtx.req, legacyCtx.params?.orgSlug);
-
-  const event = await EventRepository.getPublicEvent({
-    username,
-    eventSlug,
-    isTeamEvent: true,
-    org: isValidOrgDomain ? currentOrgDomain : null,
-    fromRedirectOfNonOrgLink: legacyCtx.query.orgRedirection === "true",
-  });
-
-  const profileName = event?.profile?.name ?? "";
-  const title = event?.title ?? "";
-
-  return await _generateMetadata(
-    (t) => `${booking?.uid && !!booking ? t("reschedule") : ""} ${title} | ${profileName}`,
-    (t) => `${booking?.uid ? t("reschedule") : ""} ${title}`
-  );
-};
-
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
-const getEmbedData = withEmbedSsrAppDir(getData);
+const getEmbedData = withEmbedSsrAppDir<PageProps>(getServerSideProps);
 
 export default WithLayout({ getLayout: null, getData: getEmbedData, Page: LegacyPage })<"P">;

apps/web/app/future/team/[slug]/embed/page.tsx

@@ -1,26 +1,11 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
 import withEmbedSsrAppDir from "app/WithEmbedSSR";
-import type { PageProps as _PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
-import { cookies, headers } from "next/headers";
 
-import { buildLegacyCtx } from "@lib/buildLegacyCtx";
 import { getServerSideProps } from "@lib/team/[slug]/getServerSideProps";
 
 import type { PageProps } from "~/team/team-view";
 import LegacyPage from "~/team/team-view";
 
-export const generateMetadata = async ({ params, searchParams }: _PageProps) => {
-  const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
-
-  return await _generateMetadata(
-    (t) => props.team.name || t("nameless_team"),
-    (t) => props.team.name || t("nameless_team")
-  );
-};
-
-const getData = withAppDirSsr<PageProps>(getServerSideProps);
-const getEmbedData = withEmbedSsrAppDir(getData);
+const getEmbedData = withEmbedSsrAppDir<PageProps>(getServerSideProps);
 
 export default WithLayout({ getLayout: null, getData: getEmbedData, Page: LegacyPage })<"P">;

apps/web/app/generateBookingPageMetadata.ts

@@ -0,0 +1,151 @@
+import type { TFunction } from "next-i18next";
+
+import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";
+
+import { generateMeetingMetadata } from "./_utils";
+
+type MetadataPayload = {
+  title: (t: TFunction) => string;
+  description: (t: TFunction) => string;
+  meeting: {
+    title: string;
+    profile: { name: string; image: string };
+    users?: { name: string; username: string }[];
+  };
+  robots: {
+    index: boolean;
+    follow: boolean;
+  };
+};
+
+type UserProfilePageProfile = {
+  name: string | null;
+  username: string | null;
+  image: string | null;
+  markdownStrippedBio: string | null | undefined;
+};
+
+type TeamProfilePageProfile = {
+  teamName: string | null;
+  image: string | null;
+  markdownStrippedBio: string | null | undefined;
+};
+
+type EventBookingPageProfile = { name: string; image: string };
+type BaseMetadataArgs = {
+  hideBranding: boolean;
+  orgSlug: string | null;
+  isSEOIndexable: boolean;
+  isReschedule?: boolean;
+};
+
+type TeamProfilePageArgs = BaseMetadataArgs & {
+  profile: TeamProfilePageProfile;
+  event: null;
+};
+
+type UserProfilePageArgs = BaseMetadataArgs & {
+  profile: UserProfilePageProfile;
+  event: null;
+};
+
+type EventBookingPageArgs = BaseMetadataArgs & {
+  profile: EventBookingPageProfile;
+  event: {
+    title: string;
+    hidden: boolean;
+    users: { name: string | null; username: string | null }[];
+  };
+};
+
+export const generateEventBookingPageMetadata = async (props: EventBookingPageArgs) => {
+  const { profile, isReschedule, hideBranding, orgSlug, isSEOIndexable, event } = props;
+  const fullOrigin = getOrgFullOrigin(orgSlug);
+
+  const payload: MetadataPayload = {
+    title: (t) => `${isReschedule ? t("reschedule") : ""} ${event.title} | ${profile.name}`,
+    description: (t) => `${isReschedule ? t("reschedule") : ""} ${event.title}`,
+    meeting: {
+      title: event.title,
+      profile: { name: profile.name, image: profile.image },
+      users: event.users.map((user) => ({
+        name: `${user.name}`,
+        username: `${user.username}`,
+      })),
+    },
+    robots: {
+      index: !(event.hidden || !isSEOIndexable),
+      follow: !(event.hidden || !isSEOIndexable),
+    },
+  };
+
+  return {
+    ...(await generateMeetingMetadata(
+      payload.meeting,
+      payload.title,
+      payload.description,
+      hideBranding,
+      fullOrigin
+    )),
+    robots: payload.robots,
+  };
+};
+
+export const generateUserProfilePageMetadata = async (props: UserProfilePageArgs) => {
+  const { profile, hideBranding, orgSlug, isSEOIndexable } = props;
+  const fullOrigin = getOrgFullOrigin(orgSlug);
+
+  const payload: MetadataPayload = {
+    title: () => profile.name ?? "",
+    description: () => profile.markdownStrippedBio ?? "",
+    meeting: {
+      title: profile.markdownStrippedBio ?? "",
+      profile: { name: profile.name ?? "", image: profile.image ?? "" },
+      users: [{ name: profile.name ?? "", username: profile.username ?? "" }],
+    },
+    robots: {
+      index: isSEOIndexable,
+      follow: isSEOIndexable,
+    },
+  };
+
+  return {
+    ...(await generateMeetingMetadata(
+      payload.meeting,
+      payload.title,
+      payload.description,
+      hideBranding,
+      fullOrigin
+    )),
+    robots: payload.robots,
+  };
+};
+
+export const generateTeamProfilePageMetadata = async (props: TeamProfilePageArgs) => {
+  const { profile, hideBranding, orgSlug, isSEOIndexable } = props;
+  const fullOrigin = getOrgFullOrigin(orgSlug);
+
+  const payload: MetadataPayload = {
+    title: (t) => profile.teamName || t("nameless_team"),
+    description: () => profile.markdownStrippedBio ?? "",
+    meeting: {
+      title: profile.markdownStrippedBio ?? "",
+      profile: { name: `${profile.teamName}`, image: profile.image ?? "" },
+    },
+    robots: {
+      index: isSEOIndexable,
+      follow: isSEOIndexable,
+    },
+  };
+
+  return {
+    ...(await generateMeetingMetadata(
+      payload.meeting,
+      payload.title,
+      payload.description,
+      hideBranding,
+      fullOrigin
+    )),
+    robots: payload.robots,
+  };
+};

apps/web/app/icons/IconGrid.tsx

@@ -0,0 +1,25 @@
+"use client";
+
+import { Icon } from "@calcom/ui";
+import type { IconName } from "@calcom/ui";
+
+export const IconGrid = (props: {
+  title: string;
+  icons: IconName[];
+  rootClassName?: string;
+  iconClassName?: string;
+}) => (
+  <div className={props.rootClassName}>
+    <h2 className="font-cal mt-6 text-lg font-medium">{props.title}</h2>
+    <div className="grid grid-cols-2 lg:grid-cols-6">
+      {props.icons.map((icon) => {
+        return (
+          <div key={icon} className="flex items-center gap-1">
+            <Icon name={icon} className={props.iconClassName} />
+            <div>{icon}</div>
+          </div>
+        );
+      })}
+    </div>
+  </div>
+);

apps/web/app/icons/page.tsx

@@ -0,0 +1,46 @@
+import { _generateMetadata, getTranslate } from "app/_utils";
+import { Inter } from "next/font/google";
+import localFont from "next/font/local";
+
+import { type IconName, IconSprites } from "@calcom/ui";
+
+import { lucideIconList } from "../../../../packages/ui/components/icon/icon-list.mjs";
+import { IconGrid } from "./IconGrid";
+
+const interFont = Inter({ subsets: ["latin"], variable: "--font-inter", preload: true, display: "swap" });
+const calFont = localFont({
+  src: "../../fonts/CalSans-SemiBold.woff2",
+  variable: "--font-cal",
+  preload: true,
+  display: "swap",
+  weight: "600",
+});
+export const generateMetadata = async () => {
+  return await _generateMetadata(
+    (t) => t("icon_showcase"),
+    () => ""
+  );
+};
+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>
+          <IconGrid title="Regular Icons" icons={icons} />
+          <IconGrid
+            title="Filled Icons"
+            icons={icons}
+            rootClassName="bg-darkgray-100 text-gray-50"
+            iconClassName="fill-blue-500"
+          />
+        </div>
+      </div>
+    </div>
+  );
+}
+export const dynamic = "force-static";

apps/web/app/insights/virtual-queues/page.tsx

@@ -0,0 +1,17 @@
+import { withAppDirSsr } from "app/WithAppDirSsr";
+import { _generateMetadata } from "app/_utils";
+import { WithLayout } from "app/layoutHOC";
+
+import { getServerSideProps } from "@lib/insights/getServerSideProps";
+
+import InsightsVirtualQueuesPage from "~/insights/insights-virtual-queues-view";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("insights"),
+    (t) => t("insights_subtitle")
+  );
+
+const getData = withAppDirSsr(getServerSideProps);
+
+export default WithLayout({ getLayout: null, getData, Page: InsightsVirtualQueuesPage });

apps/web/app/layout.tsx

@@ -21,20 +21,15 @@ const calFont = localFont({
   weight: "600",
 });
 
-export const generateMetadata = () =>
-  prepareRootMetadata({
-    twitterCreator: "@calcom",
-    twitterSite: "@calcom",
-    robots: {
-      index: false,
-      follow: false,
-    },
-  });
+export const generateMetadata = () => prepareRootMetadata();
 
 const getInitialProps = async (url: string) => {
   const { pathname, searchParams } = new URL(url);
 
-  const isEmbed = pathname.endsWith("/embed") || (searchParams?.get("embedType") ?? null) !== null;
+  const isEmbedSnippetGeneratorPath = pathname.startsWith("/event-types");
+  const isEmbed =
+    (pathname.endsWith("/embed") || (searchParams?.get("embedType") ?? null) !== null) &&
+    !isEmbedSnippetGeneratorPath;
   const embedColorScheme = searchParams?.get("ui.color-scheme");
 
   const req = { headers: headers(), cookies: cookies() };
@@ -84,6 +79,7 @@ export default async function RootLayout({ children }: { children: React.ReactNo
         <script
           nonce={nonce}
           id="headScript"
+          // eslint-disable-next-line react/no-danger
           dangerouslySetInnerHTML={{
             __html: `
               window.calNewLocale = "${locale}";

apps/web/app/org/[orgSlug]/[user]/[type]/page.tsx

@@ -0,0 +1,54 @@
+import { withAppDirSsr } from "app/WithAppDirSsr";
+import type { PageProps } from "app/_types";
+import { generateEventBookingPageMetadata } from "app/generateBookingPageMetadata";
+import { WithLayout } from "app/layoutHOC";
+import { cookies, headers } from "next/headers";
+
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+import { getServerSideProps } from "@lib/org/[orgSlug]/[user]/[type]/getServerSideProps";
+
+import type { PageProps as TeamTypePageProps } from "~/team/type-view";
+import TeamTypePage from "~/team/type-view";
+import UserTypePage from "~/users/views/users-type-public-view";
+import type { PageProps as UserTypePageProps } from "~/users/views/users-type-public-view";
+
+export type OrgTypePageProps = UserTypePageProps | TeamTypePageProps;
+const getData = withAppDirSsr<OrgTypePageProps>(getServerSideProps);
+
+export const generateMetadata = async ({ params, searchParams }: PageProps) => {
+  const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams);
+  const props = await getData(legacyCtx);
+
+  const { booking, isSEOIndexable, eventData, isBrandingHidden } = props;
+  const rescheduleUid = booking?.uid;
+
+  const profileName = eventData?.profile?.name ?? "";
+  const profileImage = eventData?.profile.image ?? "";
+
+  return await generateEventBookingPageMetadata({
+    profile: { name: profileName, image: profileImage },
+    event: {
+      title: eventData?.title ?? "",
+      hidden: eventData?.hidden ?? false,
+      users: [
+        ...(eventData?.users || []).map((user) => ({
+          name: `${user.name}`,
+          username: `${user.username}`,
+        })),
+      ],
+    },
+    hideBranding: isBrandingHidden,
+    orgSlug: eventData?.entity.orgSlug ?? null,
+    isSEOIndexable: !!isSEOIndexable,
+    isReschedule: !!rescheduleUid,
+  });
+};
+
+export const Page = async (props: OrgTypePageProps) => {
+  if ((props as TeamTypePageProps)?.teamId) {
+    return <TeamTypePage {...(props as TeamTypePageProps)} />;
+  }
+  return <UserTypePage {...(props as UserTypePageProps)} />;
+};
+
+export default WithLayout({ getLayout: null, getData, ServerPage: Page, isBookingPage: true });

apps/web/app/org/[orgSlug]/[user]/page.tsx

@@ -0,0 +1,64 @@
+import { withAppDirSsr } from "app/WithAppDirSsr";
+import type { PageProps } from "app/_types";
+import {
+  generateTeamProfilePageMetadata,
+  generateUserProfilePageMetadata,
+} from "app/generateBookingPageMetadata";
+import { WithLayout } from "app/layoutHOC";
+import { cookies, headers } from "next/headers";
+
+import { getOrgOrTeamAvatar } from "@calcom/lib/defaultAvatarImage";
+
+import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+import { getServerSideProps } from "@lib/org/[orgSlug]/[user]/getServerSideProps";
+
+import type { PageProps as TeamPageProps } from "~/team/team-view";
+import TeamPage from "~/team/team-view";
+import UserPage from "~/users/views/users-public-view";
+import type { PageProps as UserPageProps } from "~/users/views/users-public-view";
+
+export type OrgPageProps = UserPageProps | TeamPageProps;
+const getData = withAppDirSsr<OrgPageProps>(getServerSideProps);
+
+export const generateMetadata = async ({ params, searchParams }: PageProps) => {
+  const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams);
+  const props = await getData(legacyCtx);
+
+  if ((props as TeamPageProps)?.team) {
+    const { team, markdownStrippedBio, isSEOIndexable, currentOrgDomain } = props as TeamPageProps;
+    return await generateTeamProfilePageMetadata({
+      profile: {
+        teamName: team.name,
+        image: getOrgOrTeamAvatar(team),
+        markdownStrippedBio: markdownStrippedBio,
+      },
+      event: null,
+      hideBranding: false,
+      orgSlug: currentOrgDomain ?? null,
+      isSEOIndexable: !!isSEOIndexable,
+    });
+  } else {
+    const { profile, markdownStrippedBio, isOrgSEOIndexable, entity } = props as UserPageProps;
+
+    const isOrg = !!profile?.organization;
+    const allowSEOIndexing =
+      (!isOrg && profile.allowSEOIndexing) || (isOrg && isOrgSEOIndexable && profile.allowSEOIndexing);
+
+    return await generateUserProfilePageMetadata({
+      profile: { name: profile.name, username: profile.username, image: profile.image, markdownStrippedBio },
+      hideBranding: false,
+      orgSlug: entity.orgSlug ?? null,
+      isSEOIndexable: !!allowSEOIndexing,
+      event: null,
+    });
+  }
+};
+
+export const Page = async (props: OrgPageProps) => {
+  if ((props as TeamPageProps)?.team) {
+    return <TeamPage {...(props as TeamPageProps)} />;
+  }
+  return <UserPage {...(props as UserPageProps)} />;
+};
+
+export default WithLayout({ getLayout: null, getData, ServerPage: Page, isBookingPage: true });

apps/web/app/org/[orgSlug]/instant-meeting/team/[slug]/[type]/page.tsx

@@ -4,7 +4,6 @@ import { _generateMetadata } from "app/_utils";
 import { WithLayout } from "app/layoutHOC";
 import { headers, cookies } from "next/headers";
 
-import { getLayout } from "@calcom/features/MainLayoutAppDir";
 import { orgDomainConfig } from "@calcom/features/ee/organizations/lib/orgDomains";
 import { EventRepository } from "@calcom/lib/server/repository/event";
 
@@ -16,7 +15,7 @@ import Page from "~/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-mee
 
 export const generateMetadata = async ({ params, searchParams }: _PageProps) => {
   const context = buildLegacyCtx(headers(), cookies(), params, searchParams);
-  const { slug: eventSlug, user: username } = await getData(context);
+  const { slug: eventSlug, user: username, isBrandingHidden } = await getData(context);
   const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(context.req, context.params?.orgSlug);
 
   const org = isValidOrgDomain ? currentOrgDomain : null;
@@ -34,9 +33,10 @@ export const generateMetadata = async ({ params, searchParams }: _PageProps) =>
 
   return await _generateMetadata(
     () => `${title} | ${profileName}`,
-    () => `${title}`
+    () => `${title}`,
+    isBrandingHidden
   );
 };
 
 const getData = withAppDirSsr<PageProps>(getServerSideProps);
-export default WithLayout({ getLayout, getData, Page })<"P">;
+export default WithLayout({ getData, Page, isBookingPage: true })<"P">;

apps/web/app/org/[orgSlug]/page.tsx

@@ -0,0 +1 @@
+export { default, generateMetadata } from "app/team/[slug]/page";

apps/web/app/org/[orgSlug]/team/[slug]/[type]/page.tsx

@@ -0,0 +1 @@
+export { default, generateMetadata } from "app/team/[slug]/[type]/page";

apps/web/app/org/[orgSlug]/team/[slug]/page.tsx

@@ -0,0 +1 @@
+export { default, generateMetadata } from "app/team/[slug]/page";

apps/web/app/reschedule/[uid]/embed/page.tsx

@@ -1,4 +1,3 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
 import withEmbedSsrAppDir from "app/WithEmbedSSR";
 import type { PageProps } from "app/_types";
 import { cookies, headers } from "next/headers";
@@ -6,8 +5,7 @@ import { cookies, headers } from "next/headers";
 import { buildLegacyCtx } from "@lib/buildLegacyCtx";
 import { getServerSideProps } from "@lib/reschedule/[uid]/getServerSideProps";
 
-const getData = withAppDirSsr(getServerSideProps);
-const getEmbedData = withEmbedSsrAppDir(getData);
+const getEmbedData = withEmbedSsrAppDir(getServerSideProps);
 
 const Page = async ({ params, searchParams }: PageProps) => {
   const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams);

apps/web/app/team/[slug]/[type]/page.tsx

@@ -1,6 +1,6 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
 import type { PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
+import { generateEventBookingPageMetadata } from "app/generateBookingPageMetadata";
 import { WithLayout } from "app/layoutHOC";
 import { cookies, headers } from "next/headers";
 
@@ -15,7 +15,7 @@ import LegacyPage, { type PageProps as LegacyPageProps } from "~/team/type-view"
 export const generateMetadata = async ({ params, searchParams }: PageProps) => {
   const legacyCtx = buildLegacyCtx(headers(), cookies(), params, searchParams);
   const props = await getData(legacyCtx);
-  const { user: username, slug: eventSlug, booking } = props;
+  const { user: username, slug: eventSlug, booking, isSEOIndexable, eventData, isBrandingHidden } = props;
   const { currentOrgDomain, isValidOrgDomain } = orgDomainConfig(legacyCtx.req, legacyCtx.params?.orgSlug);
 
   const event = await EventRepository.getPublicEvent({
@@ -26,13 +26,26 @@ export const generateMetadata = async ({ params, searchParams }: PageProps) => {
     fromRedirectOfNonOrgLink: legacyCtx.query.orgRedirection === "true",
   });
 
-  const profileName = event?.profile?.name ?? "";
-  const title = event?.title ?? "";
-
-  return await _generateMetadata(
-    (t) => `${booking?.uid && !!booking ? t("reschedule") : ""} ${title} | ${profileName}`,
-    (t) => `${booking?.uid ? t("reschedule") : ""} ${title}`
-  );
+  return await generateEventBookingPageMetadata({
+    profile: {
+      name: event?.profile?.name ?? "",
+      image: event?.profile.image ?? "",
+    },
+    event: {
+      title: event?.title ?? "",
+      hidden: event?.hidden ?? false,
+      users: [
+        ...(event?.users || []).map((user) => ({
+          name: `${user.name}`,
+          username: `${user.username}`,
+        })),
+      ],
+    },
+    hideBranding: isBrandingHidden,
+    orgSlug: eventData?.entity.orgSlug ?? null,
+    isSEOIndexable,
+    isReschedule: !!booking,
+  });
 };
 const getData = withAppDirSsr<LegacyPageProps>(getServerSideProps);
 

apps/web/app/team/[slug]/page.tsx

@@ -1,9 +1,11 @@
 import { withAppDirSsr } from "app/WithAppDirSsr";
 import type { PageProps as _PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
+import { generateTeamProfilePageMetadata } from "app/generateBookingPageMetadata";
 import { WithLayout } from "app/layoutHOC";
 import { cookies, headers } from "next/headers";
 
+import { getOrgOrTeamAvatar } from "@calcom/lib/defaultAvatarImage";
+
 import { buildLegacyCtx } from "@lib/buildLegacyCtx";
 import { getServerSideProps } from "@lib/team/[slug]/getServerSideProps";
 
@@ -11,12 +13,21 @@ import type { PageProps } from "~/team/team-view";
 import LegacyPage from "~/team/team-view";
 
 export const generateMetadata = async ({ params, searchParams }: _PageProps) => {
-  const props = await getData(buildLegacyCtx(headers(), cookies(), params, searchParams));
-
-  return await _generateMetadata(
-    (t) => props.team.name || t("nameless_team"),
-    (t) => props.team.name || t("nameless_team")
+  const { team, markdownStrippedBio, isSEOIndexable, currentOrgDomain } = await getData(
+    buildLegacyCtx(headers(), cookies(), params, searchParams)
   );
+
+  return await generateTeamProfilePageMetadata({
+    profile: {
+      teamName: team.name,
+      image: getOrgOrTeamAvatar(team),
+      markdownStrippedBio: markdownStrippedBio,
+    },
+    event: null,
+    hideBranding: false,
+    orgSlug: currentOrgDomain ?? null,
+    isSEOIndexable: !!isSEOIndexable,
+  });
 };
 
 const getData = withAppDirSsr<PageProps>(getServerSideProps);
@@ -25,4 +36,5 @@ export default WithLayout({
   Page: LegacyPage,
   getData,
   getLayout: null,
+  isBookingPage: true,
 })<"P">;

apps/web/components/booking/BookingListItem.tsx

@@ -11,7 +11,7 @@ import "@calcom/dayjs/locales";
 import ViewRecordingsDialog from "@calcom/features/ee/video/ViewRecordingsDialog";
 import classNames from "@calcom/lib/classNames";
 import { formatTime } from "@calcom/lib/date-fns";
-import getPaymentAppData from "@calcom/lib/getPaymentAppData";
+import { getPaymentAppData } from "@calcom/lib/getPaymentAppData";
 import { useCopy } from "@calcom/lib/hooks/useCopy";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { useGetTheme } from "@calcom/lib/hooks/useTheme";

apps/web/lib/app-providers-app-dir.tsx

@@ -17,12 +17,12 @@ import CacheProvider from "react-inlinesvg/provider";
 import DynamicPostHogProvider from "@calcom/features/ee/event-tracking/lib/posthog/providerDynamic";
 import { OrgBrandingProvider } from "@calcom/features/ee/organizations/context/provider";
 import DynamicHelpscoutProvider from "@calcom/features/ee/support/lib/helpscout/providerDynamic";
-import DynamicIntercomProvider from "@calcom/features/ee/support/lib/intercom/providerDynamic";
 import { FeatureProvider } from "@calcom/features/flags/context/provider";
 import { useFlags } from "@calcom/features/flags/hooks";
 import { MetaProvider } from "@calcom/ui";
 
 import useIsBookingPage from "@lib/hooks/useIsBookingPage";
+import PlainChat from "@lib/plain/plainChat";
 import type { WithLocaleProps } from "@lib/withLocale";
 import type { WithNonceProps } from "@lib/withNonce";
 
@@ -265,9 +265,11 @@ function OrgBrandProvider({ children }: { children: React.ReactNode }) {
 const AppProviders = (props: PageWrapperProps) => {
   // No need to have intercom on public pages - Good for Page Performance
   const isBookingPage = useIsBookingPage();
+
   const RemainingProviders = (
     <EventCollectionProvider options={{ apiPath: "/api/collect-events" }}>
       <SessionProvider>
+        <PlainChat />
         <CustomI18nextProvider i18n={props.i18n}>
           <TooltipProvider>
             {/* color-scheme makes background:transparent not work which is required by embed. We need to ensure next-theme adds color-scheme to `body` instead of `html`(https://github.com/pacocoursey/next-themes/blob/main/src/index.tsx#L74). Once that's done we can enable color-scheme support */}
@@ -301,11 +303,11 @@ const AppProviders = (props: PageWrapperProps) => {
   }
 
   return (
-    <DynamicHelpscoutProvider>
-      <DynamicIntercomProvider>
+    <>
+      <DynamicHelpscoutProvider>
         <DynamicPostHogProvider>{Hydrated}</DynamicPostHogProvider>
-      </DynamicIntercomProvider>
-    </DynamicHelpscoutProvider>
+      </DynamicHelpscoutProvider>
+    </>
   );
 };
 

apps/web/lib/app-providers.tsx

@@ -16,12 +16,12 @@ import CacheProvider from "react-inlinesvg/provider";
 import DynamicPostHogProvider from "@calcom/features/ee/event-tracking/lib/posthog/providerDynamic";
 import { OrgBrandingProvider } from "@calcom/features/ee/organizations/context/provider";
 import DynamicHelpscoutProvider from "@calcom/features/ee/support/lib/helpscout/providerDynamic";
-import DynamicIntercomProvider from "@calcom/features/ee/support/lib/intercom/providerDynamic";
 import { FeatureProvider } from "@calcom/features/flags/context/provider";
 import { useFlags } from "@calcom/features/flags/hooks";
 import { MetaProvider } from "@calcom/ui";
 
 import useIsBookingPage from "@lib/hooks/useIsBookingPage";
+import PlainChat from "@lib/plain/plainChat";
 import type { WithLocaleProps } from "@lib/withLocale";
 import type { WithNonceProps } from "@lib/withNonce";
 
@@ -282,7 +282,6 @@ function OrgBrandProvider({ children }: { children: React.ReactNode }) {
 }
 
 const AppProviders = (props: AppPropsWithChildren) => {
-  // No need to have intercom on public pages - Good for Page Performance
   const isBookingPage = useIsBookingPage();
   const { pageProps, ...rest } = props;
 
@@ -298,9 +297,9 @@ const AppProviders = (props: AppPropsWithChildren) => {
   const RemainingProviders = (
     <EventCollectionProvider options={{ apiPath: "/api/collect-events" }}>
       <SessionProvider session={pageProps.session ?? undefined}>
+        <PlainChat />
         <CustomI18nextProvider {...propsWithoutNonce}>
           <TooltipProvider>
-            {/* color-scheme makes background:transparent not work which is required by embed. We need to ensure next-theme adds color-scheme to `body` instead of `html`(https://github.com/pacocoursey/next-themes/blob/main/src/index.tsx#L74). Once that's done we can enable color-scheme support */}
             <CalcomThemeProvider
               themeBasis={props.pageProps.themeBasis}
               nonce={props.pageProps.nonce}
@@ -327,14 +326,14 @@ const AppProviders = (props: AppPropsWithChildren) => {
   }
 
   return (
-    <DynamicHelpscoutProvider>
-      <DynamicIntercomProvider>
+    <>
+      <DynamicHelpscoutProvider>
         <DynamicPostHogProvider>
           <PostHogPageView />
           {RemainingProviders}
         </DynamicPostHogProvider>
-      </DynamicIntercomProvider>
-    </DynamicHelpscoutProvider>
+      </DynamicHelpscoutProvider>
+    </>
   );
 };
 

apps/web/lib/d/[link]/[slug]/getServerSideProps.tsx

@@ -1,3 +1,4 @@
+import type { EmbedProps } from "app/WithEmbedSSR";
 import type { GetServerSidePropsContext } from "next";
 import { z } from "zod";
 
@@ -12,7 +13,6 @@ import { RedirectType } from "@calcom/prisma/enums";
 
 import { getTemporaryOrgRedirect } from "@lib/getTemporaryOrgRedirect";
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
-import type { EmbedProps } from "@lib/withEmbedSsr";
 
 export type PageProps = inferSSRProps<typeof getServerSideProps> & EmbedProps;
 

apps/web/lib/metadata.ts

@@ -1,14 +1,5 @@
 import type { Metadata } from "next";
 
-type RootMetadataRecipe = Readonly<{
-  twitterCreator: string;
-  twitterSite: string;
-  robots: {
-    index: boolean;
-    follow: boolean;
-  };
-}>;
-
 export type PageMetadataRecipe = Readonly<{
   title: string;
   canonical: string;
@@ -18,7 +9,7 @@ export type PageMetadataRecipe = Readonly<{
   metadataBase: URL;
 }>;
 
-export const prepareRootMetadata = (recipe: RootMetadataRecipe): Metadata => ({
+export const prepareRootMetadata = (): Metadata => ({
   icons: {
     icon: "/favicon.ico",
     apple: "/api/logo?type=apple-touch-icon",
@@ -48,7 +39,6 @@ export const prepareRootMetadata = (recipe: RootMetadataRecipe): Metadata => ({
     userScalable: false,
     viewportFit: "cover",
   },
-  robots: recipe.robots,
   other: {
     "application-TileColor": "#ff0000",
   },
@@ -63,8 +53,12 @@ export const prepareRootMetadata = (recipe: RootMetadataRecipe): Metadata => ({
     },
   ],
   twitter: {
-    site: recipe.twitterSite,
-    creator: recipe.twitterCreator,
+    site: "@calcom",
+    creator: "@calcom",
     card: "summary_large_image",
   },
+  robots: {
+    index: true,
+    follow: true,
+  },
 });

apps/web/lib/org/[orgSlug]/[user]/getServerSideProps.tsx

@@ -1,4 +1,3 @@
-import { getServerSideProps as GSSUserPage } from "@pages/[user]";
 import type { GetServerSidePropsContext } from "next";
 
 import { getSlugOrRequestedSlug } from "@calcom/features/ee/organizations/lib/orgDomains";
@@ -6,6 +5,8 @@ import prisma from "@calcom/prisma";
 
 import { getServerSideProps as GSSTeamPage } from "@lib/team/[slug]/getServerSideProps";
 
+import { getServerSideProps as GSSUserPage } from "@server/lib/[user]/getServerSideProps";
+
 export const getServerSideProps = async (ctx: GetServerSidePropsContext) => {
   const team = await prisma.team.findFirst({
     where: {

apps/web/lib/plain/plainChat.tsx

@@ -0,0 +1,286 @@
+"use client";
+
+import { useSession } from "next-auth/react";
+import { usePathname, useSearchParams } from "next/navigation";
+import Script from "next/script";
+import { useEffect, useState, useCallback, useMemo } from "react";
+
+declare global {
+  interface Window {
+    Plain?: {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      init: (config: any) => void;
+      open: () => void;
+    };
+    plainScriptLoaded?: () => void;
+    __PLAIN_CONFIG__?: PlainChatConfig;
+  }
+}
+
+interface PlainChatConfig {
+  appId: string;
+  customerDetails: {
+    email: string;
+    emailHash: string;
+    fullName: string;
+    shortName: string;
+    chatAvatarUrl: string;
+  };
+  links: Array<{
+    icon: string;
+    text: string;
+    url: string;
+  }>;
+  chatButtons: Array<{
+    icon: string;
+    text: string;
+    type: string;
+    form?: {
+      fields: Array<{
+        type: string;
+        placeholder: string;
+        options: Array<{
+          icon: string;
+          text: string;
+          threadDetails: {
+            severity: string;
+            labelTypeIds: Array<string>;
+            issueType: string;
+            priority: string;
+          };
+        }>;
+      }>;
+    };
+  }>;
+  entryPoint: {
+    type: string;
+  };
+  hideBranding: boolean;
+  theme: string;
+  style: {
+    brandColor: string;
+    launcherBackgroundColor: string;
+    launcherIconColor: string;
+  };
+  position: {
+    bottom: string;
+    right: string;
+  };
+}
+
+const PlainChat = () => {
+  const [config, setConfig] = useState<PlainChatConfig | null>(null);
+  const [isSmallScreen, setIsSmallScreen] = useState(false);
+  const { data: session } = useSession();
+  const pathname = usePathname();
+  const searchParams = useSearchParams();
+
+  const shouldOpenPlain = pathname === "/event-types" && searchParams?.has("openPlain");
+  const userEmail = session?.user?.email;
+
+  const isAppDomain = useMemo(() => {
+    const restrictedPathsSet = new Set(
+      (process.env.NEXT_PUBLIC_PLAIN_CHAT_EXCLUDED_PATHS?.split(",") || []).map((path) => path.trim())
+    );
+
+    const pathSegments = pathname?.split("/").filter(Boolean) || [];
+
+    return (
+      typeof window !== "undefined" &&
+      window.location.origin === process.env.NEXT_PUBLIC_WEBAPP_URL &&
+      !pathSegments.some((segment) => restrictedPathsSet.has(segment))
+    );
+  }, [pathname]);
+
+  const checkScreenSize = useCallback(() => {
+    if (typeof window === "undefined") return;
+
+    const isSmall = window.innerWidth < 768;
+    setIsSmallScreen(isSmall);
+
+    if (isSmall && window.Plain) {
+      const plainElement = document.querySelector("#plain-container");
+      plainElement?.remove();
+      window.Plain = undefined;
+    } else if (!isSmall && window.Plain === undefined) {
+      window.plainScriptLoaded?.();
+    }
+  }, []);
+
+  const initConfig = useCallback(async () => {
+    if (!userEmail) return;
+
+    try {
+      const response = await fetch("/api/plain-hash", {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+      });
+
+      if (!response.ok) {
+        const errorText = await response.text();
+        throw new Error(`Failed to generate hash: ${errorText}`);
+      }
+
+      const data = await response.json();
+
+      if (!data.hash || !data.email || !data.appId) {
+        throw new Error("Missing required fields in API response");
+      }
+
+      const plainChatConfig: PlainChatConfig = {
+        appId: data.appId,
+        customerDetails: {
+          email: data.email,
+          shortName: data.shortName,
+          fullName: data.fullName,
+          emailHash: data.hash,
+          chatAvatarUrl: data.chatAvatarUrl,
+        },
+        links: [
+          {
+            icon: "book",
+            text: "Documentation",
+            url: "https://cal.com/docs",
+          },
+          {
+            icon: "chat",
+            text: "Ask the community",
+            url: "https://github.com/calcom/cal.com/discussions",
+          },
+        ],
+        chatButtons: [
+          {
+            icon: "chat",
+            text: "Ask a question",
+            type: "primary",
+          },
+          {
+            icon: "bulb",
+            text: "Send feedback",
+            type: "default",
+          },
+          {
+            icon: "error",
+            text: "Report an issue",
+            type: "default",
+            form: {
+              fields: [
+                {
+                  type: "dropdown",
+                  placeholder: "Select severity...",
+                  options: [
+                    {
+                      icon: "support",
+                      text: "I'm unable to use the app",
+                      threadDetails: {
+                        severity: "critical",
+                        issueType: "critical",
+                        labelTypeIds: ["lt_01JFJWNWAC464N8DZ6YE71YJRF"],
+                        priority: "u",
+                      },
+                    },
+                    {
+                      icon: "error",
+                      text: "Major functionality degraded",
+                      threadDetails: {
+                        severity: "major",
+                        issueType: "major",
+                        labelTypeIds: ["lt_01JFJWP3KECF1YQES6XF212RFW"],
+                        priority: "h",
+                      },
+                    },
+                    {
+                      icon: "bug",
+                      text: "Minor annoyance",
+                      threadDetails: {
+                        severity: "minor",
+                        issueType: "minor",
+                        labelTypeIds: ["lt_01JFJWPC8ADW0PK28JHMJR6NSS"],
+                        priority: "l",
+                      },
+                    },
+                  ],
+                },
+              ],
+            },
+          },
+        ],
+        entryPoint: {
+          type: "chat",
+        },
+        hideBranding: true,
+        theme: "auto",
+        style: {
+          brandColor: "#FFFFFF",
+          launcherBackgroundColor: "#262626",
+          launcherIconColor: "#FFFFFF",
+        },
+        position: {
+          bottom: "20px",
+          right: "20px",
+        },
+      };
+
+      if (process.env.NODE_ENV === "development" || process.env.NODE_ENV === "test") {
+        window.__PLAIN_CONFIG__ = plainChatConfig;
+      }
+
+      setConfig(plainChatConfig);
+
+      if (shouldOpenPlain) {
+        const timer = setTimeout(() => {
+          if (window.Plain) {
+            window.Plain.open();
+          }
+        }, 100);
+        return () => clearTimeout(timer);
+      }
+    } catch (error) {
+      console.error("Failed to initialize Plain Chat:", error);
+    }
+  }, [userEmail, shouldOpenPlain]);
+
+  useEffect(() => {
+    if (!isAppDomain) return;
+
+    checkScreenSize();
+    window.addEventListener("resize", checkScreenSize);
+    initConfig();
+
+    return () => window.removeEventListener("resize", checkScreenSize);
+  }, [isAppDomain, checkScreenSize, initConfig, userEmail]);
+
+  const plainChatScript = `
+    window.plainScriptLoaded = function() {
+      if (window.Plain && ${Boolean(config)}) {
+        try {
+          Plain.init(${config ? JSON.stringify(config) : null});
+        } catch (error) {
+          console.error("Failed to initialize Plain:", error);
+        }
+      }
+    }
+  `;
+
+  if (!isAppDomain || isSmallScreen || !config || typeof window === "undefined") return null;
+
+  return (
+    <>
+      <Script
+        id="plain-chat"
+        src="https://chat.cdn-plain.com/index.js"
+        strategy="afterInteractive"
+        onLoad={() => window.plainScriptLoaded?.()}
+      />
+      <Script
+        id="plain-chat-init"
+        strategy="afterInteractive"
+        dangerouslySetInnerHTML={{ __html: plainChatScript }}
+      />
+    </>
+  );
+};
+
+export default PlainChat;

apps/web/lib/reschedule/[uid]/getServerSideProps.ts

@@ -4,6 +4,7 @@ import { URLSearchParams } from "url";
 import { z } from "zod";
 
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { getSafe } from "@calcom/lib/bookingSuccessRedirect";
 import { buildEventUrlFromBooking } from "@calcom/lib/bookings/buildEventUrlFromBooking";
 import { getDefaultEvent } from "@calcom/lib/defaultEvents";
 import { maybeGetBookingUidFromSeat } from "@calcom/lib/server/maybeGetBookingUidFromSeat";
@@ -35,10 +36,11 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
   } = querySchema.parse(context.query);
 
   const coepFlag = context.query["flag.coep"];
-  const { uid, seatReferenceUid: maybeSeatReferenceUid } = await maybeGetBookingUidFromSeat(
-    prisma,
-    bookingUid
-  );
+  const {
+    uid,
+    seatReferenceUid: maybeSeatReferenceUid,
+    bookingSeat,
+  } = await maybeGetBookingUidFromSeat(prisma, bookingUid);
 
   const booking = await prisma.booking.findUnique({
     where: {
@@ -46,6 +48,7 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
     },
     select: {
       ...bookingMinimalSelect,
+      responses: true,
       eventType: {
         select: {
           users: {
@@ -129,9 +132,18 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
 
   const isBookingInPast = booking.endTime && new Date(booking.endTime) < new Date();
   if (isBookingInPast) {
+    const destinationUrlSearchParams = new URLSearchParams();
+    const responses = bookingSeat ? getSafe<string>(bookingSeat.data, ["responses"]) : booking.responses;
+    const name = getSafe<string>(responses, ["name"]);
+    const email = getSafe<string>(responses, ["email"]);
+
+    if (name) destinationUrlSearchParams.set("name", name);
+    if (email) destinationUrlSearchParams.set("email", email);
+
+    const searchParamsString = destinationUrlSearchParams.toString();
     return {
       redirect: {
-        destination: eventUrl,
+        destination: searchParamsString ? `${eventUrl}?${searchParamsString}` : eventUrl,
         permanent: false,
       },
     };

apps/web/lib/team/[slug]/getServerSideProps.tsx

@@ -55,7 +55,6 @@ const getTheLastArrayElement = (value: ReadonlyArray<string> | string | undefine
 
 export const getServerSideProps = async (context: GetServerSidePropsContext) => {
   const slug = getTheLastArrayElement(context.query.slug) ?? getTheLastArrayElement(context.query.orgSlug);
-
   const { isValidOrgDomain, currentOrgDomain } = orgDomainConfig(
     context.req,
     context.params?.orgSlug ?? context.query?.orgSlug

apps/web/middleware.ts

@@ -153,6 +153,8 @@ export const config = {
   // Next.js Doesn't support spread operator in config matcher, so, we must list all paths explicitly here.
   // https://github.com/vercel/next.js/discussions/42458
   matcher: [
+    "/403",
+    "/500",
     "/d/:path*",
     "/more/:path*",
     "/maintenance/:path*",
@@ -187,14 +189,16 @@ export const config = {
     "/getting-started/:path*",
     "/apps",
     "/bookings/:status/",
-    "/future/bookings/:status/",
     "/video/:path*",
     "/teams",
     "/future/teams/",
     "/settings/:path*",
     "/reschedule/:path*",
     "/availability/:path*",
-    "/booking/:path*",
+    "/org/:path*",
+    "/team/:path*",
+    "/:user/:type/",
+    "/:user/",
   ],
 };
 

apps/web/modules/apps/installation/[[...step]]/step-view.tsx

@@ -18,6 +18,7 @@ import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import type { Team } from "@calcom/prisma/client";
 import type { eventTypeBookingFields } from "@calcom/prisma/zod-utils";
+import { eventTypeMetaDataSchemaWithTypedApps } from "@calcom/prisma/zod-utils";
 import type { EventTypeMetaDataSchema } from "@calcom/prisma/zod-utils";
 import { trpc } from "@calcom/trpc/react";
 import type { AppMeta } from "@calcom/types/App";
@@ -243,15 +244,20 @@ const OnboardingPage = ({
                   const promises = group.eventTypes
                     .filter((eventType) => eventType.selected)
                     .map((value: TEventType) => {
-                      // Prevent two payment apps to be enabled
-                      // Ok to cast type here because this metadata will be updated as the event type metadata
-                      if (
-                        checkForMultiplePaymentApps(value.metadata as z.infer<typeof EventTypeMetaDataSchema>)
-                      )
-                        throw new Error(t("event_setup_multiple_payment_apps_error"));
-                      if (value.metadata?.apps?.stripe?.paymentOption === "HOLD" && value.seatsPerTimeSlot) {
-                        throw new Error(t("seats_and_no_show_fee_error"));
+                      if (value.metadata) {
+                        const metadata = eventTypeMetaDataSchemaWithTypedApps.parse(value.metadata);
+                        // Prevent two payment apps to be enabled
+                        // Ok to cast type here because this metadata will be updated as the event type metadata
+                        if (checkForMultiplePaymentApps(metadata))
+                          throw new Error(t("event_setup_multiple_payment_apps_error"));
+                        if (
+                          value.metadata?.apps?.stripe?.paymentOption === "HOLD" &&
+                          value.seatsPerTimeSlot
+                        ) {
+                          throw new Error(t("seats_and_no_show_fee_error"));
+                        }
                       }
+
                       let updateObject: TUpdateObject = { id: value.id };
                       if (isConferencing) {
                         updateObject = {

apps/web/modules/auth/login-view.tsx

@@ -282,7 +282,7 @@ PageProps & WithNonceProps<{}>) {
                 disabled={formState.isSubmitting}
                 className="w-full justify-center">
                 <span>{twoFactorRequired ? t("submit") : t("sign_in")}</span>
-                {lastUsed === "credentials" && <LastUsed className="text-gray-600" />}
+                {lastUsed === "credentials" && !twoFactorRequired && <LastUsed className="text-gray-600" />}
               </Button>
             </div>
           </form>

apps/web/modules/availability/troubleshoot/troubleshoot-view.tsx

@@ -3,8 +3,7 @@
 import dynamic from "next/dynamic";
 import { Suspense } from "react";
 
-import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { HeadSeo, Loader } from "@calcom/ui";
+import { Loader } from "@calcom/ui";
 
 const TroubleshooterClientOnly = dynamic(
   () => import("@calcom/features/troubleshooter/Troubleshooter").then((mod) => mod.Troubleshooter),
@@ -14,10 +13,8 @@ const TroubleshooterClientOnly = dynamic(
 );
 
 function TroubleshooterPage() {
-  const { t } = useLocale();
   return (
     <>
-      <HeadSeo title={t("troubleshoot")} description={t("troubleshoot_availability")} />
       <Suspense
         fallback={
           <div className="flex h-full w-full items-center justify-center">

apps/web/modules/bookings/views/booking-dry-run-success-view.tsx

@@ -0,0 +1,76 @@
+"use client";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Icon } from "@calcom/ui";
+
+export default function DryRunSuccessful() {
+  const { t } = useLocale();
+
+  const sampleBookingInfo = {
+    startTime: "2024-01-20T10:00:00Z",
+    endTime: "2024-01-20T11:00:00Z",
+    title: "Sample Meeting",
+    description: "This is a sample dry run booking",
+    attendees: [
+      {
+        email: "attendee@example.com",
+        name: "Sample Attendee",
+        timeZone: "America/New_York",
+      },
+    ],
+    user: {
+      name: "Sample Host",
+      email: "host@example.com",
+    },
+    location: "Zoom Meeting",
+    status: "ACCEPTED",
+    uid: "sample-uid",
+  };
+
+  const sampleEventType = {
+    title: "Sample Event Type",
+    length: 60,
+    eventName: "Sample Meeting",
+    description: "This is a sample event type for dry run",
+    requiresConfirmation: false,
+    recurringEvent: null,
+  };
+
+  return (
+    <div className="flex h-screen">
+      <div className="bg-default m-auto rounded-md p-10 text-center">
+        <div className="bg-success mx-auto mb-4 flex h-12 w-12 items-center justify-center rounded-full">
+          <Icon name="check" className="h-6 w-6 text-green-600 dark:text-green-400" />
+        </div>
+        <h1 className="text-emphasis mb-4 text-2xl font-medium">{t("booking_dry_run_successful")}</h1>
+        <p className="text-default mb-8 max-w-2xl text-sm">{t("booking_dry_run_successful_description")}</p>
+
+        {/* <div className="border-subtle text-default mt-8 grid grid-cols-3 border-t pt-8 text-left">
+          <div className="font-medium">{t("what")}</div>
+          <div className="col-span-2 mb-6">{sampleBookingInfo.title}</div>
+
+          <div className="font-medium">{t("when")}</div>
+          <div className="col-span-2 mb-6">{new Date(sampleBookingInfo.startTime).toLocaleString()}</div>
+
+          <div className="font-medium">{t("who")}</div>
+          <div className="col-span-2 mb-6">
+            <div className="mb-3">
+              <div>
+                <span className="mr-2">{sampleBookingInfo.user.name}</span>
+                <Badge variant="blue">{t("Host")}</Badge>
+              </div>
+              <p className="text-default">{sampleBookingInfo.user.email}</p>
+            </div>
+            <div>
+              <p>{sampleBookingInfo.attendees[0].name}</p>
+              <p>{sampleBookingInfo.attendees[0].email}</p>
+            </div>
+          </div>
+
+          <div className="font-medium">{t("where")}</div>
+          <div className="col-span-2 mb-6">{sampleBookingInfo.location}</div>
+        </div> */}
+      </div>
+    </div>
+  );
+}

apps/web/modules/bookings/views/bookings-listing-view.getStaticProps.tsx

@@ -1,24 +0,0 @@
-import { type GetStaticProps } from "next";
-import { z } from "zod";
-
-import { getTranslations } from "@server/lib/getTranslations";
-
-import { validStatuses } from "~/bookings/lib/validStatuses";
-
-const querySchema = z.object({
-  status: z.enum(validStatuses),
-});
-
-export const getStaticProps: GetStaticProps = async (ctx) => {
-  const params = querySchema.safeParse(ctx.params);
-  const i18n = await getTranslations(ctx);
-
-  if (!params.success) return { notFound: true };
-
-  return {
-    props: {
-      status: params.data.status,
-      i18n,
-    },
-  };
-};

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

@@ -13,7 +13,6 @@ import { useFilterQuery } from "@calcom/features/bookings/lib/useFilterQuery";
 import Shell from "@calcom/features/shell/Shell";
 import { useInViewObserver } from "@calcom/lib/hooks/useInViewObserver";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { useParamsWithFallback } from "@calcom/lib/hooks/useParamsWithFallback";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { trpc } from "@calcom/trpc/react";
 import type { HorizontalTabItemProps, VerticalTabItemProps } from "@calcom/ui";
@@ -67,17 +66,13 @@ const descriptionByStatus: Record<NonNullable<BookingListingStatus>, string> = {
   unconfirmed: "unconfirmed_bookings",
 };
 
-const querySchema = z.object({
-  status: z.enum(validStatuses),
-});
-
-export default function Bookings() {
-  const params = useParamsWithFallback();
+export default function Bookings({ status }: { status: (typeof validStatuses)[number] }) {
   const { data: filterQuery } = useFilterQuery();
-  const { status } = params ? querySchema.parse(params) : { status: "upcoming" as const };
+
   const { t } = useLocale();
   const user = useMeQuery().data;
   const [isFiltersVisible, setIsFiltersVisible] = useState<boolean>(false);
+
   const query = trpc.viewer.bookings.get.useInfiniteQuery(
     {
       limit: 10,

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

@@ -1,153 +0,0 @@
-import { render } from "@testing-library/react";
-import { useSession } from "next-auth/react";
-import React from "react";
-import { describe, it, expect, vi } from "vitest";
-import type { z } from "zod";
-
-import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";
-import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
-import { BookingStatus } from "@calcom/prisma/enums";
-import { HeadSeo } from "@calcom/ui";
-
-import Success from "./bookings-single-view";
-
-function mockedSuccessComponentProps(props: Partial<React.ComponentProps<typeof Success>>) {
-  return {
-    eventType: {
-      id: 1,
-      title: "Event Title",
-      description: "",
-      locations: null,
-      length: 15,
-      userId: null,
-      eventName: "d",
-      timeZone: null,
-      recurringEvent: null,
-      requiresConfirmation: false,
-      disableGuests: false,
-      seatsPerTimeSlot: null,
-      seatsShowAttendees: null,
-      seatsShowAvailabilityCount: null,
-      schedulingType: null,
-      price: 0,
-      currency: "usd",
-      successRedirectUrl: null,
-      customInputs: [],
-      teamId: null,
-      team: null,
-      workflows: [],
-      hosts: [],
-      users: [],
-      owner: null,
-      isDynamic: false,
-      periodStartDate: "1",
-      periodEndDate: "1",
-      metadata: null,
-      bookingFields: [] as unknown as [] & z.BRAND<"HAS_SYSTEM_FIELDS">,
-    },
-    profile: {
-      name: "John",
-      email: null,
-      theme: null,
-      brandColor: null,
-      darkBrandColor: null,
-      slug: null,
-    },
-    bookingInfo: {
-      uid: "uid",
-      metadata: null,
-      customInputs: [],
-      startTime: new Date(),
-      endTime: new Date(),
-      id: 1,
-      user: null,
-      eventType: null,
-      seatsReferences: [],
-      userPrimaryEmail: null,
-      eventTypeId: null,
-      title: "Booking Title",
-      description: null,
-      location: null,
-      recurringEventId: null,
-      smsReminderNumber: "0",
-      cancellationReason: null,
-      rejectionReason: null,
-      status: BookingStatus.ACCEPTED,
-      attendees: [],
-      responses: {
-        name: "John",
-      },
-      rescheduled: false,
-      fromReschedule: null,
-    },
-    orgSlug: null,
-    userTimeFormat: 12,
-    requiresLoginToUpdate: false,
-    themeBasis: "dark",
-    hideBranding: false,
-    recurringBookings: null,
-    trpcState: {
-      queries: [],
-      mutations: [],
-    },
-    dynamicEventName: "Event Title",
-    paymentStatus: null,
-    rescheduledToUid: null,
-    ...props,
-  } satisfies React.ComponentProps<typeof Success>;
-}
-
-describe("Success Component", () => {
-  it("renders HeadSeo correctly", () => {
-    vi.mocked(getOrgFullOrigin).mockImplementation((text: string | null) => `${text}.cal.local`);
-    vi.mocked(useRouterQuery).mockReturnValue({
-      uid: "uid",
-    });
-    vi.mock("@calcom/lib/constants", async (importOriginal) => {
-      const actual = await importOriginal<any>();
-      return {
-        ...actual,
-        CURRENT_TIMEZONE: "Europe/London",
-      };
-    });
-    vi.mocked(useSession).mockReturnValue({
-      update: vi.fn(),
-      status: "authenticated",
-      data: {
-        hasValidLicense: true,
-        upId: "1",
-        expires: "1",
-        user: {
-          name: "John",
-          id: 1,
-          profile: {
-            id: null,
-            upId: "1",
-            username: null,
-            organizationId: null,
-            organization: null,
-          },
-        },
-      },
-    });
-
-    const mockObject = {
-      props: mockedSuccessComponentProps({
-        orgSlug: "org1",
-      }),
-    };
-
-    render(<Success {...mockObject.props} />);
-
-    const expectedTitle = `booking_confirmed`;
-    const expectedDescription = expectedTitle;
-    expect(HeadSeo).toHaveBeenCalledWith(
-      {
-        origin: `${mockObject.props.orgSlug}.cal.local`,
-        title: expectedTitle,
-        description: expectedDescription,
-      },
-      {}
-    );
-  });
-});

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

@@ -48,7 +48,7 @@ import { getEveryFreqFor } from "@calcom/lib/recurringStrings";
 import { getIs24hClockFromLocalStorage, isBrowserLocale24h } from "@calcom/lib/timeFormat";
 import { localStorage } from "@calcom/lib/webstorage";
 import { BookingStatus, SchedulingType } from "@calcom/prisma/enums";
-import { bookingMetadataSchema } from "@calcom/prisma/zod-utils";
+import { bookingMetadataSchema, eventTypeMetaDataSchemaWithTypedApps } from "@calcom/prisma/zod-utils";
 import { trpc } from "@calcom/trpc/react";
 import {
   Alert,
@@ -56,12 +56,12 @@ import {
   Badge,
   Button,
   EmailInput,
-  HeadSeo,
   useCalcomTheme,
   TextArea,
   showToast,
   EmptyScreen,
   Icon,
+  HeadSeo,
 } from "@calcom/ui";
 import CancelBooking from "@calcom/web/components/booking/CancelBooking";
 import EventReservationSchema from "@calcom/web/components/schemas/EventReservationSchema";
@@ -230,7 +230,13 @@ export default function Success(props: PageProps) {
     t,
   };
 
-  const giphyAppData = getEventTypeAppData(eventType, "giphy");
+  const giphyAppData = getEventTypeAppData(
+    {
+      ...eventType,
+      metadata: eventTypeMetaDataSchemaWithTypedApps.parse(eventType.metadata),
+    },
+    "giphy"
+  );
   const giphyImage = giphyAppData?.thankYouPage;
   const isRoundRobin = eventType.schedulingType === SchedulingType.ROUND_ROBIN;
 
@@ -435,7 +441,9 @@ export default function Success(props: PageProps) {
         </div>
       )}
       <HeadSeo origin={getOrgFullOrigin(orgSlug)} title={title} description={title} />
-      <BookingPageTagManager eventType={eventType} />
+      <BookingPageTagManager
+        eventType={{ ...eventType, metadata: eventTypeMetaDataSchemaWithTypedApps.parse(eventType.metadata) }}
+      />
       <main className={classNames(shouldAlignCentrally ? "mx-auto" : "", isEmbed ? "" : "max-w-3xl")}>
         <div className={classNames("overflow-y-auto", isEmbed ? "" : "z-50 ")}>
           <div
@@ -819,7 +827,8 @@ export default function Success(props: PageProps) {
                                     )}`
                                   : ""
                               }`}
-                              className="text-default border-subtle h-10 w-10 rounded-sm border px-3 py-2 ltr:mr-2 rtl:ml-2">
+                              className="text-default border-subtle h-10 w-10 rounded-sm border px-3 py-2 ltr:mr-2 rtl:ml-2"
+                              target="_blank">
                               <svg
                                 className="-mt-1.5 inline-block h-4 w-4"
                                 fill="currentColor"

apps/web/modules/d/[link]/d-type-view.tsx

@@ -2,7 +2,6 @@
 
 import { Booker } from "@calcom/atoms/monorepo";
 import { getBookerWrapperClasses } from "@calcom/features/bookings/Booker/utils/getBookerWrapperClasses";
-import { BookerSeo } from "@calcom/features/bookings/components/BookerSeo";
 
 import { type PageProps } from "@lib/d/[link]/[slug]/getServerSideProps";
 
@@ -20,13 +19,6 @@ export default function Type({
 }: PageProps) {
   return (
     <main className={getBookerWrapperClasses({ isEmbed: !!isEmbed })}>
-      <BookerSeo
-        username={user}
-        eventSlug={slug}
-        rescheduleUid={booking?.uid}
-        hideBranding={isBrandingHidden}
-        entity={entity}
-      />
       <Booker
         username={user}
         eventSlug={slug}

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

@@ -0,0 +1,49 @@
+"use client";
+
+import { useState } from "react";
+
+import { TestForm } from "@calcom/app-store/routing-forms/components/SingleForm";
+import type { RoutingForm } from "@calcom/app-store/routing-forms/types/types";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { trpc } from "@calcom/trpc";
+import { Label, Select } from "@calcom/ui";
+
+import InsightsLayout from "./layout";
+
+export default function InsightsVirtualQueuesPage() {
+  const { t } = useLocale();
+  const { data: routingForms, isLoading: isRoutingFormsLoading } =
+    trpc.viewer.insights.getUserRelevantTeamRoutingForms.useQuery();
+
+  const [selectedForm, setSelectedForm] = useState<RoutingForm | undefined>(
+    routingForms && routingForms.length > 0 ? routingForms[0] : undefined
+  );
+
+  if (routingForms && !selectedForm && routingForms.length > 0) {
+    setSelectedForm(routingForms[0]);
+  }
+
+  return (
+    <InsightsLayout>
+      <Label>{t("routing_form")}</Label>
+      <Select
+        placeholder="Select project"
+        options={routingForms?.map((form) => ({ label: form.name, value: form.id })) ?? []}
+        isLoading={isRoutingFormsLoading}
+        className="w-60"
+        onChange={(e) => {
+          if (e && routingForms) {
+            const form = routingForms.find((form) => form.id === e.value);
+            setSelectedForm(form);
+          }
+        }}
+        value={selectedForm ? { label: selectedForm.name, value: selectedForm.id } : undefined}
+      />
+      <div className="mt-10">
+        {selectedForm ? <TestForm form={selectedForm} showAllData={false} /> : <></>}
+      </div>
+    </InsightsLayout>
+  );
+
+  return <></>;
+}

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

@@ -3,7 +3,6 @@
 import MembersView from "@calcom/features/ee/organizations/pages/members";
 import Shell from "@calcom/features/shell/Shell";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import { HeadSeo } from "@calcom/ui";
 
 const MembersPage: React.FC = () => {
   const { t } = useLocale();
@@ -14,8 +13,6 @@ const MembersPage: React.FC = () => {
       description={t("organization_description")}
       withoutSeo
       subtitle={t("organization_description")}>
-      <HeadSeo title={t("organization_members")} description={t("organization_description")} />
-
       <MembersView />
     </Shell>
   );

apps/web/modules/org/[orgSlug]/instant-meeting/team/[slug]/[type]/instant-meeting-view.tsx

@@ -2,26 +2,16 @@
 
 import { Booker } from "@calcom/atoms/monorepo";
 import { getBookerWrapperClasses } from "@calcom/features/bookings/Booker/utils/getBookerWrapperClasses";
-import { BookerSeo } from "@calcom/features/bookings/components/BookerSeo";
 
 import type { getServerSideProps } from "@lib/org/[orgSlug]/instant-meeting/team/[slug]/[type]/getServerSideProps";
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
-import type { EmbedProps } from "@lib/withEmbedSsr";
+import type { EmbedProps } from "app/WithEmbedSSR";
 
 export type PageProps = inferSSRProps<typeof getServerSideProps> & EmbedProps;
 
 function Type({ slug, user, booking, isEmbed, isBrandingHidden, entity, eventTypeId, duration }: PageProps) {
   return (
     <main className={getBookerWrapperClasses({ isEmbed: !!isEmbed })}>
-      <BookerSeo
-        username={user}
-        eventSlug={slug}
-        rescheduleUid={undefined}
-        hideBranding={isBrandingHidden}
-        isTeamEvent
-        entity={entity}
-        bookingData={booking}
-      />
       <Booker
         username={user}
         eventSlug={slug}

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

@@ -12,7 +12,6 @@ import { usePathname } from "next/navigation";
 import { useEffect } from "react";
 
 import { sdkActionManager, useIsEmbed } from "@calcom/embed-core/embed-iframe";
-import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";
 import EventTypeDescription from "@calcom/features/eventtypes/components/EventTypeDescription";
 import { getOrgOrTeamAvatar } from "@calcom/lib/defaultAvatarImage";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
@@ -20,7 +19,7 @@ import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
 import useTheme from "@calcom/lib/hooks/useTheme";
 import { collectPageParameters, telemetryEventTypes, useTelemetry } from "@calcom/lib/telemetry";
 import { teamMetadataSchema } from "@calcom/prisma/zod-utils";
-import { Avatar, Button, HeadSeo, UnpublishedEntity, UserAvatarGroup } from "@calcom/ui";
+import { Avatar, Button, UnpublishedEntity, UserAvatarGroup } from "@calcom/ui";
 
 import { useToggleQuery } from "@lib/hooks/useToggleQuery";
 import type { getServerSideProps } from "@lib/team/[slug]/getServerSideProps";
@@ -164,105 +163,87 @@ function TeamPage({
   const profileImageSrc = getOrgOrTeamAvatar(team);
 
   return (
-    <>
-      <HeadSeo
-        origin={getOrgFullOrigin(currentOrgDomain)}
-        title={teamName}
-        description={teamName}
-        meeting={{
-          title: markdownStrippedBio,
-          profile: {
-            name: `${team.name}`,
-            image: profileImageSrc,
-          },
-        }}
-        nextSeoProps={{
-          nofollow: !isSEOIndexable,
-          noindex: !isSEOIndexable,
-        }}
-      />
-      <main className="dark:bg-darkgray-50 bg-subtle mx-auto max-w-3xl rounded-md px-4 pb-12 pt-12">
-        <div className="mx-auto mb-8 max-w-3xl text-center">
-          <div className="relative">
-            <Avatar alt={teamName} imageSrc={profileImageSrc} size="lg" />
-          </div>
-          <p className="font-cal  text-emphasis mb-2 text-2xl tracking-wider" data-testid="team-name">
-            {team.parent && `${team.parent.name} `}
-            {teamName}
-          </p>
-          {!isBioEmpty && (
-            <>
-              <div
-                className="  text-subtle break-words text-sm [&_a]:text-blue-500 [&_a]:underline [&_a]:hover:text-blue-600"
-                // eslint-disable-next-line react/no-danger
-                dangerouslySetInnerHTML={{ __html: team.safeBio }}
-              />
-            </>
-          )}
+    <main className="dark:bg-darkgray-50 bg-subtle mx-auto max-w-3xl rounded-md px-4 pb-12 pt-12">
+      <div className="mx-auto mb-8 max-w-3xl text-center">
+        <div className="relative">
+          <Avatar alt={teamName} imageSrc={profileImageSrc} size="lg" />
         </div>
-        {team.isOrganization ? (
-          !teamOrOrgIsPrivate ? (
-            <SubTeams />
-          ) : (
-            <div className="w-full text-center">
-              <h2 className="text-emphasis font-semibold">{t("you_cannot_see_teams_of_org")}</h2>
-            </div>
-          )
-        ) : (
+        <p className="font-cal  text-emphasis mb-2 text-2xl tracking-wider" data-testid="team-name">
+          {team.parent && `${team.parent.name} `}
+          {teamName}
+        </p>
+        {!isBioEmpty && (
           <>
-            {(showMembers.isOn || !team.eventTypes?.length) &&
-              (teamOrOrgIsPrivate ? (
-                <div className="w-full text-center">
-                  <h2 data-testid="you-cannot-see-team-members" className="text-emphasis font-semibold">
-                    {t("you_cannot_see_team_members")}
-                  </h2>
-                </div>
-              ) : (
-                <Team members={team.members} teamName={team.name} />
-              ))}
-            {!showMembers.isOn && team.eventTypes && team.eventTypes.length > 0 && (
-              <div className="mx-auto max-w-3xl ">
-                <EventTypes eventTypes={team.eventTypes} />
-
-                {/* Hide "Book a team member button when team is private or hideBookATeamMember is true" */}
-                {!team.hideBookATeamMember && !teamOrOrgIsPrivate && (
-                  <div>
-                    <div className="relative mt-12">
-                      <div className="absolute inset-0 flex items-center" aria-hidden="true">
-                        <div className="border-subtle w-full border-t" />
-                      </div>
-                      <div className="relative flex justify-center">
-                        <span className="dark:bg-darkgray-50 bg-subtle text-subtle px-2 text-sm">
-                          {t("or")}
-                        </span>
-                      </div>
-                    </div>
-
-                    <aside className="dark:text-inverted mt-8 flex justify-center text-center">
-                      <Button
-                        color="minimal"
-                        EndIcon="arrow-right"
-                        data-testid="book-a-team-member-btn"
-                        className="dark:hover:bg-darkgray-200"
-                        href={{
-                          pathname: `${isValidOrgDomain ? "" : "/team"}/${team.slug}`,
-                          query: {
-                            ...queryParamsToForward,
-                            members: "1",
-                          },
-                        }}
-                        shallow={true}>
-                        {t("book_a_team_member")}
-                      </Button>
-                    </aside>
-                  </div>
-                )}
-              </div>
-            )}
+            <div
+              className="  text-subtle break-words text-sm [&_a]:text-blue-500 [&_a]:underline [&_a]:hover:text-blue-600"
+              // eslint-disable-next-line react/no-danger
+              dangerouslySetInnerHTML={{ __html: team.safeBio }}
+            />
           </>
         )}
-      </main>
-    </>
+      </div>
+      {team.isOrganization ? (
+        !teamOrOrgIsPrivate ? (
+          <SubTeams />
+        ) : (
+          <div className="w-full text-center">
+            <h2 className="text-emphasis font-semibold">{t("you_cannot_see_teams_of_org")}</h2>
+          </div>
+        )
+      ) : (
+        <>
+          {(showMembers.isOn || !team.eventTypes?.length) &&
+            (teamOrOrgIsPrivate ? (
+              <div className="w-full text-center">
+                <h2 data-testid="you-cannot-see-team-members" className="text-emphasis font-semibold">
+                  {t("you_cannot_see_team_members")}
+                </h2>
+              </div>
+            ) : (
+              <Team members={team.members} teamName={team.name} />
+            ))}
+          {!showMembers.isOn && team.eventTypes && team.eventTypes.length > 0 && (
+            <div className="mx-auto max-w-3xl ">
+              <EventTypes eventTypes={team.eventTypes} />
+
+              {/* Hide "Book a team member button when team is private or hideBookATeamMember is true" */}
+              {!team.hideBookATeamMember && !teamOrOrgIsPrivate && (
+                <div>
+                  <div className="relative mt-12">
+                    <div className="absolute inset-0 flex items-center" aria-hidden="true">
+                      <div className="border-subtle w-full border-t" />
+                    </div>
+                    <div className="relative flex justify-center">
+                      <span className="dark:bg-darkgray-50 bg-subtle text-subtle px-2 text-sm">
+                        {t("or")}
+                      </span>
+                    </div>
+                  </div>
+
+                  <aside className="dark:text-inverted mt-8 flex justify-center text-center">
+                    <Button
+                      color="minimal"
+                      EndIcon="arrow-right"
+                      data-testid="book-a-team-member-btn"
+                      className="dark:hover:bg-darkgray-200"
+                      href={{
+                        pathname: `${isValidOrgDomain ? "" : "/team"}/${team.slug}`,
+                        query: {
+                          ...queryParamsToForward,
+                          members: "1",
+                        },
+                      }}
+                      shallow={true}>
+                      {t("book_a_team_member")}
+                    </Button>
+                  </aside>
+                </div>
+              )}
+            </div>
+          )}
+        </>
+      )}
+    </main>
   );
 }
 

apps/web/modules/team/type-view.tsx

@@ -1,14 +1,13 @@
 "use client";
 
+import type { EmbedProps } from "app/WithEmbedSSR";
 import { useSearchParams } from "next/navigation";
 
 import { Booker } from "@calcom/atoms/monorepo";
 import { getBookerWrapperClasses } from "@calcom/features/bookings/Booker/utils/getBookerWrapperClasses";
-import { BookerSeo } from "@calcom/features/bookings/components/BookerSeo";
 
 import type { getServerSideProps } from "@lib/team/[slug]/[type]/getServerSideProps";
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
-import type { EmbedProps } from "@lib/withEmbedSsr";
 
 export type PageProps = inferSSRProps<typeof getServerSideProps> & EmbedProps;
 
@@ -34,33 +33,11 @@ function Type({
   teamMemberEmail,
   crmOwnerRecordType,
   crmAppSlug,
-  isSEOIndexable,
 }: PageProps) {
   const searchParams = useSearchParams();
-  const { profile, users, hidden, title } = eventData;
 
   return (
     <main className={getBookerWrapperClasses({ isEmbed: !!isEmbed })}>
-      <BookerSeo
-        username={user}
-        eventSlug={slug}
-        rescheduleUid={booking?.uid}
-        hideBranding={isBrandingHidden}
-        isTeamEvent
-        eventData={
-          profile && users && title && hidden !== undefined
-            ? {
-                profile,
-                users,
-                title,
-                hidden,
-              }
-            : undefined
-        }
-        entity={eventData.entity}
-        bookingData={booking}
-        isSEOIndexable={isSEOIndexable}
-      />
       <Booker
         username={user}
         eventSlug={slug}

apps/web/modules/test-setup.ts

@@ -128,6 +128,9 @@ vi.mock("@calcom/prisma/zod-utils", () => ({
   EventTypeMetaDataSchema: {
     parse: vi.fn(),
   },
+  eventTypeMetaDataSchemaWithTypedApps: {
+    parse: vi.fn(),
+  },
   bookingMetadataSchema: {
     parse: vi.fn(),
   },

apps/web/modules/users/views/users-public-view.test.tsx

@@ -1,9 +1,8 @@
 import { render } from "@testing-library/react";
-import { describe, expect, it, vi } from "vitest";
+import { describe, it, vi } from "vitest";
 
 import { getOrgFullOrigin } from "@calcom/ee/organizations/lib/orgDomains";
 import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
-import { HeadSeo } from "@calcom/ui";
 
 import UserPage from "./users-public-view";
 
@@ -71,33 +70,5 @@ describe("UserPage Component", () => {
     });
 
     render(<UserPage {...mockData.props} />);
-
-    const expectedDescription = mockData.props.markdownStrippedBio;
-    const expectedTitle = expectedDescription;
-    expect(HeadSeo).toHaveBeenCalledWith(
-      {
-        origin: `${mockData.props.entity.orgSlug}.cal.local`,
-        title: `${mockData.props.profile.name}`,
-        description: expectedDescription,
-        meeting: {
-          profile: {
-            name: mockData.props.profile.name,
-            image: mockData.props.users[0].avatarUrl,
-          },
-          title: expectedTitle,
-          users: [
-            {
-              name: mockData.props.users[0].name,
-              username: mockData.props.users[0].username,
-            },
-          ],
-        },
-        nextSeoProps: {
-          nofollow: !mockData.props.profile.allowSEOIndexing,
-          noindex: !mockData.props.profile.allowSEOIndexing,
-        },
-      },
-      {}
-    );
   });
 });

apps/web/modules/users/views/users-public-view.tsx

@@ -11,12 +11,11 @@ import {
   useEmbedStyles,
   useIsEmbed,
 } from "@calcom/embed-core/embed-iframe";
-import { getOrgFullOrigin } from "@calcom/features/ee/organizations/lib/orgDomains";
 import { EventTypeDescriptionLazy as EventTypeDescription } from "@calcom/features/eventtypes/components";
 import EmptyPage from "@calcom/features/eventtypes/components/EmptyPage";
 import { useRouterQuery } from "@calcom/lib/hooks/useRouterQuery";
 import useTheme from "@calcom/lib/hooks/useTheme";
-import { HeadSeo, Icon, UnpublishedEntity, UserAvatar } from "@calcom/ui";
+import { Icon, UnpublishedEntity, UserAvatar } from "@calcom/ui";
 
 import type { getServerSideProps } from "@server/lib/[user]/getServerSideProps";
 
@@ -60,112 +59,89 @@ export function UserPage(props: PageProps) {
   const isEventListEmpty = eventTypes.length === 0;
   const isOrg = !!user?.profile?.organization;
 
-  const allowSEOIndexing = isOrg
-    ? isOrgSEOIndexable
-      ? profile.allowSEOIndexing
-      : false
-    : profile.allowSEOIndexing;
-
   return (
-    <>
-      <HeadSeo
-        origin={getOrgFullOrigin(entity.orgSlug ?? null)}
-        title={profile.name}
-        description={markdownStrippedBio}
-        meeting={{
-          title: markdownStrippedBio,
-          profile: { name: `${profile.name}`, image: user.avatarUrl || null },
-          users: [{ username: `${user.username}`, name: `${user.name}` }],
-        }}
-        nextSeoProps={{
-          noindex: !allowSEOIndexing,
-          nofollow: !allowSEOIndexing,
-        }}
-      />
-
-      <div className={classNames(shouldAlignCentrally ? "mx-auto" : "", isEmbed ? "max-w-3xl" : "")}>
-        <main
-          className={classNames(
-            shouldAlignCentrally ? "mx-auto" : "",
-            isEmbed ? "border-booker border-booker-width  bg-default rounded-md" : "",
-            "max-w-3xl px-4 py-24"
-          )}>
-          <div className="mb-8 text-center">
-            <UserAvatar
-              size="xl"
-              user={{
-                avatarUrl: user.avatarUrl,
-                profile: user.profile,
-                name: profile.name,
-                username: profile.username,
-              }}
-            />
-            <h1 className="font-cal text-emphasis my-1 text-3xl" data-testid="name-title">
-              {profile.name}
-              {!isOrg && user.verified && (
-                <Icon
-                  name="badge-check"
-                  className="mx-1 -mt-1 inline h-6 w-6 fill-blue-500 text-white dark:text-black"
-                />
-              )}
-              {isOrg && (
-                <Icon
-                  name="badge-check"
-                  className="mx-1 -mt-1 inline h-6 w-6 fill-yellow-500 text-white dark:text-black"
-                />
-              )}
-            </h1>
-            {!isBioEmpty && (
-              <>
-                <div
-                  className="  text-subtle break-words text-sm [&_a]:text-blue-500 [&_a]:underline [&_a]:hover:text-blue-600"
-                  // eslint-disable-next-line react/no-danger
-                  dangerouslySetInnerHTML={{ __html: props.safeBio }}
-                />
-              </>
+    <div className={classNames(shouldAlignCentrally ? "mx-auto" : "", isEmbed ? "max-w-3xl" : "")}>
+      <main
+        className={classNames(
+          shouldAlignCentrally ? "mx-auto" : "",
+          isEmbed ? "border-booker border-booker-width  bg-default rounded-md" : "",
+          "max-w-3xl px-4 py-24"
+        )}>
+        <div className="mb-8 text-center">
+          <UserAvatar
+            size="xl"
+            user={{
+              avatarUrl: user.avatarUrl,
+              profile: user.profile,
+              name: profile.name,
+              username: profile.username,
+            }}
+          />
+          <h1 className="font-cal text-emphasis my-1 text-3xl" data-testid="name-title">
+            {profile.name}
+            {!isOrg && user.verified && (
+              <Icon
+                name="badge-check"
+                className="mx-1 -mt-1 inline h-6 w-6 fill-blue-500 text-white dark:text-black"
+              />
             )}
-          </div>
+            {isOrg && (
+              <Icon
+                name="badge-check"
+                className="mx-1 -mt-1 inline h-6 w-6 fill-yellow-500 text-white dark:text-black"
+              />
+            )}
+          </h1>
+          {!isBioEmpty && (
+            <>
+              <div
+                className="  text-subtle break-words text-sm [&_a]:text-blue-500 [&_a]:underline [&_a]:hover:text-blue-600"
+                // eslint-disable-next-line react/no-danger
+                dangerouslySetInnerHTML={{ __html: props.safeBio }}
+              />
+            </>
+          )}
+        </div>
 
-          <div
-            className={classNames("rounded-md ", !isEventListEmpty && "border-subtle border")}
-            data-testid="event-types">
-            {eventTypes.map((type) => (
-              <Link
-                key={type.id}
-                style={{ display: "flex", ...eventTypeListItemEmbedStyles }}
-                prefetch={false}
-                href={{
-                  pathname: `/${user.profile.username}/${type.slug}`,
-                  query,
-                }}
-                passHref
-                onClick={async () => {
-                  sdkActionManager?.fire("eventTypeSelected", {
-                    eventType: type,
-                  });
-                }}
-                className="bg-default border-subtle dark:bg-muted dark:hover:bg-emphasis hover:bg-muted group relative border-b transition first:rounded-t-md last:rounded-b-md last:border-b-0"
-                data-testid="event-type-link">
-                <Icon
-                  name="arrow-right"
-                  className="text-emphasis absolute right-4 top-4 h-4 w-4 opacity-0 transition-opacity group-hover:opacity-100"
-                />
-                {/* Don't prefetch till the time we drop the amount of javascript in [user][type] page which is impacting score for [user] page */}
-                <div className="block w-full p-5">
-                  <div className="flex flex-wrap items-center">
-                    <h2 className="text-default pr-2 text-sm font-semibold">{type.title}</h2>
-                  </div>
-                  <EventTypeDescription eventType={type} isPublic={true} shortenDescription />
+        <div
+          className={classNames("rounded-md ", !isEventListEmpty && "border-subtle border")}
+          data-testid="event-types">
+          {eventTypes.map((type) => (
+            <Link
+              key={type.id}
+              style={{ display: "flex", ...eventTypeListItemEmbedStyles }}
+              prefetch={false}
+              href={{
+                pathname: `/${user.profile.username}/${type.slug}`,
+                query,
+              }}
+              passHref
+              onClick={async () => {
+                sdkActionManager?.fire("eventTypeSelected", {
+                  eventType: type,
+                });
+              }}
+              className="bg-default border-subtle dark:bg-muted dark:hover:bg-emphasis hover:bg-muted group relative border-b transition first:rounded-t-md last:rounded-b-md last:border-b-0"
+              data-testid="event-type-link">
+              <Icon
+                name="arrow-right"
+                className="text-emphasis absolute right-4 top-4 h-4 w-4 opacity-0 transition-opacity group-hover:opacity-100"
+              />
+              {/* Don't prefetch till the time we drop the amount of javascript in [user][type] page which is impacting score for [user] page */}
+              <div className="block w-full p-5">
+                <div className="flex flex-wrap items-center">
+                  <h2 className="text-default pr-2 text-sm font-semibold">{type.title}</h2>
                 </div>
-              </Link>
-            ))}
-          </div>
+                <EventTypeDescription eventType={type} isPublic={true} shortenDescription />
+              </div>
+            </Link>
+          ))}
+        </div>
 
-          {isEventListEmpty && <EmptyPage name={profile.name || "User"} />}
-        </main>
-        <Toaster position="bottom-right" />
-      </div>
-    </>
+        {isEventListEmpty && <EmptyPage name={profile.name || "User"} />}
+      </main>
+      <Toaster position="bottom-right" />
+    </div>
   );
 }
 UserPage.isBookingPage = true;

apps/web/modules/users/views/users-type-public-view.tsx

@@ -1,13 +1,12 @@
 "use client";
 
+import type { EmbedProps } from "app/WithEmbedSSR";
 import { useSearchParams } from "next/navigation";
 
 import { Booker } from "@calcom/atoms/monorepo";
 import { getBookerWrapperClasses } from "@calcom/features/bookings/Booker/utils/getBookerWrapperClasses";
-import { BookerSeo } from "@calcom/features/bookings/components/BookerSeo";
 
 import type { inferSSRProps } from "@lib/types/inferSSRProps";
-import type { EmbedProps } from "@lib/withEmbedSsr";
 
 import type { getServerSideProps } from "@server/lib/[user]/[type]/getServerSideProps";
 
@@ -23,40 +22,11 @@ export const getMultipleDurationValue = (
   return defaultValue;
 };
 
-function Type({
-  slug,
-  user,
-  isEmbed,
-  booking,
-  isBrandingHidden,
-  isSEOIndexable,
-  rescheduleUid,
-  eventData,
-  orgBannerUrl,
-}: PageProps) {
+function Type({ slug, user, isEmbed, booking, isBrandingHidden, eventData, orgBannerUrl }: PageProps) {
   const searchParams = useSearchParams();
-  const { profile, users, hidden, title } = eventData;
+
   return (
     <main className={getBookerWrapperClasses({ isEmbed: !!isEmbed })}>
-      <BookerSeo
-        username={user}
-        eventSlug={slug}
-        rescheduleUid={rescheduleUid ?? undefined}
-        hideBranding={isBrandingHidden}
-        isSEOIndexable={isSEOIndexable ?? true}
-        eventData={
-          profile && users && title && hidden !== undefined
-            ? {
-                profile,
-                users,
-                title,
-                hidden,
-              }
-            : undefined
-        }
-        entity={eventData.entity}
-        bookingData={booking}
-      />
       <Booker
         username={user}
         eventSlug={slug}

apps/web/modules/videos/views/videos-meeting-ended-single-view.tsx

@@ -4,7 +4,7 @@ import dayjs from "@calcom/dayjs";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { detectBrowserTimeFormat } from "@calcom/lib/timeFormat";
 import type { inferSSRProps } from "@calcom/types/inferSSRProps";
-import { Button, HeadSeo, Icon } from "@calcom/ui";
+import { Button, Icon } from "@calcom/ui";
 
 import type { getServerSideProps } from "@lib/video/meeting-ended/[uid]/getServerSideProps";
 
@@ -14,7 +14,6 @@ export default function MeetingUnavailable(props: PageProps) {
 
   return (
     <div>
-      <HeadSeo title={t("meeting_unavailable")} description={t("meeting_unavailable")} />
       <main className="mx-auto my-24 max-w-3xl">
         <div className="fixed inset-0 z-50 overflow-y-auto">
           <div className="flex min-h-screen items-end justify-center px-4 pb-20 pt-4 text-center sm:block sm:p-0">