chore: release v5.2.9

* perf: Remove unnecessary routes from middleware

* remove tests not needed

.env.example

@@ -443,4 +443,8 @@ NEXT_PUBLIC_QUICK_AVAILABILITY_ROLLOUT=10
 NEXT_PUBLIC_HEAD_SCRIPTS=
 NEXT_PUBLIC_BODY_SCRIPTS=
 
-DATABASE_CHUNK_SIZE=
+DATABASE_CHUNK_SIZE=
+
+# Service Account Encryption Key for encrypting/decrypting service account keys
+# You can use: `openssl rand -base64 24` to generate one
+CALCOM_SERVICE_ACCOUNT_ENCRYPTION_KEY=

.github/CODEOWNERS

@@ -1,9 +1,9 @@
 /**/package.json @calcom/Foundation
 /apps/api/**/* @calcom/Platform @calcom/Foundation
-/apps/ui-playground/**/* @calcom/Consumer
-/apps/web/components/**/* @calcom/Consumer
-/apps/web/modules/**/* @calcom/Consumer
-/apps/web/**/layout.tsx @calcom/Foundation
+/apps/ui-playground/**/* @calcom/Consumer @calcom/Foundation
+/apps/web/components/**/* @calcom/Consumer @calcom/Foundation
+/apps/web/modules/**/* @calcom/Consumer @calcom/Foundation
+/apps/web/**/layout.tsx @calcom/Consumer @calcom/Foundation
 /apps/web/lib/**/* @calcom/Foundation
 /apps/web/middleware.ts @calcom/Foundation
 /deploy/**/* @calcom/Foundation
@@ -26,5 +26,7 @@
 /packages/lib/slots.ts @calcom/Foundation
 /packages/platform/**/* @calcom/Platform @calcom/Foundation
 /packages/prisma/**/* @calcom/Foundation
+/packages/trpc/server/routers/viewer/bookings/confirm.handler.ts @calcom/Foundation
+/packages/trpc/server/routers/viewer/bookings/get.handler.ts @calcom/Foundation
 /packages/trpc/server/routers/viewer/slots/**/* @calcom/Foundation
-/packages/ui/**/* @calcom/Consumer
+/packages/ui/**/* @calcom/Consumer @calcom/Foundation

.github/workflows/cleanup-report.yml

@@ -0,0 +1,37 @@
+on:
+  workflow_call:
+  pull_request:
+    types: [closed]
+
+permissions:
+  contents: write
+  issues: write
+  pull-requests: write
+jobs:
+  cleanup-report:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout GitHub Pages Branch
+        uses: actions/checkout@v4
+        with:
+          repository: calcom/test-results
+          ref: gh-pages
+          token: ${{ secrets.GH_ACCESS_TOKEN }}
+
+      - name: Set Git User
+        run: |
+          git config --global user.name "github-actions[bot]"
+          git config --global user.email "41898282+github-actions[bot]@users.noreply.github.com"
+
+      - name: Cleanup HTML reports on PR close/merge
+        env:
+          BRANCH_REPORTS_DIR: reports/${{ github.event.pull_request.head.ref }}
+        run: |
+          if [ -d "$BRANCH_REPORTS_DIR" ]; then
+            rm -rf "$BRANCH_REPORTS_DIR"
+            git add .
+            git commit -m "workflow: remove all reports for branch ${{ github.event.pull_request.head.ref }} (PR closed/merged)"
+            git push
+          else
+            echo "No reports found for branch ${{ github.event.pull_request.head.ref }}. Nothing to clean up."
+          fi

.github/workflows/pr.yml

@@ -219,6 +219,17 @@ jobs:
     uses: ./.github/workflows/publish-report.yml
     secrets: inherit
 
+  cleanup-report:
+    name: Cleanup HTML report
+    if: ${{ !cancelled() && needs.check-label.outputs.run-e2e == 'true' && (github.event.pull_request.merged == true || github.event.pull_request.state == 'closed') }}
+    permissions:
+      contents: write
+      issues: write
+      pull-requests: write
+    needs: [changes, check-label, publish-report]
+    uses: ./.github/workflows/cleanup-report.yml
+    secrets: inherit
+
   required:
     needs:
       [

.yarn/versions/1a9c19c8.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/8c8f795b.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"

PR_TODO.md

@@ -0,0 +1,15 @@
+Possible issue:
+- We won't be able to use already built calendar-cache when Delegation Credential is enabled because existing CalendarCache entries don't have userId set.
+
+## Approach of always using SelectedCalendar.credentialId for CalendarCache even for DelegationCredentials
+- Delete Credentials when DelegationCredential is disabled
+
+
+TO Test
+- New members beyond the batch size are processed
+
+
+
+
+
+

apps/api/v1/pages/api/destination-calendars/[id]/_patch.ts

@@ -185,7 +185,12 @@ async function verifyCredentialsAndGetId({
   currentCredentialId: number | null;
 }) {
   if (parsedBody.integration && parsedBody.externalId) {
-    const calendarCredentials = getCalendarCredentialsWithoutDelegation(userCredentials);
+    const calendarCredentials = getCalendarCredentialsWithoutDelegation(
+      userCredentials.map((cred) => ({
+        ...cred,
+        delegationCredentialId: null,
+      }))
+    );
 
     const { connectedCalendars } = await getConnectedCalendars(
       calendarCredentials,

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

@@ -24,7 +24,12 @@ import { membershipCreateBodySchema, schemaMembershipPublic } from "~/lib/valida
  */
 async function postHandler(req: NextApiRequest) {
   const data = membershipCreateBodySchema.parse(req.body);
-  const args: Prisma.MembershipCreateArgs = { data };
+  const args: Prisma.MembershipCreateArgs = {
+    data: {
+      createdAt: new Date(),
+      ...data,
+    },
+  };
 
   await checkPermissions(req);
 

apps/api/v2/jest-e2e.json

@@ -11,6 +11,7 @@
     "^.+\\.(t|j)s$": "ts-jest"
   },
   "setupFiles": ["<rootDir>/test/setEnvVars.ts", "jest-date-mock"],
+  "setupFilesAfterEnv": ["<rootDir>/test/jest.setup-e2e.ts"],
   "reporters": ["default", "jest-summarizing-reporter"],
   "workerIdleMemoryLimit": "512MB",
   "maxWorkers": 8

apps/api/v2/package.json

@@ -38,7 +38,7 @@
     "@axiomhq/winston": "^1.2.0",
     "@calcom/platform-constants": "*",
     "@calcom/platform-enums": "*",
-    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.176",
+    "@calcom/platform-libraries": "npm:@calcom/platform-libraries@0.0.185",
     "@calcom/platform-libraries-0.0.2": "npm:@calcom/platform-libraries@0.0.2",
     "@calcom/platform-types": "*",
     "@calcom/platform-utils": "*",

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

@@ -385,7 +385,7 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
               emailsEnabledSetup.createdBookingUid = responseBody.data.uid;
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });
@@ -430,7 +430,7 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
                 emailsEnabledSetup.rescheduledBookingUid = responseBody.data.uid;
               } else {
                 throw new Error(
-                  "Invalid response data - expected booking but received array of possibily recurring bookings"
+                  "Invalid response data - expected booking but received array of possibly recurring bookings"
                 );
               }
             });
@@ -459,7 +459,7 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
                 emailsEnabledSetup.rescheduledBookingUid = responseBody.data.uid;
               } else {
                 throw new Error(
-                  "Invalid response data - expected booking but received array of possibily recurring bookings"
+                  "Invalid response data - expected booking but received array of possibly recurring bookings"
                 );
               }
             });
@@ -502,7 +502,7 @@ describe("Bookings Endpoints 2024-08-13 confirm emails", () => {
               emailsEnabledSetup.createdBookingUid = responseBody.data.uid;
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });

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

@@ -583,7 +583,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               expect(data.rating).toEqual(bookingInThePast.rating);
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });
@@ -642,7 +642,7 @@ describe("Bookings Endpoints 2024-08-13", () => {
               await bookingsRepositoryFixture.deleteById(mockBooking.id);
             } else {
               throw new Error(
-                "Invalid response data - expected booking but received array of possibily recurring bookings"
+                "Invalid response data - expected booking but received array of possibly recurring bookings"
               );
             }
           });

apps/api/v2/src/ee/calendars/services/apple-calendar.service.ts

@@ -119,6 +119,7 @@ export class AppleCalendarService implements CredentialSyncCalendarApp {
         teamId: null,
         appId: APPLE_CALENDAR_ID,
         invalid: false,
+        delegationCredentialId: null,
       };
 
       const dav = new CalendarService({

apps/api/v2/src/ee/calendars/services/ics-feed.service.ts

@@ -35,6 +35,7 @@ export class IcsFeedService implements ICSFeedCalendarApp {
       teamId: null,
       appId: ICS_CALENDAR,
       invalid: false,
+      delegationCredentialId: null,
     };
 
     try {

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

@@ -490,6 +490,7 @@ describe("Event types Endpoints", () => {
         requiresBookerEmailVerification: false,
         hideCalendarNotes: false,
         hideCalendarEventDetails: false,
+        hideOrganizerEmail: false,
         lockTimeZoneToggleOnBookingPage: true,
         color: {
           darkThemeHex: "#292929",
@@ -529,6 +530,7 @@ describe("Event types Endpoints", () => {
 
           expect(createdEventType.hideCalendarNotes).toEqual(body.hideCalendarNotes);
           expect(createdEventType.hideCalendarEventDetails).toEqual(body.hideCalendarEventDetails);
+          expect(createdEventType.hideOrganizerEmail).toEqual(body.hideOrganizerEmail);
           expect(createdEventType.lockTimeZoneToggleOnBookingPage).toEqual(
             body.lockTimeZoneToggleOnBookingPage
           );
@@ -610,6 +612,7 @@ describe("Event types Endpoints", () => {
       );
       expect(fetchedEventType.hideCalendarNotes).toEqual(eventType.hideCalendarNotes);
       expect(fetchedEventType.hideCalendarEventDetails).toEqual(eventType.hideCalendarEventDetails);
+      expect(fetchedEventType.hideOrganizerEmail).toEqual(eventType.hideOrganizerEmail);
       expect(fetchedEventType.lockTimeZoneToggleOnBookingPage).toEqual(
         eventType.lockTimeZoneToggleOnBookingPage
       );
@@ -1009,6 +1012,7 @@ describe("Event types Endpoints", () => {
         requiresBookerEmailVerification: true,
         hideCalendarNotes: true,
         hideCalendarEventDetails: true,
+        hideOrganizerEmail: true,
         lockTimeZoneToggleOnBookingPage: true,
         color: {
           darkThemeHex: "#292929",
@@ -1073,6 +1077,7 @@ describe("Event types Endpoints", () => {
           );
           expect(updatedEventType.hideCalendarNotes).toEqual(body.hideCalendarNotes);
           expect(updatedEventType.hideCalendarEventDetails).toEqual(body.hideCalendarEventDetails);
+          expect(updatedEventType.hideOrganizerEmail).toEqual(body.hideOrganizerEmail);
           expect(updatedEventType.lockTimeZoneToggleOnBookingPage).toEqual(
             body.lockTimeZoneToggleOnBookingPage
           );
@@ -1093,6 +1098,7 @@ describe("Event types Endpoints", () => {
           eventType.requiresBookerEmailVerification = updatedEventType.requiresBookerEmailVerification;
           eventType.hideCalendarNotes = updatedEventType.hideCalendarNotes;
           eventType.hideCalendarEventDetails = updatedEventType.hideCalendarEventDetails;
+          eventType.hideOrganizerEmail = updatedEventType.hideOrganizerEmail;
           eventType.lockTimeZoneToggleOnBookingPage = updatedEventType.lockTimeZoneToggleOnBookingPage;
           eventType.color = updatedEventType.color;
           eventType.bookingFields = updatedEventType.bookingFields;
@@ -1163,6 +1169,7 @@ describe("Event types Endpoints", () => {
       );
       expect(fetchedEventType.hideCalendarNotes).toEqual(eventType.hideCalendarNotes);
       expect(fetchedEventType.hideCalendarEventDetails).toEqual(eventType.hideCalendarEventDetails);
+      expect(fetchedEventType.hideOrganizerEmail).toEqual(eventType.hideOrganizerEmail);
       expect(fetchedEventType.lockTimeZoneToggleOnBookingPage).toEqual(
         eventType.lockTimeZoneToggleOnBookingPage
       );
@@ -1204,6 +1211,7 @@ describe("Event types Endpoints", () => {
       );
       expect(fetchedEventType.hideCalendarNotes).toEqual(eventType.hideCalendarNotes);
       expect(fetchedEventType.hideCalendarEventDetails).toEqual(eventType.hideCalendarEventDetails);
+      expect(fetchedEventType.hideOrganizerEmail).toEqual(eventType.hideOrganizerEmail);
       expect(fetchedEventType.lockTimeZoneToggleOnBookingPage).toEqual(
         eventType.lockTimeZoneToggleOnBookingPage
       );

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

@@ -87,6 +87,7 @@ type Input = Pick<
   | "destinationCalendar"
   | "useEventTypeDestinationCalendarEmail"
   | "hideCalendarEventDetails"
+  | "hideOrganizerEmail"
 >;
 
 @Injectable()
@@ -123,6 +124,7 @@ export class OutputEventTypesService_2024_06_14 {
       seatsShowAttendees,
       useEventTypeDestinationCalendarEmail,
       hideCalendarEventDetails,
+      hideOrganizerEmail,
     } = databaseEventType;
 
     const locations = this.transformLocations(databaseEventType.locations);
@@ -197,6 +199,7 @@ export class OutputEventTypesService_2024_06_14 {
       destinationCalendar,
       useDestinationCalendarEmail: useEventTypeDestinationCalendarEmail,
       hideCalendarEventDetails,
+      hideOrganizerEmail,
     };
   }
 

apps/api/v2/src/lib/endpoint-throttler-decorator.ts

@@ -0,0 +1,4 @@
+import { RateLimitType } from "@/lib/throttler-guard";
+import { Reflector } from "@nestjs/core";
+
+export const Throttle = Reflector.createDecorator<RateLimitType>();

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

@@ -1,5 +1,6 @@
 import { getEnv } from "@/env";
 import { hashAPIKey, isApiKey, stripApiKey } from "@/lib/api-key";
+import { Throttle } from "@/lib/endpoint-throttler-decorator";
 import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
 import { ThrottlerStorageRedisService } from "@nest-lab/throttler-storage-redis";
 import { Inject, Injectable, Logger, UnauthorizedException } from "@nestjs/common";
@@ -22,7 +23,7 @@ const rateLimitSchema = z.object({
   ttl: z.number(),
   blockDuration: z.number(),
 });
-type RateLimitType = z.infer<typeof rateLimitSchema>;
+export type RateLimitType = z.infer<typeof rateLimitSchema>;
 const rateLimitsSchema = z.array(rateLimitSchema);
 
 const sixtySecondsMs = 60 * 1000;
@@ -52,7 +53,7 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
 
   protected async handleRequest(requestProps: ThrottlerRequest): Promise<boolean> {
     const { context } = requestProps;
-
+    const throttleOptions = this.reflector.get(Throttle, context.getHandler());
     const request = context.switchToHttp().getRequest<Request>();
     const IP = request?.headers?.["cf-connecting-ip"] ?? request?.headers?.["CF-Connecting-IP"] ?? request.ip;
     const response = context.switchToHttp().getResponse<Response>();
@@ -63,6 +64,10 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
       )}", OAuth client ID "${request.get(X_CAL_CLIENT_ID)}" and IP "${IP}"`
     );
 
+    if (throttleOptions) {
+      return this.handleApiEndpointThrottle(tracker, throttleOptions, response);
+    }
+
     if (tracker.startsWith("api_key_")) {
       return this.handleApiKeyRequest(tracker, response);
     } else {
@@ -70,6 +75,15 @@ export class CustomThrottlerGuard extends ThrottlerGuard {
     }
   }
 
+  private async handleApiEndpointThrottle(tracker: string, options: RateLimitType, response: Response) {
+    const { isBlocked } = await this.incrementRateLimit(`${tracker}_${options.name}`, options, response);
+    if (isBlocked) {
+      throw new ThrottlerException("CustomThrottlerGuard - Too many requests. Please try again later.");
+    }
+
+    return true;
+  }
+
   private async handleApiKeyRequest(tracker: string, response: Response): Promise<boolean> {
     const rateLimits = await this.getRateLimitsForApiKeyTracker(tracker);
 

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

@@ -20,6 +20,7 @@ import {
   HttpCode,
   HttpStatus,
   Logger,
+  Delete,
 } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import { ApiExcludeController } from "@nestjs/swagger";
@@ -96,6 +97,19 @@ export class BillingController {
     };
   }
 
+  @Delete("/:organizationId/unsubscribe")
+  @UseGuards(NextAuthGuard, OrganizationRolesGuard)
+  @MembershipRoles(["OWNER", "ADMIN"])
+  async cancelTeamSubscriptionInStripe(
+    @Param("organizationId") organizationId: number
+  ): Promise<ApiResponse> {
+    await this.billingService.cancelTeamSubscription(organizationId);
+
+    return {
+      status: "success",
+    };
+  }
+
   @Post("/webhook")
   @HttpCode(HttpStatus.OK)
   async stripeWebhook(

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

@@ -7,6 +7,7 @@ import { OrganizationsRepository } from "@/modules/organizations/index/organizat
 import { StripeService } from "@/modules/stripe/stripe.service";
 import { InjectQueue } from "@nestjs/bull";
 import {
+  BadRequestException,
   Injectable,
   InternalServerErrorException,
   Logger,
@@ -313,6 +314,28 @@ export class BillingService implements OnModuleDestroy {
     }
   }
 
+  async cancelTeamSubscription(teamId: number) {
+    const teamWithBilling = await this.teamsRepository.findByIdIncludeBilling(teamId);
+    const customerId = teamWithBilling?.platformBilling?.customerId;
+
+    if (!customerId) {
+      throw new NotFoundException("No customer id found for team in Stripe");
+    }
+
+    if (!teamWithBilling?.platformBilling || !teamWithBilling?.platformBilling.subscriptionId) {
+      throw new NotFoundException("Team plan not found");
+    }
+
+    try {
+      await this.stripeService
+        .getStripe()
+        .subscriptions.cancel(teamWithBilling?.platformBilling?.subscriptionId);
+    } catch (error) {
+      this.logger.log(error, "error while cancelling team subscription in stripe");
+      throw new BadRequestException("Failed to cancel team subscription");
+    }
+  }
+
   async onModuleDestroy() {
     try {
       await this.billingQueue.close();

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

@@ -11,6 +11,7 @@ import { OrganizationsUsersBookingsModule } from "@/modules/organizations/users/
 import { RouterModule } from "@/modules/router/router.module";
 import { StripeModule } from "@/modules/stripe/stripe.module";
 import { TimezoneModule } from "@/modules/timezones/timezones.module";
+import { VerifiedResourcesModule } from "@/modules/verified-resources/verified-resources.module";
 import type { MiddlewareConsumer, NestModule } from "@nestjs/common";
 import { Module } from "@nestjs/common";
 
@@ -33,6 +34,7 @@ import { WebhooksModule } from "./webhooks/webhooks.module";
     OrganizationsUsersBookingsModule,
     OrganizationsBookingsModule,
     OrganizationsRoutingFormsModule,
+    VerifiedResourcesModule,
     RouterModule,
   ],
 })

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

@@ -63,6 +63,7 @@ export class MembershipsRepository {
   async createMembership(teamId: number, userId: number, role: MembershipRole, accepted: boolean) {
     const membership = await this.dbRead.prisma.membership.create({
       data: {
+        createdAt: new Date(),
         role,
         teamId,
         userId,

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

@@ -340,6 +340,7 @@ describe("Organizations Event Types Endpoints", () => {
         requiresBookerEmailVerification: true,
         hideCalendarNotes: true,
         hideCalendarEventDetails: true,
+        hideOrganizerEmail: true,
         lockTimeZoneToggleOnBookingPage: true,
         color: {
           darkThemeHex: "#292929",
@@ -371,6 +372,7 @@ describe("Organizations Event Types Endpoints", () => {
           expect(data.requiresBookerEmailVerification).toEqual(body.requiresBookerEmailVerification);
           expect(data.hideCalendarNotes).toEqual(body.hideCalendarNotes);
           expect(data.hideCalendarEventDetails).toEqual(body.hideCalendarEventDetails);
+          expect(data.hideOrganizerEmail).toEqual(body.hideOrganizerEmail);
           expect(data.lockTimeZoneToggleOnBookingPage).toEqual(body.lockTimeZoneToggleOnBookingPage);
           expect(data.color).toEqual(body.color);
           expect(data.successRedirectUrl).toEqual("https://masterchief.com/argentina/flan/video/1234");
@@ -1099,6 +1101,7 @@ describe("Organizations Event Types Endpoints", () => {
         requiresBookerEmailVerification: true,
         hideCalendarNotes: true,
         hideCalendarEventDetails: true,
+        hideOrganizerEmail: true,
         lockTimeZoneToggleOnBookingPage: true,
         color: {
           darkThemeHex: "#292929",
@@ -1130,6 +1133,7 @@ describe("Organizations Event Types Endpoints", () => {
           expect(data.requiresBookerEmailVerification).toEqual(body.requiresBookerEmailVerification);
           expect(data.hideCalendarNotes).toEqual(body.hideCalendarNotes);
           expect(data.hideCalendarEventDetails).toEqual(body.hideCalendarEventDetails);
+          expect(data.hideOrganizerEmail).toEqual(body.hideOrganizerEmail);
           expect(data.lockTimeZoneToggleOnBookingPage).toEqual(body.lockTimeZoneToggleOnBookingPage);
           expect(data.color).toEqual(body.color);
           expect(data.successRedirectUrl).toEqual("https://masterchief.com/argentina/flan/video/1234");

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

@@ -70,6 +70,7 @@ type Input = Pick<
   | "eventName"
   | "useEventTypeDestinationCalendarEmail"
   | "hideCalendarEventDetails"
+  | "hideOrganizerEmail"
   | "team"
 >;
 

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

@@ -69,7 +69,11 @@ export class OrganizationsTeamsMembershipsRepository {
 
   async createOrgTeamMembership(teamId: number, data: CreateOrgTeamMembershipDto) {
     return this.dbWrite.prisma.membership.create({
-      data: { ...data, teamId: teamId },
+      data: {
+        createdAt: new Date(),
+        ...data,
+        teamId: teamId,
+      },
       include: { user: { select: MembershipUserSelect } },
     });
   }

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

@@ -6,6 +6,7 @@ import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
 import { PlatformPlanGuard } from "@/modules/auth/guards/billing/platform-plan.guard";
 import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-admin-api-enabled.guard";
 import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
+import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
 import { IsRoutingFormInTeam } from "@/modules/auth/guards/routing-forms/is-routing-form-in-team.guard";
 import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
 import { GetRoutingFormResponsesParams } from "@/modules/organizations/routing-forms/inputs/get-routing-form-responses-params.input";
@@ -29,6 +30,7 @@ import { SUCCESS_STATUS } from "@calcom/platform-constants";
   IsTeamInOrg,
   IsRoutingFormInTeam,
   PlatformPlanGuard,
+  RolesGuard,
   IsAdminAPIEnabledGuard
 )
 @ApiHeader(API_KEY_HEADER)

apps/api/v2/src/modules/organizations/teams/verified-resources/org-teams-verified-resources.controller.e2e-spec.ts

@@ -0,0 +1,236 @@
+import { bootstrap } from "@/app";
+import { AppModule } from "@/app.module";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { TokensModule } from "@/modules/tokens/tokens.module";
+import { UsersModule } from "@/modules/users/users.module";
+import { RequestEmailVerificationInput } from "@/modules/verified-resources/inputs/request-email-verification.input";
+import { VerifyEmailInput } from "@/modules/verified-resources/inputs/verify-email.input";
+import {
+  TeamVerifiedEmailOutput,
+  TeamVerifiedEmailsOutput,
+} from "@/modules/verified-resources/outputs/verified-email.output";
+import {
+  TeamVerifiedPhoneOutput,
+  TeamVerifiedPhonesOutput,
+} from "@/modules/verified-resources/outputs/verified-phone.output";
+import { INestApplication } from "@nestjs/common";
+import { NestExpressApplication } from "@nestjs/platform-express";
+import { Test } from "@nestjs/testing";
+import { TOTP as TOTPtoMock } from "@otplib/core";
+import { User } from "@prisma/client";
+import { totp } from "otplib";
+import * as request from "supertest";
+import { ApiKeysRepositoryFixture } from "test/fixtures/repository/api-keys.repository.fixture";
+import { MembershipRepositoryFixture } from "test/fixtures/repository/membership.repository.fixture";
+import { OrganizationRepositoryFixture } from "test/fixtures/repository/organization.repository.fixture";
+import { ProfileRepositoryFixture } from "test/fixtures/repository/profiles.repository.fixture";
+import { TeamRepositoryFixture } from "test/fixtures/repository/team.repository.fixture";
+import { UserRepositoryFixture } from "test/fixtures/repository/users.repository.fixture";
+import { VerifiedResourcesRepositoryFixtures } from "test/fixtures/repository/verified-resources.repository.fixture";
+import { randomString } from "test/utils/randomString";
+
+import { AttendeeVerifyEmail } from "@calcom/platform-libraries/emails";
+import { Team } from "@calcom/prisma/client";
+
+jest.spyOn(totp, "generate").mockImplementation(function () {
+  return "1234";
+});
+
+jest.spyOn(TOTPtoMock.prototype, "check").mockImplementation(function () {
+  return true;
+});
+
+jest
+  .spyOn(AttendeeVerifyEmail.prototype as any, "getNodeMailerPayload")
+  .mockImplementation(async function () {
+    return {
+      to: `testnotrealemail@notreal.com`,
+      from: `testnotrealemail@notreal.com`,
+      subject: "No Subject",
+      html: "<html><body>Mocked Email Content</body></html>",
+      text: "body",
+    };
+  });
+
+describe("Organizations Teams Verified Resources", () => {
+  let app: INestApplication;
+
+  let userRepositoryFixture: UserRepositoryFixture;
+  let organizationsRepositoryFixture: OrganizationRepositoryFixture;
+  let verifiedResourcesRepositoryFixtures: VerifiedResourcesRepositoryFixtures;
+  let teamsRepositoryFixture: TeamRepositoryFixture;
+  let profileRepositoryFixture: ProfileRepositoryFixture;
+  let apiKeysRepositoryFixture: ApiKeysRepositoryFixture;
+  let membershipsRepositoryFixture: MembershipRepositoryFixture;
+
+  let org: Team;
+  let orgTeam: Team;
+  const emailToVerify = `org-team-e2e-verified-resources-${randomString()}@example.com`;
+  const phoneToVerify = "+37255556666";
+  const authEmail = `organizations-verified-resources-responses-user-${randomString()}@api.com`;
+  let user: User;
+  let apiKeyString: string;
+  let verifiedEmailId: number;
+  let verifiedPhoneId: number;
+
+  beforeAll(async () => {
+    const moduleRef = await Test.createTestingModule({
+      imports: [AppModule, PrismaModule, UsersModule, TokensModule],
+    }).compile();
+
+    verifiedResourcesRepositoryFixtures = new VerifiedResourcesRepositoryFixtures(moduleRef);
+    userRepositoryFixture = new UserRepositoryFixture(moduleRef);
+    organizationsRepositoryFixture = new OrganizationRepositoryFixture(moduleRef);
+    teamsRepositoryFixture = new TeamRepositoryFixture(moduleRef);
+    profileRepositoryFixture = new ProfileRepositoryFixture(moduleRef);
+    apiKeysRepositoryFixture = new ApiKeysRepositoryFixture(moduleRef);
+    membershipsRepositoryFixture = new MembershipRepositoryFixture(moduleRef);
+
+    org = await organizationsRepositoryFixture.create({
+      name: `organizations-verified-resources-responses-organization-${randomString()}`,
+      isOrganization: true,
+    });
+
+    user = await userRepositoryFixture.create({
+      email: authEmail,
+      username: authEmail,
+    });
+
+    const { keyString } = await apiKeysRepositoryFixture.createApiKey(user.id, null);
+    apiKeyString = keyString;
+
+    orgTeam = await teamsRepositoryFixture.create({
+      name: `organizations-verified-resources-responses-team-${randomString()}`,
+      isOrganization: false,
+      parent: { connect: { id: org.id } },
+    });
+
+    await membershipsRepositoryFixture.create({
+      role: "ADMIN",
+      user: { connect: { id: user.id } },
+      team: { connect: { id: org.id } },
+    });
+
+    await membershipsRepositoryFixture.create({
+      role: "ADMIN",
+      user: { connect: { id: user.id } },
+      team: { connect: { id: orgTeam.id } },
+    });
+
+    await profileRepositoryFixture.create({
+      uid: `usr-${user.id}`,
+      username: authEmail,
+      organization: {
+        connect: {
+          id: org.id,
+        },
+      },
+      user: {
+        connect: {
+          id: user.id,
+        },
+      },
+    });
+
+    verifiedPhoneId = (
+      await verifiedResourcesRepositoryFixtures.createPhone({
+        phoneNumber: phoneToVerify,
+        user: { connect: { id: user.id } },
+        team: {
+          connect: {
+            id: orgTeam.id,
+          },
+        },
+      })
+    ).id;
+
+    app = moduleRef.createNestApplication();
+    bootstrap(app as NestExpressApplication);
+
+    await app.init();
+  });
+
+  it("should trigger email verification code", async () => {
+    return request(app.getHttpServer())
+      .post(
+        `/v2/organizations/${org.id}/teams/${orgTeam.id}/verified-resources/emails/verification-code/request`
+      )
+      .send({ email: emailToVerify } satisfies RequestEmailVerificationInput)
+      .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+      .expect(200);
+  });
+
+  it("should verify email", async () => {
+    return request(app.getHttpServer())
+      .post(
+        `/v2/organizations/${org.id}/teams/${orgTeam.id}/verified-resources/emails/verification-code/verify`
+      )
+      .send({ email: emailToVerify, code: "1234" } satisfies VerifyEmailInput)
+      .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+      .expect(200)
+      .then((res) => {
+        const response = res.body as TeamVerifiedEmailOutput;
+        verifiedEmailId = response.data.id;
+        expect(response.data.email).toEqual(emailToVerify);
+        expect(response.data.teamId).toEqual(orgTeam.id);
+      });
+  });
+
+  it("should fetch verified email by id", async () => {
+    return request(app.getHttpServer())
+      .get(`/v2/organizations/${org.id}/teams/${orgTeam.id}/verified-resources/emails/${verifiedEmailId}`)
+      .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+      .expect(200)
+      .then((res) => {
+        const response = res.body as TeamVerifiedEmailOutput;
+        expect(response.data.email).toEqual(emailToVerify);
+        expect(response.data.teamId).toEqual(orgTeam.id);
+      });
+  });
+
+  it("should fetch verified number by id", async () => {
+    return request(app.getHttpServer())
+      .get(`/v2/organizations/${org.id}/teams/${orgTeam.id}/verified-resources/phones/${verifiedPhoneId}`)
+      .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+      .expect(200)
+      .then((res) => {
+        const response = res.body as TeamVerifiedPhoneOutput;
+        expect(response.data.phoneNumber).toEqual(phoneToVerify);
+        expect(response.data.teamId).toEqual(orgTeam.id);
+      });
+  });
+
+  it("should fetch verified emails", async () => {
+    return request(app.getHttpServer())
+      .get(`/v2/organizations/${org.id}/teams/${orgTeam.id}/verified-resources/emails`)
+      .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+      .expect(200)
+      .then((res) => {
+        const response = res.body as TeamVerifiedEmailsOutput;
+        expect(response.data.find((verifiedEmail) => verifiedEmail.email === emailToVerify)).toBeDefined();
+        expect(response.data.find((verifiedEmail) => verifiedEmail.teamId === orgTeam.id)).toBeDefined();
+      });
+  });
+
+  it("should fetch verified phones", async () => {
+    return request(app.getHttpServer())
+      .get(`/v2/organizations/${org.id}/teams/${orgTeam.id}/verified-resources/phones`)
+      .set({ Authorization: `Bearer cal_test_${apiKeyString}` })
+      .expect(200)
+      .then((res) => {
+        const response = res.body as TeamVerifiedPhonesOutput;
+        expect(
+          response.data.find((verifiedPhone) => verifiedPhone.phoneNumber === phoneToVerify)
+        ).toBeDefined();
+        expect(response.data.find((verifiedPhone) => verifiedPhone.teamId === orgTeam.id)).toBeDefined();
+      });
+  });
+
+  afterAll(async () => {
+    await verifiedResourcesRepositoryFixtures.deleteEmailById(verifiedEmailId);
+    await verifiedResourcesRepositoryFixtures.deletePhoneById(verifiedPhoneId);
+    await userRepositoryFixture.deleteByEmail(user.email);
+    await organizationsRepositoryFixture.delete(org.id);
+    await app.close();
+  });
+});

apps/api/v2/src/modules/organizations/teams/verified-resources/org-teams-verified-resources.controller.ts

@@ -0,0 +1,256 @@
+import { API_KEY_OR_ACCESS_TOKEN_HEADER } from "@/lib/docs/headers";
+import { Throttle } from "@/lib/endpoint-throttler-decorator";
+import { PlatformPlan } from "@/modules/auth/decorators/billing/platform-plan.decorator";
+import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { PlatformPlanGuard } from "@/modules/auth/guards/billing/platform-plan.guard";
+import { IsAdminAPIEnabledGuard } from "@/modules/auth/guards/organizations/is-admin-api-enabled.guard";
+import { IsOrgGuard } from "@/modules/auth/guards/organizations/is-org.guard";
+import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
+import { IsTeamInOrg } from "@/modules/auth/guards/teams/is-team-in-org.guard";
+import { RequestEmailVerificationInput } from "@/modules/verified-resources/inputs/request-email-verification.input";
+import { RequestPhoneVerificationInput } from "@/modules/verified-resources/inputs/request-phone-verification.input";
+import { VerifyEmailInput } from "@/modules/verified-resources/inputs/verify-email.input";
+import { VerifyPhoneInput } from "@/modules/verified-resources/inputs/verify-phone.input";
+import { RequestEmailVerificationOutput } from "@/modules/verified-resources/outputs/request-email-verification-output";
+import { RequestPhoneVerificationOutput } from "@/modules/verified-resources/outputs/request-phone-verification-output";
+import {
+  TeamVerifiedEmailOutput,
+  TeamVerifiedEmailOutputData,
+  TeamVerifiedEmailsOutput,
+} from "@/modules/verified-resources/outputs/verified-email.output";
+import {
+  TeamVerifiedPhoneOutput,
+  TeamVerifiedPhoneOutputData,
+  TeamVerifiedPhonesOutput,
+} from "@/modules/verified-resources/outputs/verified-phone.output";
+import { VerifiedResourcesService } from "@/modules/verified-resources/services/verified-resources.service";
+import {
+  Body,
+  Controller,
+  Get,
+  HttpCode,
+  HttpStatus,
+  Param,
+  ParseIntPipe,
+  Post,
+  Query,
+  UseGuards,
+} from "@nestjs/common";
+import { ApiHeader, ApiOperation, ApiTags } from "@nestjs/swagger";
+import { plainToClass } from "class-transformer";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+import { SkipTakePagination } from "@calcom/platform-types";
+
+@Controller({
+  path: "/v2/organizations/:orgId/teams/:teamId/verified-resources",
+})
+@UseGuards(ApiAuthGuard, IsOrgGuard, RolesGuard, IsTeamInOrg, PlatformPlanGuard, IsAdminAPIEnabledGuard)
+@ApiTags("Organization Team Verified Resources")
+export class OrgTeamsVerifiedResourcesController {
+  constructor(private readonly verifiedResourcesService: VerifiedResourcesService) {}
+  @ApiOperation({
+    summary: "Request Email Verification Code",
+    description: `Sends a verification code to the email.`,
+  })
+  @Roles("TEAM_ADMIN")
+  @Throttle({
+    limit: 3,
+    ttl: 60000,
+    blockDuration: 60000,
+    name: "org_teams_verified_resources_emails_requests",
+  })
+  @PlatformPlan("ESSENTIALS")
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Post("/emails/verification-code/request")
+  @HttpCode(HttpStatus.OK)
+  async requestEmailVerificationCode(
+    @Body() body: RequestEmailVerificationInput,
+    @GetUser("username") username: string,
+    @GetUser("locale") locale: string
+  ): Promise<RequestEmailVerificationOutput> {
+    const verificationCodeRequest = await this.verifiedResourcesService.requestEmailVerificationCode(
+      { username, locale },
+      body.email
+    );
+
+    return {
+      status: verificationCodeRequest ? SUCCESS_STATUS : ERROR_STATUS,
+    };
+  }
+
+  @ApiOperation({
+    summary: "Request Phone Number Verification Code",
+    description: `Sends a verification code to the phone number.`,
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Roles("TEAM_ADMIN")
+  @Throttle({
+    limit: 3,
+    ttl: 60000,
+    blockDuration: 60000,
+    name: "org_teams_verified_resources_phones_requests",
+  })
+  @Post("/phones/verification-code/request")
+  @HttpCode(HttpStatus.OK)
+  async requestPhoneVerificationCode(
+    @Body() body: RequestPhoneVerificationInput
+  ): Promise<RequestPhoneVerificationOutput> {
+    const verificationCodeRequest = await this.verifiedResourcesService.requestPhoneVerificationCode(
+      body.phone
+    );
+
+    return {
+      status: verificationCodeRequest ? SUCCESS_STATUS : ERROR_STATUS,
+    };
+  }
+
+  @ApiOperation({
+    summary: "Verify an email for an org team.",
+    description: `Use code to verify an email`,
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Roles("TEAM_ADMIN")
+  @PlatformPlan("ESSENTIALS")
+  @Post("/emails/verification-code/verify")
+  @HttpCode(HttpStatus.OK)
+  async verifyEmail(
+    @Body() body: VerifyEmailInput,
+    @GetUser("id") userId: number,
+    @Param("teamId", ParseIntPipe) teamId: number
+  ): Promise<TeamVerifiedEmailOutput> {
+    const verifiedEmail = await this.verifiedResourcesService.verifyEmail(
+      userId,
+      body.email,
+      body.code,
+      teamId
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(TeamVerifiedEmailOutputData, verifiedEmail),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Verify a phone number for an org team.",
+    description: `Use code to verify a phone number`,
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Roles("TEAM_ADMIN")
+  @PlatformPlan("ESSENTIALS")
+  @Post("/phones/verification-code/verify")
+  @Throttle({
+    limit: 3,
+    ttl: 60000,
+    blockDuration: 60000,
+    name: "org_teams_verified_resources_phones_verify",
+  })
+  @HttpCode(HttpStatus.OK)
+  async verifyPhoneNumber(
+    @Body() body: VerifyPhoneInput,
+    @GetUser("id") userId: number,
+    @Param("teamId", ParseIntPipe) teamId: number
+  ): Promise<TeamVerifiedPhoneOutput> {
+    const verifiedPhone = await this.verifiedResourcesService.verifyPhone(
+      userId,
+      body.phone,
+      body.code,
+      teamId
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(TeamVerifiedPhoneOutputData, verifiedPhone),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Get list of verified emails of an org team.",
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Roles("TEAM_ADMIN")
+  @PlatformPlan("ESSENTIALS")
+  @Get("/emails")
+  @HttpCode(HttpStatus.OK)
+  async getVerifiedEmails(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Query() pagination: SkipTakePagination
+  ): Promise<TeamVerifiedEmailsOutput> {
+    const verifiedEmails = await this.verifiedResourcesService.getTeamVerifiedEmails(
+      teamId,
+      pagination?.skip ?? 0,
+      pagination?.take ?? 250
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: verifiedEmails.map((verifiedEmail) => plainToClass(TeamVerifiedEmailOutputData, verifiedEmail)),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Get list of verified phone numbers of an org team.",
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @PlatformPlan("ESSENTIALS")
+  @Get("/phones")
+  @Roles("TEAM_ADMIN")
+  @HttpCode(HttpStatus.OK)
+  async getVerifiedPhoneNumbers(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Query() pagination: SkipTakePagination
+  ): Promise<TeamVerifiedPhonesOutput> {
+    const verifiedPhoneNumbers = await this.verifiedResourcesService.getTeamVerifiedPhoneNumbers(
+      teamId,
+      pagination?.skip ?? 0,
+      pagination?.take ?? 250
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: verifiedPhoneNumbers.map((verifiedPhoneNumber) =>
+        plainToClass(TeamVerifiedPhoneOutputData, verifiedPhoneNumber)
+      ),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Get verified email of an org team by id.",
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Roles("TEAM_ADMIN")
+  @PlatformPlan("ESSENTIALS")
+  @Get("/emails/:id")
+  @HttpCode(HttpStatus.OK)
+  async getVerifiedEmailById(
+    @Param("id") id: number,
+    @Param("teamId", ParseIntPipe) teamId: number
+  ): Promise<TeamVerifiedEmailOutput> {
+    const verifiedEmail = await this.verifiedResourcesService.getTeamVerifiedEmailById(teamId, id);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(TeamVerifiedEmailOutputData, verifiedEmail),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Get verified phone number of an org team by id.",
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Roles("TEAM_ADMIN")
+  @PlatformPlan("ESSENTIALS")
+  @Get("/phones/:id")
+  @HttpCode(HttpStatus.OK)
+  async getVerifiedPhoneById(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("id") id: number
+  ): Promise<TeamVerifiedPhoneOutput> {
+    const verifiedPhoneNumber = await this.verifiedResourcesService.getTeamVerifiedPhoneNumberById(
+      teamId,
+      id
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(TeamVerifiedPhoneOutputData, verifiedPhoneNumber),
+    };
+  }
+}

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

@@ -38,7 +38,7 @@ export class OrganizationsUsersRepository {
         member: {
           teamId: orgId,
           ...(teamIds && { user: { teams: { some: { teamId: { in: teamIds } } } } }),
-          // Filter to only get users which have ALL of the assigned attribue options
+          // Filter to only get users which have ALL of the assigned attribute options
           ...(attributeQueryOperator === "AND" && {
             AND: assignedOptionIds.map((optionId) => ({
               AttributeToUser: { some: { attributeOptionId: optionId } },
@@ -46,11 +46,11 @@ export class OrganizationsUsersRepository {
           }),
         },
         ...(emailArray && emailArray.length ? { email: { in: emailArray } } : {}),
-        // Filter to get users which have AT LEAST ONE of the assigned attribue options
+        // Filter to get users which have AT LEAST ONE of the assigned attribute options
         ...(attributeQueryOperator === "OR" && {
           attributeOption: { id: { in: assignedOptionIds } },
         }),
-        // Filter to  get users that have NONE the assigned attribue options
+        // Filter to  get users that have NONE the assigned attribute options
         ...(attributeQueryOperator === "NONE" && {
           NOT: {
             attributeOption: { id: { in: assignedOptionIds } },

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

@@ -312,6 +312,7 @@ describe("Organizations Event Types Endpoints", () => {
         requiresBookerEmailVerification: true,
         hideCalendarNotes: true,
         hideCalendarEventDetails: true,
+        hideOrganizerEmail: true,
         lockTimeZoneToggleOnBookingPage: true,
         color: {
           darkThemeHex: "#292929",
@@ -343,6 +344,7 @@ describe("Organizations Event Types Endpoints", () => {
           expect(data.requiresBookerEmailVerification).toEqual(body.requiresBookerEmailVerification);
           expect(data.hideCalendarNotes).toEqual(body.hideCalendarNotes);
           expect(data.hideCalendarEventDetails).toEqual(body.hideCalendarEventDetails);
+          expect(data.hideOrganizerEmail).toEqual(body.hideOrganizerEmail);
           expect(data.lockTimeZoneToggleOnBookingPage).toEqual(body.lockTimeZoneToggleOnBookingPage);
           expect(data.color).toEqual(body.color);
 

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

@@ -21,7 +21,11 @@ export class TeamsMembershipsRepository {
 
   async createTeamMembership(teamId: number, data: CreateTeamMembershipInput) {
     return this.dbWrite.prisma.membership.create({
-      data: { ...data, teamId: teamId },
+      data: {
+        createdAt: new Date(),
+        ...data,
+        teamId: teamId,
+      },
       include: { user: { select: MembershipUserSelect } },
     });
   }

apps/api/v2/src/modules/teams/verified-resources/teams-verified-resources.controller.ts

@@ -0,0 +1,229 @@
+import { API_KEY_OR_ACCESS_TOKEN_HEADER } from "@/lib/docs/headers";
+import { Throttle } from "@/lib/endpoint-throttler-decorator";
+import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
+import { Roles } from "@/modules/auth/decorators/roles/roles.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { RolesGuard } from "@/modules/auth/guards/roles/roles.guard";
+import { RequestEmailVerificationInput } from "@/modules/verified-resources/inputs/request-email-verification.input";
+import { RequestPhoneVerificationInput } from "@/modules/verified-resources/inputs/request-phone-verification.input";
+import { VerifyEmailInput } from "@/modules/verified-resources/inputs/verify-email.input";
+import { VerifyPhoneInput } from "@/modules/verified-resources/inputs/verify-phone.input";
+import { RequestEmailVerificationOutput } from "@/modules/verified-resources/outputs/request-email-verification-output";
+import { RequestPhoneVerificationOutput } from "@/modules/verified-resources/outputs/request-phone-verification-output";
+import {
+  TeamVerifiedEmailOutput,
+  TeamVerifiedEmailOutputData,
+  TeamVerifiedEmailsOutput,
+} from "@/modules/verified-resources/outputs/verified-email.output";
+import {
+  TeamVerifiedPhoneOutput,
+  TeamVerifiedPhoneOutputData,
+  TeamVerifiedPhonesOutput,
+} from "@/modules/verified-resources/outputs/verified-phone.output";
+import { VerifiedResourcesService } from "@/modules/verified-resources/services/verified-resources.service";
+import {
+  Body,
+  Controller,
+  Get,
+  HttpCode,
+  HttpStatus,
+  Param,
+  ParseIntPipe,
+  Post,
+  Query,
+  UseGuards,
+} from "@nestjs/common";
+import { ApiHeader, ApiOperation, ApiTags } from "@nestjs/swagger";
+import { plainToClass } from "class-transformer";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+import { SkipTakePagination } from "@calcom/platform-types";
+
+@Controller({
+  path: "/v2/teams/:teamId/verified-resources",
+})
+@UseGuards(ApiAuthGuard, RolesGuard)
+@ApiTags("Teams Verified Resources")
+export class TeamsVerifiedResourcesController {
+  constructor(private readonly verifiedResourcesService: VerifiedResourcesService) {}
+  @ApiOperation({
+    summary: "Request Email Verification Code",
+    description: `Sends a verification code to the Email.`,
+  })
+  @Roles("TEAM_ADMIN")
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Post("/emails/verification-code/request")
+  @Throttle({ limit: 5, ttl: 60000, blockDuration: 60000, name: "teams_verified_resources_emails_requests" })
+  @HttpCode(HttpStatus.OK)
+  async requestEmailVerificationCode(
+    @Body() body: RequestEmailVerificationInput,
+    @GetUser("username") username: string,
+    @GetUser("locale") locale: string
+  ): Promise<RequestEmailVerificationOutput> {
+    const verificationCodeRequest = await this.verifiedResourcesService.requestEmailVerificationCode(
+      { username, locale },
+      body.email
+    );
+
+    return {
+      status: verificationCodeRequest ? SUCCESS_STATUS : ERROR_STATUS,
+    };
+  }
+
+  @ApiOperation({
+    summary: "Request Phone Number Verification Code",
+    description: `Sends a verification code to the phone number.`,
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Roles("TEAM_ADMIN")
+  @Post("/phones/verification-code/request")
+  @Throttle({ limit: 3, ttl: 60000, blockDuration: 60000, name: "teams_verified_resources_phones_requests" })
+  @HttpCode(HttpStatus.OK)
+  async requestPhoneVerificationCode(
+    @Body() body: RequestPhoneVerificationInput
+  ): Promise<RequestPhoneVerificationOutput> {
+    const verificationCodeRequest = await this.verifiedResourcesService.requestPhoneVerificationCode(
+      body.phone
+    );
+
+    return {
+      status: verificationCodeRequest ? SUCCESS_STATUS : ERROR_STATUS,
+    };
+  }
+
+  @ApiOperation({
+    summary: "Verify an email for a team.",
+    description: `Use code to verify an email`,
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Roles("TEAM_ADMIN")
+  @Post("/emails/verification-code/verify")
+  @HttpCode(HttpStatus.OK)
+  async verifyEmail(
+    @Body() body: VerifyEmailInput,
+    @GetUser("id") userId: number,
+    @Param("teamId", ParseIntPipe) teamId: number
+  ): Promise<TeamVerifiedEmailOutput> {
+    const verifiedEmail = await this.verifiedResourcesService.verifyEmail(
+      userId,
+      body.email,
+      body.code,
+      teamId
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(TeamVerifiedEmailOutputData, verifiedEmail),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Verify a phone number for an org team.",
+    description: `Use code to verify a phone number`,
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Roles("TEAM_ADMIN")
+  @Post("/phones/verification-code/verify")
+  @Throttle({ limit: 3, ttl: 60000, blockDuration: 60000, name: "teams_verified_resources_phones_verify" })
+  @HttpCode(HttpStatus.OK)
+  async verifyPhoneNumber(
+    @Body() body: VerifyPhoneInput,
+    @GetUser("id") userId: number,
+    @Param("teamId", ParseIntPipe) teamId: number
+  ): Promise<TeamVerifiedPhoneOutput> {
+    const verifiedPhone = await this.verifiedResourcesService.verifyPhone(
+      userId,
+      body.phone,
+      body.code,
+      teamId
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(TeamVerifiedPhoneOutputData, verifiedPhone),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Get list of verified emails of a team.",
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Roles("TEAM_ADMIN")
+  @Get("/emails")
+  @HttpCode(HttpStatus.OK)
+  async getVerifiedEmails(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Query() pagination: SkipTakePagination
+  ): Promise<TeamVerifiedEmailsOutput> {
+    const verifiedEmails = await this.verifiedResourcesService.getTeamVerifiedEmails(
+      teamId,
+      pagination?.skip ?? 0,
+      pagination?.take ?? 250
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: verifiedEmails.map((verifiedEmail) => plainToClass(TeamVerifiedEmailOutputData, verifiedEmail)),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Get list of verified phone numbers of a team.",
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Get("/phones")
+  @Roles("TEAM_ADMIN")
+  @HttpCode(HttpStatus.OK)
+  async getVerifiedPhoneNumbers(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Query() pagination: SkipTakePagination
+  ): Promise<TeamVerifiedPhonesOutput> {
+    const verifiedPhoneNumbers = await this.verifiedResourcesService.getTeamVerifiedPhoneNumbers(
+      teamId,
+      pagination?.skip ?? 0,
+      pagination?.take ?? 250
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: verifiedPhoneNumbers.map((verifiedPhoneNumber) =>
+        plainToClass(TeamVerifiedPhoneOutputData, verifiedPhoneNumber)
+      ),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Get verified email of a team by id.",
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Roles("TEAM_ADMIN")
+  @Get("/emails/:id")
+  @HttpCode(HttpStatus.OK)
+  async getVerifiedEmailById(
+    @Param("id") id: number,
+    @Param("teamId", ParseIntPipe) teamId: number
+  ): Promise<TeamVerifiedEmailOutput> {
+    const verifiedEmail = await this.verifiedResourcesService.getTeamVerifiedEmailById(teamId, id);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(TeamVerifiedEmailOutputData, verifiedEmail),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Get verified phone number of a team by id.",
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Roles("TEAM_ADMIN")
+  @Get("/phones/:id")
+  @HttpCode(HttpStatus.OK)
+  async getVerifiedPhoneById(
+    @Param("teamId", ParseIntPipe) teamId: number,
+    @Param("id") id: number
+  ): Promise<TeamVerifiedPhoneOutput> {
+    const verifiedPhoneNumber = await this.verifiedResourcesService.getTeamVerifiedPhoneNumberById(
+      teamId,
+      id
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(TeamVerifiedPhoneOutputData, verifiedPhoneNumber),
+    };
+  }
+}

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

@@ -149,7 +149,7 @@ export class TokensRepository {
       this.dbWrite.prisma.refreshToken.create({
         data: {
           // note(Lauris): I am leaving userId because it was before adding ownerId to standardize payload like in the createOAuthTokens function for
-          // backwards compatability.
+          // backwards compatibility.
           secret: this.jwtService.signRefreshToken({
             clientId,
             ownerId: tokenUserId,

apps/api/v2/src/modules/verified-resources/controllers/users-verified-resources.controller.ts

@@ -0,0 +1,196 @@
+import { API_KEY_OR_ACCESS_TOKEN_HEADER } from "@/lib/docs/headers";
+import { Throttle } from "@/lib/endpoint-throttler-decorator";
+import { GetUser } from "@/modules/auth/decorators/get-user/get-user.decorator";
+import { ApiAuthGuard } from "@/modules/auth/guards/api-auth/api-auth.guard";
+import { RequestEmailVerificationInput } from "@/modules/verified-resources/inputs/request-email-verification.input";
+import { RequestPhoneVerificationInput } from "@/modules/verified-resources/inputs/request-phone-verification.input";
+import { VerifyEmailInput } from "@/modules/verified-resources/inputs/verify-email.input";
+import { VerifyPhoneInput } from "@/modules/verified-resources/inputs/verify-phone.input";
+import { RequestEmailVerificationOutput } from "@/modules/verified-resources/outputs/request-email-verification-output";
+import { RequestPhoneVerificationOutput } from "@/modules/verified-resources/outputs/request-phone-verification-output";
+import {
+  UserVerifiedEmailOutput,
+  UserVerifiedEmailOutputData,
+  UserVerifiedEmailsOutput,
+} from "@/modules/verified-resources/outputs/verified-email.output";
+import {
+  UserVerifiedPhoneOutput,
+  UserVerifiedPhoneOutputData,
+  UserVerifiedPhonesOutput,
+} from "@/modules/verified-resources/outputs/verified-phone.output";
+import { VerifiedResourcesService } from "@/modules/verified-resources/services/verified-resources.service";
+import { Body, Controller, Get, HttpCode, HttpStatus, Param, Post, Query, UseGuards } from "@nestjs/common";
+import { ApiHeader, ApiOperation, ApiTags } from "@nestjs/swagger";
+import { plainToClass } from "class-transformer";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+import { SkipTakePagination } from "@calcom/platform-types";
+
+@Controller({
+  path: "/v2/verified-resources",
+})
+@UseGuards(ApiAuthGuard)
+@ApiTags("Verified Resources")
+export class UserVerifiedResourcesController {
+  constructor(private readonly verifiedResourcesService: VerifiedResourcesService) {}
+  @ApiOperation({
+    summary: "Request Email Verification Code",
+    description: `Sends a verification code to the email.`,
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Post("/emails/verification-code/request")
+  @HttpCode(HttpStatus.OK)
+  @Throttle({ limit: 5, ttl: 60000, blockDuration: 60000, name: "users_verified_resources_emails_requests" })
+  async requestEmailVerificationCode(
+    @Body() body: RequestEmailVerificationInput,
+    @GetUser("username") username: string,
+    @GetUser("locale") locale: string
+  ): Promise<RequestEmailVerificationOutput> {
+    const verificationCodeRequest = await this.verifiedResourcesService.requestEmailVerificationCode(
+      { username, locale },
+      body.email
+    );
+
+    return {
+      status: verificationCodeRequest ? SUCCESS_STATUS : ERROR_STATUS,
+    };
+  }
+
+  @ApiOperation({
+    summary: "Request Phone Number Verification Code",
+    description: `Sends a verification code to the phone number.`,
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Post("/phones/verification-code/request")
+  @HttpCode(HttpStatus.OK)
+  @Throttle({ limit: 3, ttl: 60000, blockDuration: 60000, name: "users_verified_resources_phones_requests" })
+  async requestPhoneVerificationCode(
+    @Body() body: RequestPhoneVerificationInput
+  ): Promise<RequestPhoneVerificationOutput> {
+    const verificationCodeRequest = await this.verifiedResourcesService.requestPhoneVerificationCode(
+      body.phone
+    );
+
+    return {
+      status: verificationCodeRequest ? SUCCESS_STATUS : ERROR_STATUS,
+    };
+  }
+
+  @ApiOperation({
+    summary: "Verify an email.",
+    description: `Use code to verify an email`,
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Post("/emails/verification-code/verify")
+  @Throttle({ limit: 3, ttl: 60000, blockDuration: 60000, name: "users_verified_resources_phones_verify" })
+  @HttpCode(HttpStatus.OK)
+  async verifyEmail(
+    @Body() body: VerifyEmailInput,
+    @GetUser("id") userId: number
+  ): Promise<UserVerifiedEmailOutput> {
+    const verifiedEmail = await this.verifiedResourcesService.verifyEmail(userId, body.email, body.code);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(UserVerifiedEmailOutputData, verifiedEmail),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Verify a phone number.",
+    description: `Use code to verify a phone number`,
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Post("/phones/verification-code/verify")
+  @HttpCode(HttpStatus.OK)
+  async verifyPhoneNumber(
+    @Body() body: VerifyPhoneInput,
+    @GetUser("id") userId: number
+  ): Promise<UserVerifiedPhoneOutput> {
+    const verifiedPhone = await this.verifiedResourcesService.verifyPhone(userId, body.phone, body.code);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(UserVerifiedPhoneOutputData, verifiedPhone),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Get list of verified emails.",
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Get("/emails")
+  @HttpCode(HttpStatus.OK)
+  async getVerifiedEmails(
+    @GetUser("id") userId: number,
+    @Query() pagination: SkipTakePagination
+  ): Promise<UserVerifiedEmailsOutput> {
+    const verifiedEmails = await this.verifiedResourcesService.getUserVerifiedEmails(
+      userId,
+      pagination?.skip ?? 0,
+      pagination?.take ?? 250
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: verifiedEmails.map((verifiedEmail) => plainToClass(UserVerifiedEmailOutputData, verifiedEmail)),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Get list of verified phone numbers.",
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Get("/phones")
+  @HttpCode(HttpStatus.OK)
+  async getVerifiedPhoneNumbers(
+    @GetUser("id") userId: number,
+    @Query() pagination: SkipTakePagination
+  ): Promise<UserVerifiedPhonesOutput> {
+    const verifiedPhoneNumbers = await this.verifiedResourcesService.getUserVerifiedPhoneNumbers(
+      userId,
+      pagination?.skip ?? 0,
+      pagination?.take ?? 250
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: verifiedPhoneNumbers.map((verifiedPhoneNumber) =>
+        plainToClass(UserVerifiedPhoneOutputData, verifiedPhoneNumber)
+      ),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Get verified email by id.",
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Get("/emails/:id")
+  @HttpCode(HttpStatus.OK)
+  async getVerifiedEmailById(
+    @GetUser("id") userId: number,
+    @Param("id") id: number
+  ): Promise<UserVerifiedEmailOutput> {
+    const verifiedEmail = await this.verifiedResourcesService.getUserVerifiedEmailById(userId, id);
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(UserVerifiedEmailOutputData, verifiedEmail),
+    };
+  }
+
+  @ApiOperation({
+    summary: "Get verified phone number by id.",
+  })
+  @ApiHeader(API_KEY_OR_ACCESS_TOKEN_HEADER)
+  @Get("/phones/:id")
+  @HttpCode(HttpStatus.OK)
+  async getVerifiedPhoneById(
+    @GetUser("id") userId: number,
+    @Param("id") id: number
+  ): Promise<UserVerifiedPhoneOutput> {
+    const verifiedPhoneNumber = await this.verifiedResourcesService.getUserVerifiedPhoneNumberById(
+      userId,
+      id
+    );
+    return {
+      status: SUCCESS_STATUS,
+      data: plainToClass(UserVerifiedPhoneOutputData, verifiedPhoneNumber),
+    };
+  }
+}

apps/api/v2/src/modules/verified-resources/inputs/request-email-verification.input.ts

@@ -0,0 +1,14 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose } from "class-transformer";
+import { IsEmail } from "class-validator";
+
+export class RequestEmailVerificationInput {
+  @ApiProperty({
+    type: String,
+    description: "Email to verify.",
+    example: "acme@example.com",
+  })
+  @IsEmail()
+  @Expose()
+  email!: string;
+}

apps/api/v2/src/modules/verified-resources/inputs/request-phone-verification.input.ts

@@ -0,0 +1,14 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose } from "class-transformer";
+import { IsPhoneNumber } from "class-validator";
+
+export class RequestPhoneVerificationInput {
+  @ApiProperty({
+    type: String,
+    description: "Phone number to verify.",
+    example: "+372 5555 6666",
+  })
+  @IsPhoneNumber()
+  @Expose()
+  phone!: string;
+}

apps/api/v2/src/modules/verified-resources/inputs/verify-email.input.ts

@@ -0,0 +1,23 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose } from "class-transformer";
+import { IsEmail, IsString } from "class-validator";
+
+export class VerifyEmailInput {
+  @ApiProperty({
+    type: String,
+    description: "Email to verify.",
+    example: "example@acme.com",
+  })
+  @IsEmail()
+  @Expose()
+  email!: string;
+
+  @ApiProperty({
+    type: String,
+    description: "verification code sent to the email to verify",
+    example: "1ABG2C",
+  })
+  @Expose()
+  @IsString()
+  code!: string;
+}

apps/api/v2/src/modules/verified-resources/inputs/verify-phone.input.ts

@@ -0,0 +1,23 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose } from "class-transformer";
+import { IsEmail, IsPhoneNumber, IsString } from "class-validator";
+
+export class VerifyPhoneInput {
+  @ApiProperty({
+    type: String,
+    description: "phone number to verify.",
+    example: "+37255556666",
+  })
+  @IsPhoneNumber()
+  @Expose()
+  phone!: string;
+
+  @ApiProperty({
+    type: String,
+    description: "verification code sent to the phone number to verify",
+    example: "1ABG2C",
+  })
+  @Expose()
+  @IsString()
+  code!: string;
+}

apps/api/v2/src/modules/verified-resources/outputs/request-email-verification-output.ts

@@ -0,0 +1,10 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { IsEnum } from "class-validator";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+
+export class RequestEmailVerificationOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+}

apps/api/v2/src/modules/verified-resources/outputs/request-phone-verification-output.ts

@@ -0,0 +1,10 @@
+import { ApiProperty } from "@nestjs/swagger";
+import { IsEnum } from "class-validator";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+
+export class RequestPhoneVerificationOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+}

apps/api/v2/src/modules/verified-resources/outputs/verified-email.output.ts

@@ -0,0 +1,135 @@
+import { ScheduleOutput } from "@/ee/schedules/schedules_2024_04_15/outputs/schedule.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose, Type } from "class-transformer";
+import {
+  IsArray,
+  IsEnum,
+  IsNotEmptyObject,
+  IsNumber,
+  IsOptional,
+  IsString,
+  ValidateNested,
+} from "class-validator";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+
+export class UserVerifiedEmailOutputData {
+  @Expose()
+  @IsNumber()
+  @ApiProperty({
+    description: "The unique identifier for the verified email.",
+    example: 789,
+  })
+  id!: number;
+
+  @Expose()
+  @IsString()
+  @ApiProperty({
+    description: "The verified email address.",
+    example: "user@example.com",
+    format: "email",
+  })
+  email!: string;
+
+  @Expose()
+  @IsNumber()
+  @ApiProperty({
+    description: "The ID of the associated user, if applicable.",
+    example: 45,
+  })
+  userId!: number;
+}
+
+export class TeamVerifiedEmailOutputData {
+  @Expose()
+  @IsNumber()
+  @ApiProperty({
+    description: "The unique identifier for the verified email.",
+    example: 789,
+  })
+  id!: number;
+
+  @Expose()
+  @IsString()
+  @ApiProperty({
+    description: "The verified email address.",
+    example: "user@example.com",
+    format: "email",
+  })
+  email!: string;
+
+  @Expose()
+  @IsNumber()
+  @ApiProperty({
+    description: "The ID of the associated team, if applicable.",
+    example: 89,
+  })
+  teamId!: number;
+
+  @Expose()
+  @IsNumber()
+  @IsOptional()
+  @ApiProperty({
+    description: "The ID of the associated user, if applicable.",
+    example: 45,
+    nullable: true,
+    required: false,
+  })
+  userId?: number | null;
+}
+
+export class TeamVerifiedEmailOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: ScheduleOutput,
+  })
+  @IsNotEmptyObject()
+  @Type(() => TeamVerifiedEmailOutputData)
+  data!: TeamVerifiedEmailOutputData;
+}
+
+export class UserVerifiedEmailOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: ScheduleOutput,
+  })
+  @IsNotEmptyObject()
+  @Type(() => UserVerifiedEmailOutputData)
+  data!: UserVerifiedEmailOutputData;
+}
+
+export class TeamVerifiedEmailsOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: ScheduleOutput,
+  })
+  @IsNotEmptyObject()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => TeamVerifiedEmailOutputData)
+  data!: TeamVerifiedEmailOutputData[];
+}
+
+export class UserVerifiedEmailsOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: ScheduleOutput,
+  })
+  @IsNotEmptyObject()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => UserVerifiedEmailOutputData)
+  data!: UserVerifiedEmailOutputData[];
+}

apps/api/v2/src/modules/verified-resources/outputs/verified-phone.output.ts

@@ -0,0 +1,135 @@
+import { ScheduleOutput } from "@/ee/schedules/schedules_2024_04_15/outputs/schedule.output";
+import { ApiProperty } from "@nestjs/swagger";
+import { Expose, Type } from "class-transformer";
+import {
+  IsArray,
+  IsEnum,
+  IsNotEmptyObject,
+  IsNumber,
+  IsString,
+  ValidateNested,
+  IsOptional,
+} from "class-validator";
+
+import { ERROR_STATUS, SUCCESS_STATUS } from "@calcom/platform-constants";
+
+export class UserVerifiedPhoneOutputData {
+  @Expose()
+  @IsNumber()
+  @ApiProperty({
+    description: "The unique identifier for the verified email.",
+    example: 789,
+  })
+  id!: number;
+
+  @Expose()
+  @IsString()
+  @ApiProperty({
+    description: "The verified phone number.",
+    example: "+37255556666",
+    format: "phone",
+  })
+  phoneNumber!: string;
+
+  @Expose()
+  @IsNumber()
+  @ApiProperty({
+    description: "The ID of the associated user, if applicable.",
+    example: 45,
+  })
+  userId!: number;
+}
+
+export class TeamVerifiedPhoneOutputData {
+  @Expose()
+  @IsNumber()
+  @ApiProperty({
+    description: "The unique identifier for the verified email.",
+    example: 789,
+  })
+  id!: number;
+
+  @Expose()
+  @IsString()
+  @ApiProperty({
+    description: "The verified phone number.",
+    example: "+37255556666",
+    format: "phone",
+  })
+  phoneNumber!: string;
+
+  @Expose()
+  @IsNumber()
+  @IsOptional()
+  @ApiProperty({
+    description: "The ID of the associated user, if applicable.",
+    example: 45,
+    nullable: true,
+    required: false,
+  })
+  userId?: number | null;
+
+  @Expose()
+  @IsNumber()
+  @ApiProperty({
+    description: "The ID of the associated team, if applicable.",
+    example: 89,
+  })
+  teamId!: number;
+}
+
+export class UserVerifiedPhoneOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: ScheduleOutput,
+  })
+  @IsNotEmptyObject()
+  @Type(() => UserVerifiedPhoneOutputData)
+  data!: UserVerifiedPhoneOutputData;
+}
+
+export class TeamVerifiedPhoneOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: ScheduleOutput,
+  })
+  @IsNotEmptyObject()
+  @Type(() => TeamVerifiedPhoneOutputData)
+  data!: TeamVerifiedPhoneOutputData;
+}
+
+export class UserVerifiedPhonesOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: ScheduleOutput,
+  })
+  @IsNotEmptyObject()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => UserVerifiedPhoneOutputData)
+  data!: UserVerifiedPhoneOutputData[];
+}
+
+export class TeamVerifiedPhonesOutput {
+  @ApiProperty({ example: SUCCESS_STATUS, enum: [SUCCESS_STATUS, ERROR_STATUS] })
+  @IsEnum([SUCCESS_STATUS, ERROR_STATUS])
+  status!: typeof SUCCESS_STATUS | typeof ERROR_STATUS;
+
+  @ApiProperty({
+    type: ScheduleOutput,
+  })
+  @IsNotEmptyObject()
+  @IsArray()
+  @ValidateNested({ each: true })
+  @Type(() => TeamVerifiedPhoneOutputData)
+  data!: TeamVerifiedPhoneOutputData[];
+}

apps/api/v2/src/modules/verified-resources/services/verified-resources.service.ts

@@ -0,0 +1,120 @@
+import { TeamsVerifiedResourcesRepository } from "@/modules/verified-resources/teams-verified-resources.repository";
+import { UsersVerifiedResourcesRepository } from "@/modules/verified-resources/users-verified-resources.repository";
+import { BadRequestException, ConflictException, Injectable } from "@nestjs/common";
+
+import {
+  verifyPhoneNumber,
+  sendVerificationCode as sendPhoneVerificationCode,
+} from "@calcom/platform-libraries";
+import { sendEmailVerificationByCode, verifyEmailCodeHandler } from "@calcom/platform-libraries/emails";
+
+@Injectable()
+export class VerifiedResourcesService {
+  constructor(
+    private readonly usersVerifiedResourcesRepository: UsersVerifiedResourcesRepository,
+    private readonly teamsVerifiedResourcesRepository: TeamsVerifiedResourcesRepository
+  ) {}
+
+  async requestEmailVerificationCode(user: { username: string; locale: string }, email: string) {
+    const res = await sendEmailVerificationByCode({
+      email: email,
+      language: user.locale,
+      username: user.username,
+      isVerifyingEmail: true,
+    });
+
+    if (res.ok && !res.skipped) {
+      return true;
+    }
+
+    if (!res.ok) {
+      throw new BadRequestException("Email could not be verified.");
+    }
+
+    if (res.skipped) {
+      throw new ConflictException("Email is already verified.");
+    }
+
+    return true;
+  }
+
+  async requestPhoneVerificationCode(phone: string) {
+    try {
+      await sendPhoneVerificationCode(phone);
+    } catch (err) {
+      throw new BadRequestException("Could not send verification code to this phone number.");
+    }
+
+    return true;
+  }
+
+  async verifyPhone(userId: number, phone: string, code: string, teamId?: number) {
+    const result = await verifyPhoneNumber(phone, code, userId, teamId);
+
+    if (result) {
+      return teamId
+        ? await this.teamsVerifiedResourcesRepository.getTeamVerifiedPhoneNumber(userId, phone, teamId)
+        : await this.usersVerifiedResourcesRepository.getUserVerifiedPhoneNumber(userId, phone);
+    }
+
+    throw new BadRequestException("Could not verify phone number.");
+  }
+
+  async verifyEmail(userId: number, email: string, code: string, teamId?: number) {
+    const isValidToken = await verifyEmailCodeHandler({
+      ctx: { user: { id: userId } },
+      input: { email, code, teamId },
+    });
+    if (isValidToken) {
+      const verifiedEmail = teamId
+        ? await this.teamsVerifiedResourcesRepository.getTeamVerifiedEmail(userId, email, teamId)
+        : await this.usersVerifiedResourcesRepository.getUserVerifiedEmail(userId, email);
+      return verifiedEmail;
+    }
+    throw new BadRequestException("Invalid Verification Code");
+  }
+
+  async getUserVerifiedEmailById(userId: number, id: number) {
+    return this.usersVerifiedResourcesRepository.getUserVerifiedEmailById(userId, id);
+  }
+
+  async getTeamVerifiedEmailById(teamId: number, id: number) {
+    return this.teamsVerifiedResourcesRepository.getTeamVerifiedEmailById(id, teamId);
+  }
+
+  async getVerifiedEmail(userId: number, email: string) {
+    return this.usersVerifiedResourcesRepository.getUserVerifiedEmail(userId, email);
+  }
+
+  async getUserVerifiedEmails(userId: number, skip = 0, take = 250) {
+    return this.usersVerifiedResourcesRepository.getUserVerifiedEmails(userId, skip, take);
+  }
+
+  async getTeamVerifiedEmails(teamId: number, skip = 0, take = 250) {
+    return this.teamsVerifiedResourcesRepository.getTeamVerifiedEmails(teamId, skip, take);
+  }
+
+  async getUserVerifiedPhoneNumberById(userId: number, id: number) {
+    return this.usersVerifiedResourcesRepository.getUserVerifiedPhoneNumberById(userId, id);
+  }
+
+  async getTeamVerifiedPhoneNumberById(teamId: number, id: number) {
+    return this.teamsVerifiedResourcesRepository.getTeamVerifiedPhoneNumberById(id, teamId);
+  }
+
+  async getUserVerifiedPhoneNumber(userId: number, phoneNumber: string) {
+    return this.usersVerifiedResourcesRepository.getUserVerifiedEmail(userId, phoneNumber);
+  }
+
+  async getTeamVerifiedPhoneNumber(userId: number, phoneNumber: string, teamId: number) {
+    return this.teamsVerifiedResourcesRepository.getTeamVerifiedPhoneNumber(userId, phoneNumber, teamId);
+  }
+
+  async getUserVerifiedPhoneNumbers(userId: number, skip = 0, take = 250) {
+    return this.usersVerifiedResourcesRepository.getUserVerifiedPhoneNumbers(userId, skip, take);
+  }
+
+  async getTeamVerifiedPhoneNumbers(teamId: number, skip = 0, take = 250) {
+    return this.teamsVerifiedResourcesRepository.getTeamVerifiedPhoneNumbers(teamId, skip, take);
+  }
+}

apps/api/v2/src/modules/verified-resources/teams-verified-resources.repository.ts

@@ -0,0 +1,66 @@
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+@Injectable()
+export class TeamsVerifiedResourcesRepository {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  async getTeamVerifiedEmails(teamId: number, skip = 0, take = 250) {
+    return this.dbRead.prisma.verifiedEmail.findMany({
+      where: {
+        teamId,
+      },
+      skip,
+      take,
+    });
+  }
+
+  async getTeamVerifiedPhoneNumbers(teamId: number, skip = 0, take = 250) {
+    return this.dbRead.prisma.verifiedNumber.findMany({
+      where: {
+        teamId,
+      },
+      skip,
+      take,
+    });
+  }
+
+  async getTeamVerifiedEmail(userId: number, email: string, teamId: number) {
+    return this.dbRead.prisma.verifiedEmail.findFirstOrThrow({
+      where: {
+        userId,
+        email,
+        teamId,
+      },
+    });
+  }
+
+  async getTeamVerifiedPhoneNumber(userId: number, phone: string, teamId: number) {
+    return this.dbRead.prisma.verifiedNumber.findFirstOrThrow({
+      where: {
+        userId,
+        phoneNumber: phone,
+        teamId,
+      },
+    });
+  }
+
+  async getTeamVerifiedEmailById(id: number, teamId: number) {
+    return this.dbRead.prisma.verifiedEmail.findFirst({
+      where: {
+        id,
+        teamId,
+      },
+    });
+  }
+
+  async getTeamVerifiedPhoneNumberById(id: number, teamId: number) {
+    return this.dbRead.prisma.verifiedNumber.findFirst({
+      where: {
+        id,
+        teamId,
+      },
+    });
+  }
+}

apps/api/v2/src/modules/verified-resources/users-verified-resources.repository.ts

@@ -0,0 +1,64 @@
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { Injectable } from "@nestjs/common";
+
+@Injectable()
+export class UsersVerifiedResourcesRepository {
+  constructor(private readonly dbRead: PrismaReadService, private readonly dbWrite: PrismaWriteService) {}
+
+  async getUserVerifiedEmails(userId: number, skip = 0, take = 250) {
+    return this.dbRead.prisma.verifiedEmail.findMany({
+      where: {
+        userId,
+      },
+      skip,
+      take,
+    });
+  }
+
+  async getUserVerifiedPhoneNumber(userId: number, phone: string) {
+    return this.dbRead.prisma.verifiedNumber.findFirstOrThrow({
+      where: {
+        userId,
+        phoneNumber: phone,
+      },
+    });
+  }
+
+  async getUserVerifiedPhoneNumbers(userId: number, skip = 0, take = 250) {
+    return this.dbRead.prisma.verifiedNumber.findMany({
+      where: {
+        userId,
+      },
+      skip,
+      take,
+    });
+  }
+
+  async getUserVerifiedEmail(userId: number, email: string) {
+    return this.dbRead.prisma.verifiedEmail.findFirstOrThrow({
+      where: {
+        userId,
+        email,
+      },
+    });
+  }
+
+  async getUserVerifiedEmailById(userId: number, id: number) {
+    return this.dbRead.prisma.verifiedEmail.findFirst({
+      where: {
+        userId,
+        id,
+      },
+    });
+  }
+
+  async getUserVerifiedPhoneNumberById(userId: number, id: number) {
+    return this.dbRead.prisma.verifiedNumber.findFirst({
+      where: {
+        userId,
+        id,
+      },
+    });
+  }
+}

apps/api/v2/src/modules/verified-resources/verified-resources.module.ts

@@ -0,0 +1,39 @@
+import { AppsRepository } from "@/modules/apps/apps.repository";
+import { CredentialsRepository } from "@/modules/credentials/credentials.repository";
+import { MembershipsRepository } from "@/modules/memberships/memberships.repository";
+import { OrganizationsRepository } from "@/modules/organizations/index/organizations.repository";
+import { OrganizationsTeamsRepository } from "@/modules/organizations/teams/index/organizations-teams.repository";
+import { OrgTeamsVerifiedResourcesController } from "@/modules/organizations/teams/verified-resources/org-teams-verified-resources.controller";
+import { PrismaModule } from "@/modules/prisma/prisma.module";
+import { RedisModule } from "@/modules/redis/redis.module";
+import { StripeService } from "@/modules/stripe/stripe.service";
+import { TeamsVerifiedResourcesController } from "@/modules/teams/verified-resources/teams-verified-resources.controller";
+import { UsersRepository } from "@/modules/users/users.repository";
+import { UserVerifiedResourcesController } from "@/modules/verified-resources/controllers/users-verified-resources.controller";
+import { VerifiedResourcesService } from "@/modules/verified-resources/services/verified-resources.service";
+import { TeamsVerifiedResourcesRepository } from "@/modules/verified-resources/teams-verified-resources.repository";
+import { UsersVerifiedResourcesRepository } from "@/modules/verified-resources/users-verified-resources.repository";
+import { Module } from "@nestjs/common";
+
+@Module({
+  imports: [PrismaModule, RedisModule],
+  controllers: [
+    UserVerifiedResourcesController,
+    TeamsVerifiedResourcesController,
+    OrgTeamsVerifiedResourcesController,
+  ],
+  providers: [
+    VerifiedResourcesService,
+    UsersVerifiedResourcesRepository,
+    TeamsVerifiedResourcesRepository,
+    MembershipsRepository,
+    OrganizationsTeamsRepository,
+    OrganizationsRepository,
+    StripeService,
+    AppsRepository,
+    CredentialsRepository,
+    UsersRepository,
+  ],
+  exports: [VerifiedResourcesService],
+})
+export class VerifiedResourcesModule {}

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

@@ -13,7 +13,7 @@ export class MembershipRepositoryFixture {
   }
 
   async create(data: Prisma.MembershipCreateInput) {
-    return this.prismaWriteClient.membership.create({ data });
+    return this.prismaWriteClient.membership.create({ data: { createdAt: new Date(), ...data } });
   }
 
   async delete(membershipId: Membership["id"]) {
@@ -30,7 +30,7 @@ export class MembershipRepositoryFixture {
 
   async addUserToOrg(user: User, org: Team, role: MembershipRole, accepted: boolean) {
     const membership = await this.prismaWriteClient.membership.create({
-      data: { teamId: org.id, userId: user.id, role, accepted },
+      data: { createdAt: new Date(), teamId: org.id, userId: user.id, role, accepted },
     });
     await this.prismaWriteClient.user.update({ where: { id: user.id }, data: { organizationId: org.id } });
     return membership;

apps/api/v2/test/fixtures/repository/verified-resources.repository.fixture.ts

@@ -0,0 +1,26 @@
+import { PrismaReadService } from "@/modules/prisma/prisma-read.service";
+import { PrismaWriteService } from "@/modules/prisma/prisma-write.service";
+import { TestingModule } from "@nestjs/testing";
+import { Prisma } from "@prisma/client";
+
+export class VerifiedResourcesRepositoryFixtures {
+  private prismaReadClient: PrismaReadService["prisma"];
+  private prismaWriteClient: PrismaWriteService["prisma"];
+
+  constructor(private readonly module: TestingModule) {
+    this.prismaReadClient = module.get(PrismaReadService).prisma;
+    this.prismaWriteClient = module.get(PrismaWriteService).prisma;
+  }
+
+  async createPhone(data: Prisma.VerifiedNumberCreateInput) {
+    return this.prismaWriteClient.verifiedNumber.create({ data });
+  }
+
+  async deleteEmailById(id: number) {
+    return this.prismaWriteClient.verifiedEmail.delete({ where: { id } });
+  }
+
+  async deletePhoneById(id: number) {
+    return this.prismaWriteClient.verifiedNumber.delete({ where: { id } });
+  }
+}

apps/api/v2/test/jest.setup-e2e.ts

@@ -0,0 +1 @@
+jest.retryTimes(process.env.CI ? 2 : 0); // Global retry for all tests

apps/ui-playground/app/(home)/page.tsx

@@ -2,9 +2,9 @@ export default function Page() {
   return (
     <div className="font-cal -mt-16 flex  min-h-screen w-screen items-center justify-center border pt-16 text-center ">
       <div>
-        <h1 className="text-7xl font-bold uppercase  leading-none  tracking-tight md:text-8xl">
+        <h1 className="text-7xl leading-none md:text-8xl">
           Open UI for absolutely
-          <br /> Everyone
+          <br /> everyone
         </h1>
       </div>
     </div>

apps/ui-playground/content/design/components/button.mdx

@@ -65,3 +65,34 @@ Buttons can be grouped together using the ButtonGroup component. The ButtonGroup
 #### Combined
 
 <ButtonGroupSizesCombined/>
+
+## Usage
+
+```tsx
+// Primary button (default)
+<Button>Primary Button</Button>
+
+// Secondary button
+<Button color="secondary">Secondary Button</Button>
+
+// Minimal button
+<Button color="minimal">Minimal Button</Button>
+
+// Destructive button
+<Button color="destructive">Destructive Button</Button>
+
+// With start icon
+<Button StartIcon="plus">Add Item</Button>
+
+// With end icon
+<Button EndIcon="chevronRight">View More</Button>
+
+// With link
+<Button href="/some-path">Navigate</Button>
+
+// Different sizes
+<Button size="xs">Extra Small</Button>
+<Button size="sm">Small</Button>
+<Button size="base">Base (Default)</Button>
+<Button size="lg">Large</Button>
+```

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

@@ -0,0 +1,9 @@
+"use client";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Alert } from "@calcom/ui/components/alert";
+
+export default function Error() {
+  const { t } = useLocale();
+  return <Alert severity="error" title={t("something_went_wrong")} />;
+}

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

@@ -1,7 +1,6 @@
 import { createRouterCaller } from "app/_trpc/context";
 import type { PageProps } from "app/_types";
 import { _generateMetadata, getTranslate } from "app/_utils";
-import { notFound } from "next/navigation";
 
 import { AvailabilitySliderTable } from "@calcom/features/timezone-buddy/components/AvailabilitySliderTable";
 import { OrganizationRepository } from "@calcom/lib/server/repository/organization";
@@ -25,43 +24,40 @@ export const generateMetadata = async () => {
 const Page = async ({ searchParams: _searchParams }: PageProps) => {
   const searchParams = await _searchParams;
   const t = await getTranslate();
-  try {
-    const [meCaller, availabilityCaller] = await Promise.all([
-      createRouterCaller(meRouter),
-      createRouterCaller(availabilityRouter),
-    ]);
 
-    const [me, availabilities] = await Promise.all([meCaller.get(), availabilityCaller.list()]);
-    const organizationId = me.organization?.id ?? me.profiles[0]?.organizationId;
-    const isOrgPrivate = organizationId
-      ? await OrganizationRepository.checkIfPrivate({
-          orgId: organizationId,
-        })
-      : false;
-    const canViewTeamAvailability = me.organization?.isOrgAdmin || !isOrgPrivate;
+  const [meCaller, availabilityCaller] = await Promise.all([
+    createRouterCaller(meRouter),
+    createRouterCaller(availabilityRouter),
+  ]);
 
-    return (
-      <ShellMainAppDir
-        heading={t("availability")}
-        subtitle={t("configure_availability")}
-        CTA={
-          <AvailabilityCTA
-            toggleGroupOptions={[
-              { value: "mine", label: t("my_availability") },
-              ...(canViewTeamAvailability ? [{ value: "team", label: t("team_availability") }] : []),
-            ]}
-          />
-        }>
-        {searchParams?.type === "team" && canViewTeamAvailability ? (
-          <AvailabilitySliderTable userTimeFormat={me?.timeFormat ?? null} isOrg={!!organizationId} />
-        ) : (
-          <AvailabilityList availabilities={availabilities ?? { schedules: [] }} me={me} />
-        )}
-      </ShellMainAppDir>
-    );
-  } catch (error) {
-    notFound();
-  }
+  const [me, availabilities] = await Promise.all([meCaller.get(), availabilityCaller.list()]);
+  const organizationId = me.organization?.id ?? me.profiles[0]?.organizationId;
+  const isOrgPrivate = organizationId
+    ? await OrganizationRepository.checkIfPrivate({
+        orgId: organizationId,
+      })
+    : false;
+  const canViewTeamAvailability = me.organization?.isOrgAdmin || !isOrgPrivate;
+
+  return (
+    <ShellMainAppDir
+      heading={t("availability")}
+      subtitle={t("configure_availability")}
+      CTA={
+        <AvailabilityCTA
+          toggleGroupOptions={[
+            { value: "mine", label: t("my_availability") },
+            ...(canViewTeamAvailability ? [{ value: "team", label: t("team_availability") }] : []),
+          ]}
+        />
+      }>
+      {searchParams?.type === "team" && canViewTeamAvailability ? (
+        <AvailabilitySliderTable userTimeFormat={me?.timeFormat ?? null} isOrg={!!organizationId} />
+      ) : (
+        <AvailabilityList availabilities={availabilities ?? { schedules: [] }} me={me} />
+      )}
+    </ShellMainAppDir>
+  );
 };
 
 export default Page;

apps/web/app/(use-page-wrapper)/(main-nav)/event-types/actions.ts

@@ -0,0 +1,7 @@
+"use server";
+
+import { revalidatePath } from "next/cache";
+
+export async function revalidateEventTypesList() {
+  revalidatePath("/event-types");
+}

apps/web/app/(use-page-wrapper)/(main-nav)/event-types/error.tsx

@@ -0,0 +1,9 @@
+"use client";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Alert } from "@calcom/ui/components/alert";
+
+export default function Error() {
+  const { t } = useLocale();
+  return <Alert severity="error" title={t("something_went_wrong")} />;
+}

apps/web/app/(use-page-wrapper)/(main-nav)/event-types/loading.tsx

@@ -0,0 +1,5 @@
+import { EventTypesSkeleton } from "./skeleton";
+
+export default function Loading() {
+  return <EventTypesSkeleton />;
+}

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

@@ -8,6 +8,7 @@ import { redirect } from "next/navigation";
 import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 import { getTeamsFiltersFromQuery } from "@calcom/features/filters/lib/getTeamsFiltersFromQuery";
 import { eventTypesRouter } from "@calcom/trpc/server/routers/viewer/eventTypes/_router";
+import { meRouter } from "@calcom/trpc/server/routers/viewer/me/_router";
 
 import { buildLegacyCtx } from "@lib/buildLegacyCtx";
 
@@ -32,19 +33,27 @@ const Page = async ({ params, searchParams }: PageProps) => {
   }
 
   const t = await getTranslate();
-
-  const caller = await createRouterCaller(eventTypesRouter);
   const filters = getTeamsFiltersFromQuery(_searchParams);
-  const initialData = await caller.getUserEventGroups({ filters });
+
+  const [meCaller, eventTypesCaller] = await Promise.all([
+    createRouterCaller(meRouter),
+    createRouterCaller(eventTypesRouter),
+  ]);
+
+  const [me, userEventGroupsData] = await Promise.all([
+    meCaller.get(),
+    eventTypesCaller.getUserEventGroups({ filters }),
+  ]);
 
   return (
     <ShellMainAppDir
       heading={t("event_types_page_title")}
       subtitle={t("event_types_page_subtitle")}
-      CTA={<EventTypesCTA initialData={initialData} filters={filters} />}>
-      <EventTypes initialData={initialData} filters={filters} />
+      CTA={<EventTypesCTA userEventGroupsData={userEventGroupsData} />}>
+      <EventTypes userEventGroupsData={userEventGroupsData} user={me} />
     </ShellMainAppDir>
   );
 };
 
 export default Page;
+export const revalidate = 3600; // 1 hour in seconds

apps/web/app/(use-page-wrapper)/(main-nav)/event-types/skeleton.tsx

@@ -0,0 +1,15 @@
+"use client";
+
+import { ShellMainAppDir } from "app/(use-page-wrapper)/(main-nav)/ShellMainAppDir";
+
+import { EventTypesSkeletonLoader } from "@calcom/features/eventtypes/components/SkeletonLoader";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+
+export function EventTypesSkeleton() {
+  const { t } = useLocale();
+  return (
+    <ShellMainAppDir heading={t("event_types_page_title")} subtitle={t("event_types_page_subtitle")}>
+      <EventTypesSkeletonLoader />
+    </ShellMainAppDir>
+  );
+}

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

@@ -1,10 +1,12 @@
-import { withAppDirSsr } from "app/WithAppDirSsr";
-import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
 import { cookies, headers } from "next/headers";
 
-import { getServerSideProps } from "@lib/apps/getServerSideProps";
-import { buildLegacyCtx } from "@lib/buildLegacyCtx";
+import { getAppRegistry, getAppRegistryWithCredentials } from "@calcom/app-store/_appRegistry";
+import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { UserRepository } from "@calcom/lib/server/repository/user";
+import type { AppCategories } from "@calcom/prisma/enums";
+
+import { buildLegacyRequest } from "@lib/buildLegacyCtx";
 
 import AppsPage from "~/apps/apps-view";
 
@@ -18,13 +20,43 @@ export const generateMetadata = async () => {
   );
 };
 
-const getData = withAppDirSsr(getServerSideProps);
+const ServerPage = async () => {
+  const req = buildLegacyRequest(await headers(), await cookies());
+  const session = await getServerSession({ req });
+  let appStore, userAdminTeamsIds: number[];
+  if (session?.user?.id) {
+    const userAdminTeams = await UserRepository.getUserAdminTeams(session.user.id);
+    userAdminTeamsIds = userAdminTeams?.teams?.map(({ team }) => team.id) ?? [];
+    appStore = await getAppRegistryWithCredentials(session.user.id, userAdminTeamsIds);
+  } else {
+    appStore = await getAppRegistry();
+    userAdminTeamsIds = [];
+  }
 
-const ServerPage = async ({ params, searchParams }: PageProps) => {
-  const context = buildLegacyCtx(await headers(), await cookies(), await params, await searchParams);
-  const props = await getData(context);
+  const categoryQuery = appStore.map(({ categories }) => ({
+    categories: categories || [],
+  }));
+  const categories = categoryQuery.reduce((c, app) => {
+    for (const category of app.categories) {
+      c[category] = c[category] ? c[category] + 1 : 1;
+    }
+    return c;
+  }, {} as Record<string, number>);
 
-  return <AppsPage {...props} />;
+  const props = {
+    categories: Object.entries(categories)
+      .map(([name, count]): { name: AppCategories; count: number } => ({
+        name: name as AppCategories,
+        count,
+      }))
+      .sort(function (a, b) {
+        return b.count - a.count;
+      }),
+    appStore,
+    userAdminTeams: userAdminTeamsIds,
+  };
+
+  return <AppsPage {...props} isAdmin={session?.user?.role === "ADMIN"} />;
 };
 
 export default ServerPage;

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

@@ -13,7 +13,8 @@ export function AppHomePageSkeleton() {
       isPublic
       heading={t("app_store")}
       subtitle={t("app_store_description")}
-      headerClassName="sm:hidden lg:block hidden">
+      headerClassName="sm:hidden lg:block hidden"
+      isAdmin={false}>
       <SkeletonContainer>
         <div className="flex flex-col gap-y-8">
           {/* Featured Categories section */}

apps/web/app/(use-page-wrapper)/apps/installation/[[...step]]/page.tsx

@@ -9,14 +9,11 @@ import { buildLegacyCtx } from "@lib/buildLegacyCtx";
 import type { OnboardingPageProps } from "~/apps/installation/[[...step]]/step-view";
 import Page from "~/apps/installation/[[...step]]/step-view";
 
-export const generateMetadata = async ({ params, searchParams }: PageProps) => {
-  const legacyCtx = buildLegacyCtx(await headers(), await cookies(), await params, await searchParams);
-
-  const { appMetadata } = await getData(legacyCtx);
+export const generateMetadata = async ({ params }: PageProps) => {
   const stepParam = (await params).step;
   const step = stepParam && Array.isArray(stepParam) ? stepParam.join("/") : "";
   return await _generateMetadata(
-    (t) => `${t("install")} ${appMetadata?.name ?? ""}`,
+    (t) => t("app_installation"),
     () => "",
     undefined,
     undefined,

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

@@ -23,7 +23,6 @@ const normalizePages = (pages: string[] | string | undefined) => {
 export const generateMetadata = async ({ params }: { params: Promise<{ pages: string[] }> }) => {
   const { mainPage } = normalizePages((await params).pages);
   return await _generateMetadata(
-    // TODO: Need to show the actual form name instead of "Form"
     (t) => (mainPage === "routing-link" ? `Form | Cal.com Forms` : `${t("routing_forms")} | Cal.com Forms`),
     () => "",
     undefined,
@@ -48,15 +47,16 @@ const ServerPage = async ({ params, searchParams }: ServerPageProps) => {
     </FormProvider>
   );
 
-  if (mainPage === "routing-link") {
-    return <FinalComponent />;
+  // TODO: we should really be using layout for this.
+  if (mainPage === "forms") {
+    return (
+      <Shell withoutMain>
+        <FinalComponent />
+      </Shell>
+    );
   }
 
-  return (
-    <Shell withoutMain>
-      <FinalComponent />
-    </Shell>
-  );
+  return <FinalComponent />;
 };
 
 export default ServerPage;

apps/web/app/(use-page-wrapper)/event-types/[type]/actions.ts

@@ -0,0 +1,7 @@
+"use server";
+
+import { revalidatePath } from "next/cache";
+
+export async function revalidateEventTypeEditPage(id: number) {
+  revalidatePath(`/event-types/${id}`);
+}

apps/web/app/(use-page-wrapper)/event-types/[type]/error.tsx

@@ -0,0 +1,14 @@
+"use client";
+
+import Shell from "@calcom/features/shell/Shell";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Alert } from "@calcom/ui/components/alert";
+
+export default function Error() {
+  const { t } = useLocale();
+  return (
+    <Shell>
+      <Alert severity="error" title={t("something_went_wrong")} />
+    </Shell>
+  );
+}

apps/web/app/(use-page-wrapper)/event-types/[type]/loading.tsx

@@ -0,0 +1,5 @@
+import { EventTypeEditPageSkeleton } from "./skeleton";
+
+export default function Loading() {
+  return <EventTypeEditPageSkeleton />;
+}

apps/web/app/(use-page-wrapper)/event-types/[type]/page.tsx

@@ -1,14 +1,15 @@
-import type { PageProps as _PageProps } from "app/_types";
+import { createRouterCaller } from "app/_trpc/context";
+import type { PageProps } from "app/_types";
 import { _generateMetadata } from "app/_utils";
 import { cookies, headers } from "next/headers";
+import { redirect } from "next/navigation";
 import { z } from "zod";
 
-import { EventTypeRepository } from "@calcom/lib/server/repository/eventType";
+import { EventTypeWebWrapper } from "@calcom/atoms/event-types/wrappers/EventTypeWebWrapper";
+import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
+import { eventTypesRouter } from "@calcom/trpc/server/routers/viewer/eventTypes/_router";
 
-import { buildLegacyCtx } from "@lib/buildLegacyCtx";
-import { getServerSideProps } from "@lib/event-types/[type]/getServerSideProps";
-
-import EventTypePageWrapper from "~/event-types/views/event-types-single-view";
+import { buildLegacyRequest } from "@lib/buildLegacyCtx";
 
 const querySchema = z.object({
   type: z
@@ -19,36 +20,34 @@ const querySchema = z.object({
     .transform((val) => Number(val)),
 });
 
-export const generateMetadata = async ({ params }: _PageProps) => {
-  const parsed = querySchema.safeParse(await params);
-  if (!parsed.success) {
-    return await _generateMetadata(
-      (t) => `${t("event_type")}`,
-      () => "",
-      undefined,
-      undefined,
-      "/event-types"
-    );
-  }
-
-  const data = await EventTypeRepository.findTitleById({
-    id: parsed.data.type,
-  });
-
+export const generateMetadata = async () => {
   return await _generateMetadata(
-    (t) => (data?.title ? `${data.title} | ${t("event_type")}` : `${t("event_type")}`),
+    (t) => `${t("event_type")}`,
     () => "",
     undefined,
     undefined,
-    `/event-types/${parsed.data.type}`
+    "/event-types"
   );
 };
 
-const ServerPage = async ({ params, searchParams }: _PageProps) => {
-  const legacyCtx = buildLegacyCtx(await headers(), await cookies(), await params, await searchParams);
-  const props = await getServerSideProps(legacyCtx);
+const ServerPage = async ({ params }: PageProps) => {
+  const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });
+  if (!session?.user?.id) {
+    return redirect("/auth/login");
+  }
 
-  return <EventTypePageWrapper {...props} />;
+  const parsed = querySchema.safeParse(await params);
+  if (!parsed.success) {
+    throw new Error("Invalid Event Type id");
+  }
+  const eventTypeId = parsed.data.type;
+  const caller = await createRouterCaller(eventTypesRouter);
+  const data = await caller.get({ id: eventTypeId });
+  if (!data?.eventType) {
+    throw new Error("This event type does not exist");
+  }
+
+  return <EventTypeWebWrapper data={data} id={eventTypeId} />;
 };
 
 export default ServerPage;

apps/web/app/(use-page-wrapper)/event-types/[type]/skeleton.tsx

@@ -0,0 +1,105 @@
+"use client";
+
+import Shell from "@calcom/features/shell/Shell";
+import {
+  SkeletonButton,
+  SkeletonContainer,
+  SkeletonText,
+  SkeletonAvatar,
+} from "@calcom/ui/components/skeleton";
+
+export const EventTypeEditPageSkeleton = () => {
+  const backButtonSkeleton = (
+    <div className="bg-default sticky top-0 z-10 mb-0 flex items-center py-2 md:mb-9 md:mt-0">
+      <div className="rounded-md ltr:mr-2 rtl:ml-2">
+        <SkeletonButton className="h-8 w-8 rounded-md" />
+      </div>
+      <div className="w-full truncate ltr:mr-4 rtl:ml-4 md:block">
+        <SkeletonText className="h-8 w-48" />
+      </div>
+      <div className="flex items-center gap-2">
+        <SkeletonButton className="h-9 w-9 rounded-md" />
+        <SkeletonButton className="h-9 w-9 rounded-md" />
+        <div className="flex space-x-2 rtl:space-x-reverse">
+          <SkeletonButton className="h-9 w-24 rounded-md" />
+          <SkeletonButton className="h-9 w-24 rounded-md" />
+        </div>
+      </div>
+    </div>
+  );
+
+  return (
+    <Shell subtitle={<SkeletonText className="hidden h-4 w-24" />} afterHeading={backButtonSkeleton}>
+      <div className="flex flex-col xl:flex-row xl:space-x-6">
+        <div className="hidden xl:block">
+          <div className="primary-navigation w-64 flex-shrink-0">
+            <div className="flex flex-col space-y-1">
+              {/* Tab navigation items */}
+              {Array.from({ length: 8 }).map((_, index) => (
+                <div
+                  key={index}
+                  className="group flex w-64 flex-row items-center rounded-md px-3 py-[10px] text-sm font-medium leading-none">
+                  <div className="mr-3 h-4 w-4">
+                    <SkeletonAvatar className="h-4 w-4" />
+                  </div>
+                  <div className="flex w-full flex-col">
+                    <SkeletonText className="h-4 w-24" />
+                    <SkeletonText className="mt-1 h-3 w-16" />
+                  </div>
+                </div>
+              ))}
+            </div>
+          </div>
+        </div>
+        <div className="w-full ltr:mr-2 rtl:ml-2">
+          <div className="bg-default border-subtle mt-4 rounded-md sm:mx-0 md:border md:p-6 xl:mt-0">
+            <SkeletonContainer>
+              <div className="mb-8">
+                <SkeletonText className="h-8 w-full max-w-md" />
+              </div>
+
+              <div className="mb-6 space-y-6">
+                {/* Form fields */}
+                <div className="flex flex-col space-y-2">
+                  <SkeletonText className="h-4 w-32" />
+                  <SkeletonText className="h-10 w-full" />
+                </div>
+
+                <div className="flex flex-col space-y-2">
+                  <SkeletonText className="h-4 w-40" />
+                  <div className="flex items-center">
+                    <SkeletonText className="h-10 w-full" />
+                    <SkeletonButton className="ml-2 h-10 w-10 rounded-md" />
+                  </div>
+                </div>
+
+                <div className="flex flex-col space-y-2">
+                  <SkeletonText className="h-4 w-36" />
+                  <SkeletonText className="h-24 w-full" />
+                </div>
+
+                <div className="flex flex-col space-y-2">
+                  <SkeletonText className="h-4 w-28" />
+                  <div className="flex items-center">
+                    <SkeletonText className="h-10 w-full" />
+                    <SkeletonButton className="ml-2 h-10 w-10 rounded-md" />
+                  </div>
+                </div>
+
+                <div className="flex flex-col space-y-2">
+                  <SkeletonText className="h-4 w-32" />
+                  <SkeletonText className="h-10 w-full" />
+                </div>
+              </div>
+
+              <div className="flex justify-end space-x-2">
+                <SkeletonButton className="h-10 w-24 rounded-md" />
+                <SkeletonButton className="h-10 w-24 rounded-md" />
+              </div>
+            </SkeletonContainer>
+          </div>
+        </div>
+      </div>
+    </Shell>
+  );
+};

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

@@ -0,0 +1,9 @@
+"use client";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Alert } from "@calcom/ui/components/alert";
+
+export default function Error() {
+  const { t } = useLocale();
+  return <Alert severity="error" title={t("something_went_wrong")} />;
+}

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

@@ -1,6 +1,5 @@
 import { type Params } from "app/_types";
 import { _generateMetadata, getTranslate } from "app/_utils";
-import { notFound } from "next/navigation";
 import { z } from "zod";
 
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
@@ -36,23 +35,17 @@ export const generateMetadata = async ({ params }: { params: Params }) => {
 const Page = async ({ params }: { params: Params }) => {
   const input = orgIdSchema.safeParse(await params);
 
-  if (!input.success) notFound();
+  if (!input.success) throw new Error("Invalid access");
 
-  try {
-    const org = await OrganizationRepository.adminFindById({ id: input.data.id });
-    const t = await getTranslate();
-    return (
-      <SettingsHeader
-        title={`${t("editing_org")}: ${org.name}`}
-        description={t("admin_orgs_edit_description")}>
-        <LicenseRequired>
-          <OrgForm org={org} />
-        </LicenseRequired>
-      </SettingsHeader>
-    );
-  } catch {
-    notFound();
-  }
+  const org = await OrganizationRepository.adminFindById({ id: input.data.id });
+  const t = await getTranslate();
+  return (
+    <SettingsHeader title={`${t("editing_org")}: ${org.name}`} description={t("admin_orgs_edit_description")}>
+      <LicenseRequired>
+        <OrgForm org={org} />
+      </LicenseRequired>
+    </SettingsHeader>
+  );
 };
 
 export default Page;

apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/[id]/edit/error.tsx

@@ -0,0 +1,9 @@
+"use client";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Alert } from "@calcom/ui/components/alert";
+
+export default function Error() {
+  const { t } = useLocale();
+  return <Alert severity="error" title={t("something_went_wrong")} />;
+}

apps/web/app/(use-page-wrapper)/settings/(admin-layout)/admin/users/[id]/edit/page.tsx

@@ -1,6 +1,5 @@
 import { type Params } from "app/_types";
 import { _generateMetadata, getTranslate } from "app/_utils";
-import { notFound } from "next/navigation";
 import { z } from "zod";
 
 import LicenseRequired from "@calcom/features/ee/common/components/LicenseRequired";
@@ -36,24 +35,18 @@ export const generateMetadata = async ({ params }: { params: Params }) => {
 const Page = async ({ params }: { params: Params }) => {
   const input = userIdSchema.safeParse(await params);
 
-  if (!input.success) {
-    notFound();
-  }
+  if (!input.success) throw new Error("Invalid access");
 
-  try {
-    const user = await UserRepository.adminFindById(input.data.id);
-    const t = await getTranslate();
+  const user = await UserRepository.adminFindById(input.data.id);
+  const t = await getTranslate();
 
-    return (
-      <SettingsHeader title={t("editing_user")} description={t("admin_users_edit_description")}>
-        <LicenseRequired>
-          <UsersEditView user={user} />
-        </LicenseRequired>
-      </SettingsHeader>
-    );
-  } catch {
-    notFound();
-  }
+  return (
+    <SettingsHeader title={t("editing_user")} description={t("admin_users_edit_description")}>
+      <LicenseRequired>
+        <UsersEditView user={user} />
+      </LicenseRequired>
+    </SettingsHeader>
+  );
 };
 
 export default Page;

apps/web/app/(use-page-wrapper)/settings/(settings-layout)/organizations/delegation-credential/delegation-credential.md

@@ -0,0 +1,124 @@
+# Delegation Credentials
+
+## Setting up Delegation Credential for Google Calendar API
+
+Step 1: Create a Google Cloud Project
+
+Before you can create a service account, you'll need to set up a Google Cloud project.
+
+ 1. Create a Google Cloud Project:
+        - Go to the Google Cloud Console
+        - Select Create Project
+        - Give your project a name and select your billing account (if applicable)
+        - Click Create
+ 2. Enable the Google Calendar API:
+     1. Go to the Google Cloud Console
+     2. Select API & Services → Library
+     3. Search for "Google Calendar API"
+     4. Click Enable
+
+Step 2: Create a Service Account
+
+A service account is needed to act on behalf of users
+
+ 1. Navigate to the Service Accounts page:
+    - In the Google Cloud Console, go to IAM & Admin → Service Accounts
+ 2. Create a New Service Account:
+    - Click on Create Service Account
+    - Give your service account a name and description
+    - Click Create and Continue
+
+Step 3: To Be taken by Cal.com instance admin:
+
+- Create a Workspace Platform with slug="google". Slug has to be exactly this. This is how we know we need to use Google Calendar and Google Meet.
+
+Last Step (To Be Taken By Cal.com organization Owner/Admin): Assign Specific API Permissions via OAuth Scopes:
+    - Create Delegation Credential with workspace platform "google"
+      - User must be a member of the Google Workspace to be able to enable Delegation Credential as there is a validation if the user's calendar can be accessed through the service account
+    - Get the Client ID from there
+    - Go to your Google Admin Console (admin-google-com)
+    - Navigate to Security → Access and Data Controls -> API controls -> Manage Domain-Wide Delegation
+    - Here, you'll authorize the Client ID(Unique ID) to access the Google Calendar API
+    - Add the necessary API scopes for Google Calendar(Full access to Google Calendar)
+        <https://www.googleapis.com/auth/calendar>
+
+## Onboarding Improvements
+
+- Just adding a member to the organization would do the following:
+  - Member to receive events in their calendar, even if they don't login to their account and complete the onboarding process.
+  - The booking location would be Google Meet, even if the user hasn't set it as default(Though Cal Video would show up as default, but we still use Google Meet in this case. We will fix it later.)
+  - It would still not use their calendar for conflict checking, but user can complete the onboarding(just select one calendar there for conflict checking)
+- Onboarding process: Google Calendar is pre-installed for any new member of the organization(assuming the user has an email of the Delegation Credential domain) and Destination Calendar and Selected Calendar are configurable. On next step, Google Meet is pre-installed and shown at the top and could be set as default.
+
+## Restrictions after enabling Delegation Credential
+
+- Enabling Delegation Credential for a particular workspace in Cal.com(only google/outlook supported at the moment) disables the user from disconnecting that credential.
+
+## Who can create Delegation Credential and enable it?
+
+- Only the owner/admin of the organization can create Delegation Credential
+- Only the owner/admin of the organization can enable the created Delegation Credential. Following additional requirements are there:
+  - The client ID must be added to the Google Admin Console
+  - The user's email must be a member of the Google Workspace
+  - The user's email must be verified.
+
+## Disabling Delegation Credential
+
+- Disabling Delegation **Credential** maintains the user's preferences in terms of SelectedCalendars and DestinationCalendar.
+
+## Developer Notes
+
+### Terminology
+
+- Delegation Credential: A Delegation Credential service account key along with user's email becomes the Delegation Credential which is an alternative to regular Credential in DB.
+- DWD: Domain Wide Delegation
+- non-dwd credential: Regular credentials that are stored in Credentials table
+
+### How Delegation Credential works
+
+- We use the Cal.com user's email to impersonate that user using Delegation Credential(which is just a service account key at the moment)
+  - That gives us read/write permission to get availability of the user and create new events in their calendar.
+
+### What is a Delegation Credential?
+
+- A Delegation Credential service account key along with user's email becomes the Delegation Credential which is an alternative to regular Credential in DB.
+- Delegation Credential doesn't completely replace the regular credentials. Delegation Credential gives access to the cal.com user's email in Google Calendar. So, if the user needs to connect to some other email's calendar, we need to use the regular credentials.
+
+### Important Points
+
+- No Credential table entry is created when enabling Delegation Credential. The workspace platform's related apps will be considered as "installed" for the users with email matching dwd domain. An in-memory credential like object is created for this purpose. It allows avoiding creation of thousands of records for all the members of the organization when Delegation Credential is enabled.
+- Delegation Credential is applicable to Users only.
+  - For team, we don't use Delegation Credential as you can impersonate a user and not team through Delegation Credential. Currently supported apps(Google Calendar and Google Meet) don't support team installation, so we could simply allow enabling Delegation Credential without any issues.
+- Disabling a workspace platform stops it from being used for any new organizations and also disables any Delegation Credential using the workspace platform from being edited.
+  - It still all existing Delegation Credentials to keep on working
+- Workspace default service account is unused and is to be removed.
+
+### How apps/installed loads the credentials
+
+1. Identify the logged in user's email
+2. Identify the domainWideDelegations for that email's domain
+3. Build in-memory credentials for the domainWideDelegations and use them along with the actual credentials(that user might have connected) of the user
+4. We don't show the non-dwd connected calendar(if there is a corresponding dwd connected calendar). Though we use the non-dwd credentials to identify the selected calendars, for the dwd connected calendar.
+
+### Impact of disabling Delegation Credential
+
+Disabling effectively stops generating in-memory delegation user credentials. So, any members who haven't manually connected their Calendar and thus their calendar connections were working only because of Delegation Credential, would have their connections broken.
+
+#### What would not work correctly ?
+
+- Calendar won't be checked for conflicts. So, they could get booked at a time when they are marked busy in their calendar.
+  - Cal.com bookings would still be checked for conflicts.
+- Bookings might not appear in the attendee and host's Google Calendar. Because we would be unable to use the API to create the events in calendar and Google doesn't always add events to calendar automatically based on .ics file alone.
+- Cal Video would be used as the booking location instead of Google Meet.
+
+#### What would work correctly ?
+
+- Bookings would still go through. People relying on Salesforce for booking details, would face no issues.
+- Cal.com bookings would still be checked for conflicts.
+
+### Notes when testing locally
+
+- You need to enable the feature through feature flag.
+- You could use Acme org and login as <owner1-acme@example.com>
+- Make sure to change the email of the user above to your workspace owner's email(other member's email might also work). This is necessary otherwise you won't be able to enable Delegation Credential for the organization.
+  - Note: After changing the email, you would have to logout and login again

apps/web/app/(use-page-wrapper)/workflows/[workflow]/error.tsx

@@ -0,0 +1,9 @@
+"use client";
+
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Alert } from "@calcom/ui/components/alert";
+
+export default function Error() {
+  const { t } = useLocale();
+  return <Alert severity="error" title={t("something_went_wrong")} />;
+}

apps/web/app/(use-page-wrapper)/workflows/[workflow]/page.tsx

@@ -1,15 +1,10 @@
 import type { PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
-import type { Metadata } from "next";
-import { notFound } from "next/navigation";
-import { cache } from "react";
 import { z } from "zod";
 
 // import { cookies, headers } from "next/headers";
 // import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 // import { buildLegacyRequest } from "@lib/buildLegacyCtx";
 import LegacyPage from "@calcom/features/ee/workflows/pages/workflow";
-import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
 
 const querySchema = z.object({
   workflow: z
@@ -20,33 +15,11 @@ const querySchema = z.object({
     .transform((val) => Number(val)),
 });
 
-const getWorkflow = cache((id: number) => WorkflowRepository.getById({ id }));
-
-export const generateMetadata = async ({ params }: PageProps): Promise<Metadata | null> => {
-  const parsed = querySchema.safeParse(await params);
-  if (!parsed.success) {
-    notFound();
-  }
-  const workflow = await getWorkflow(parsed.data.workflow);
-  if (!workflow) {
-    notFound();
-  }
-  return await _generateMetadata(
-    (t) => (workflow && workflow.name ? workflow.name : t("untitled")),
-    () => "",
-    undefined,
-    undefined,
-    `/workflows/${parsed.data.workflow}`
-  );
-};
-
 const Page = async ({ params }: PageProps) => {
   // const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });
   // const user = session?.user;
   const parsed = querySchema.safeParse(await params);
-  if (!parsed.success) {
-    notFound();
-  }
+  if (!parsed.success) throw new Error("Invalid workflow id");
 
   // const workflow = await WorkflowRepository.getById({ id: +parsed.data.workflow });
   // let verifiedEmails, verifiedNumbers;

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

@@ -0,0 +1,12 @@
+import { _generateMetadata } from "app/_utils";
+import type { ReactNode } from "react";
+
+export const generateMetadata = async () =>
+  await _generateMetadata(
+    (t) => t("workflows"),
+    (t) => t("workflows_to_automate_notifications")
+  );
+
+export default function Layout({ children }: { children: ReactNode }) {
+  return <>{children}</>;
+}

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

@@ -1,6 +1,3 @@
-import type { PageProps } from "app/_types";
-import { _generateMetadata } from "app/_utils";
-
 // import { cookies, headers } from "next/headers";
 // import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
 // import { buildLegacyRequest } from "@lib/buildLegacyCtx";
@@ -8,16 +5,7 @@ import { _generateMetadata } from "app/_utils";
 // import { WorkflowRepository } from "@calcom/lib/server/repository/workflow";
 import LegacyPage from "@calcom/features/ee/workflows/pages/index";
 
-export const generateMetadata = async () =>
-  await _generateMetadata(
-    (t) => t("workflows"),
-    (t) => t("workflows_to_automate_notifications"),
-    undefined,
-    undefined,
-    "/workflows"
-  );
-
-const Page = async ({ params, searchParams }: PageProps) => {
+const Page = async () => {
   // const session = await getServerSession({ req: buildLegacyRequest(await headers(), await cookies()) });
   // const user = session?.user;
 

apps/web/app/api/cron/credentials/route.ts

@@ -0,0 +1,152 @@
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
+
+import { HttpError } from "@calcom/lib/http-error";
+import logger from "@calcom/lib/logger";
+import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { DelegationCredentialRepository } from "@calcom/lib/server/repository/delegationCredential";
+
+import { defaultResponderForAppDir } from "../../defaultResponderForAppDir";
+
+const log = logger.getSubLogger({ prefix: ["CreateCredentials"] });
+const batchSizeToCreateCredentials = 100;
+const validateRequest = (req: NextRequest) => {
+  const url = new URL(req.url);
+  const apiKey = req.headers.get("authorization") || url.searchParams.get("apiKey");
+  if (![process.env.CRON_API_KEY, `Bearer ${process.env.CRON_SECRET}`].includes(`${apiKey}`)) {
+    throw new HttpError({ statusCode: 401, message: "Unauthorized" });
+  }
+};
+
+async function handleCreateCredentials() {
+  const delegationCredentials = await DelegationCredentialRepository.findAllEnabledIncludeDelegatedMembers();
+
+  if (!delegationCredentials.length) {
+    return {
+      message: "No enabled delegation credentials found",
+      success: 0,
+      failures: 0,
+    };
+  }
+  let totalSuccess = 0;
+  let totalFailures = 0;
+  for (const delegationCredential of delegationCredentials) {
+    const { workspacePlatform, organization } = delegationCredential;
+
+    if (workspacePlatform.slug !== "google") {
+      log.info(
+        `Skipping credential creation for workspace platform ${workspacePlatform.slug} - only google is supported`
+      );
+      return;
+    }
+
+    // We can't know by looking at a Credential record in DB, if it has access to the `user.email` calendar in Google Calendar.
+    // It could be a credential of a personal calendar of the same user. So, we can't just reuse any existing credential for the user, we have to check if this specific delegationCredential's UserCredential exists or not
+    const existingCredentials =
+      await CredentialRepository.findAllDelegationByUserIdsListAndDelegationCredentialIdAndType({
+        userIds: organization.delegatedMembers.map((member) => member.userId),
+        delegationCredentialId: delegationCredential.id,
+        type: "google_calendar",
+      });
+
+    const existingCredentialUserIds = new Set(existingCredentials.map((cred) => cred.userId));
+
+    const membersNeedingCredentials = organization.delegatedMembers.filter(
+      (member) => !existingCredentialUserIds.has(member.userId)
+    );
+
+    const toProcessMembers = membersNeedingCredentials.slice(0, batchSizeToCreateCredentials);
+
+    log.info(
+      `Creating credentials for ${toProcessMembers.length} members in organization ${organization.id}`
+    );
+
+    const credentialCreationPromises = toProcessMembers.map(async (member) => {
+      try {
+        await CredentialRepository.create({
+          type: "google_calendar",
+          key: {
+            // The in-memory credential that we create for Delegation Credential has access_token as "NOOP_UNUSED_DELEGATION_TOKEN. This is to mark it is in DB, in case we need to identify that.
+            access_token: "NOOP_UNUSED_DELEGATION_TOKEN_DB",
+          },
+          userId: member.userId,
+          appId: "google-calendar",
+          delegationCredentialId: delegationCredential.id,
+        });
+        log.info(`Created credential for member ${member.userId}`);
+      } catch (error) {
+        log.error(`Error creating credential for member ${member.userId}:`, error);
+        throw error;
+      }
+    });
+    const results = await Promise.allSettled(credentialCreationPromises);
+    const successCount = results.filter((r) => r.status === "fulfilled").length;
+    const failureCount = results.filter((r) => r.status === "rejected").length;
+
+    totalSuccess += successCount;
+    totalFailures += failureCount;
+  }
+
+  return {
+    executedAt: new Date().toISOString(),
+    success: totalSuccess,
+    failures: totalFailures,
+  };
+}
+
+async function handleDeleteCredentials() {
+  const delegationCredentials =
+    await DelegationCredentialRepository.findAllDisabledAndIncludeNextBatchOfMembersToProcess();
+
+  if (!delegationCredentials.length) {
+    return {
+      message: "No disabled delegation credentials found",
+      success: 0,
+      failures: 0,
+    };
+  }
+  let totalSuccess = 0;
+  for (const delegationCredential of delegationCredentials) {
+    const { workspacePlatform } = delegationCredential;
+
+    if (workspacePlatform.slug !== "google") {
+      log.info(
+        `Skipping credential deletion for workspace platform ${workspacePlatform.slug} - only google is supported`
+      );
+      continue;
+    }
+
+    // DB?: can deleting all credentials at once be problematic?
+    const { count } = await CredentialRepository.deleteAllByDelegationCredentialId({
+      delegationCredentialId: delegationCredential.id,
+    });
+    totalSuccess += count;
+  }
+  log.info(`Deleted ${totalSuccess} credentials for disabled delegation credentials`);
+
+  return {
+    executedAt: new Date().toISOString(),
+    success: totalSuccess,
+    failures: 0,
+  };
+}
+
+const handler = async (request: NextRequest) => {
+  validateRequest(request);
+  const result = await Promise.allSettled([handleCreateCredentials(), handleDeleteCredentials()]);
+  const response = result.map((r, index) => {
+    if (r.status === "fulfilled") {
+      return {
+        ...r.value,
+        message: `Successfully executed ${index === 0 ? "create" : "delete"} credentials`,
+      };
+    }
+    return {
+      ...r.reason,
+      message: `Failed to execute ${index === 0 ? "create" : "delete"} credentials`,
+    };
+  });
+  return NextResponse.json(response);
+};
+
+export const GET = defaultResponderForAppDir(handler);

apps/web/app/api/cron/selected-calendars/route.ts

@@ -0,0 +1,178 @@
+import type { NextRequest } from "next/server";
+import { NextResponse } from "next/server";
+
+import GoogleCalendarService from "@calcom/app-store/googlecalendar/lib/CalendarService";
+import { findUniqueDelegationCalendarCredential } from "@calcom/lib/delegationCredential/server";
+import { HttpError } from "@calcom/lib/http-error";
+import logger from "@calcom/lib/logger";
+import { safeStringify } from "@calcom/lib/safeStringify";
+import { CredentialRepository } from "@calcom/lib/server/repository/credential";
+import { SelectedCalendarRepository } from "@calcom/lib/server/repository/selectedCalendar";
+import type { CredentialForCalendarServiceWithEmail } from "@calcom/types/Credential";
+import type { Ensure } from "@calcom/types/utils";
+
+import { defaultResponderForAppDir } from "../../defaultResponderForAppDir";
+
+const limitOnQueryingGoogleCalendar = 50;
+const log = logger.getSubLogger({ prefix: ["[api] selected-calendars/cron"] });
+const validateRequest = (req: NextRequest) => {
+  const url = new URL(req.url);
+  const apiKey = req.headers.get("authorization") || url.searchParams.get("apiKey");
+  if (![process.env.CRON_API_KEY, `Bearer ${process.env.CRON_SECRET}`].includes(`${apiKey}`)) {
+    throw new HttpError({ statusCode: 401, message: "Unauthorized" });
+  }
+};
+
+async function handleCreateSelectedCalendars() {
+  // These are in DB delegation user credentials in contrast to in-memory delegation user credentials that are used elsewhere
+  const allDelegationUserCredentials = await CredentialRepository.findAllDelegationByTypeIncludeUserAndTake({
+    type: "google_calendar",
+    take: limitOnQueryingGoogleCalendar,
+  });
+
+  if (!allDelegationUserCredentials.length) {
+    return {
+      message: "No delegation credentials found",
+      success: 0,
+      failures: 0,
+    };
+  }
+
+  // Groups delegationUserCredentials by delegationCredentialId
+  const groupedDelegationUserCredentials = allDelegationUserCredentials.reduce((acc, curr) => {
+    acc[curr.delegationCredentialId] = [...(acc[curr.delegationCredentialId] || []), curr];
+    return acc;
+  }, {} as Record<string, typeof allDelegationUserCredentials>);
+
+  let totalSuccess = 0;
+  let totalFailures = 0;
+
+  for (const [delegationCredentialId, delegationUserCredentials] of Object.entries(
+    groupedDelegationUserCredentials
+  )) {
+    // First, create an array of promises that check if each credential should be processed
+    const checkedDelegationUserCredentials = await Promise.all(
+      delegationUserCredentials.map(async (delegationUserCredential) => {
+        if (!delegationUserCredential.user) {
+          log.error(`Credential ${delegationUserCredential.id} has no user`);
+          return null;
+        }
+
+        // Get all selectedCalendars for this user, regardless of credentialId as we want to reuse the existing SelectedCalendar(which has their googleChannel related column set) after Delegation Credential has been enabled
+        const hasSelectedCalendarForUserEmail = !!(await SelectedCalendarRepository.findFirst({
+          where: {
+            userId: delegationUserCredential.user.id,
+            externalId: delegationUserCredential.user.email,
+          },
+        }));
+
+        if (hasSelectedCalendarForUserEmail) {
+          log.info(`Found a reusable SelectedCalendar for ${delegationUserCredential.user.id}`);
+          return null;
+        }
+        return delegationUserCredential;
+      })
+    );
+
+    const delegationUserCredentialsToProcess = checkedDelegationUserCredentials.filter(
+      (credential): credential is Ensure<(typeof delegationUserCredentials)[number], "user"> =>
+        credential !== null
+    );
+
+    log.info(
+      `Found ${delegationUserCredentialsToProcess.length} delegationUserCredentials to process for delegationCredentialId: ${delegationCredentialId}`
+    );
+
+    const results = await Promise.allSettled(
+      delegationUserCredentialsToProcess.map(async (delegationUserCredential) => {
+        try {
+          const credentialForCalendarService = await findUniqueDelegationCalendarCredential({
+            userId: delegationUserCredential.user.id,
+            delegationCredentialId: delegationUserCredential.delegationCredentialId,
+          });
+
+          if (!credentialForCalendarService) {
+            log.error(
+              `Credential not found for delegationCredentialId: ${delegationUserCredential.delegationCredentialId} and userId: ${delegationUserCredential.user.id}`
+            );
+            return;
+          }
+
+          if (
+            !credentialForCalendarService.delegatedTo ||
+            !credentialForCalendarService.delegatedTo.serviceAccountKey ||
+            !credentialForCalendarService.delegatedTo.serviceAccountKey.client_email
+          ) {
+            log.error(
+              `Invalid delegatedTo for delegationCredentialId: ${delegationUserCredential.delegationCredentialId}`,
+              safeStringify({
+                delegatedToSet: !!credentialForCalendarService.delegatedTo,
+                serviceAccountKeySet: !!credentialForCalendarService.delegatedTo?.serviceAccountKey,
+                clientEmailSet: !!credentialForCalendarService.delegatedTo?.serviceAccountKey?.client_email,
+              })
+            );
+            return;
+          }
+
+          const googleCalendarService = new GoogleCalendarService(
+            credentialForCalendarService as CredentialForCalendarServiceWithEmail
+          );
+
+          let primaryCalendar;
+          try {
+            primaryCalendar = await googleCalendarService.fetchPrimaryCalendar();
+          } catch (error) {
+            log.error(
+              `Error fetching primary calendar for delegationCredentialId: ${delegationUserCredential.delegationCredentialId} and userId: ${delegationUserCredential.userId}`,
+              safeStringify(error)
+            );
+            return;
+          }
+
+          if (!primaryCalendar || !primaryCalendar.id) {
+            log.error(
+              `Primary calendar not found for delegationCredentialId: ${delegationUserCredential.delegationCredentialId} and userId: ${delegationUserCredential.userId}`
+            );
+            return;
+          }
+
+          await SelectedCalendarRepository.create({
+            integration: "google_calendar",
+            externalId: primaryCalendar.id,
+            userId: delegationUserCredential.user.id,
+            delegationCredentialId: delegationUserCredential.delegationCredentialId,
+            credentialId: delegationUserCredential.id,
+          });
+
+          log.debug(`Created SelectedCalendar for user ${delegationUserCredential.userId}`);
+        } catch (error) {
+          log.error(`Error processing credential ${delegationUserCredential.id}:`, safeStringify(error));
+          throw error;
+        }
+      })
+    );
+    const successCount = results.filter((r) => r.status === "fulfilled").length;
+    const failureCount = results.filter((r) => r.status === "rejected").length;
+
+    totalSuccess += successCount;
+    totalFailures += failureCount;
+  }
+
+  log.info(
+    `Completed processing all selected calendars. Total Success: ${totalSuccess}, Total Failures: ${totalFailures}`
+  );
+
+  return {
+    message: "All selected calendars processed",
+    executedAt: new Date().toISOString(),
+    success: totalSuccess,
+    failures: totalFailures,
+  };
+}
+
+const handler = async (request: NextRequest) => {
+  validateRequest(request);
+  return NextResponse.json(await handleCreateSelectedCalendars());
+};
+
+export const GET = defaultResponderForAppDir(handler);

apps/web/app/api/recorded-daily-video/route.ts

@@ -52,10 +52,6 @@ const getDownloadLinkOfCalVideo = async (recordingId: string) => {
 };
 
 export async function postHandler(request: NextRequest) {
-  if (!process.env.SENDGRID_API_KEY || !process.env.SENDGRID_EMAIL) {
-    return NextResponse.json({ message: "No SendGrid API key or email" }, { status: 405 });
-  }
-
   const body = await request.json();
 
   if (testRequestSchema.safeParse(body).success) {

apps/web/components/apps/layouts/AppsLayout.tsx

@@ -1,4 +1,3 @@
-import { useSession } from "next-auth/react";
 import { useRouter } from "next/navigation";
 import type { ComponentProps } from "react";
 import React from "react";
@@ -9,15 +8,14 @@ import { EmptyScreen } from "@calcom/ui/components/empty-screen";
 
 type AppsLayoutProps = {
   children: React.ReactNode;
+  isAdmin: boolean;
   actions?: (className?: string) => JSX.Element;
   emptyStore?: boolean;
 } & Omit<ComponentProps<typeof Shell>, "actions">;
 
-export default function AppsLayout({ children, actions, emptyStore, ...rest }: AppsLayoutProps) {
+export default function AppsLayout({ children, actions, emptyStore, isAdmin, ...rest }: AppsLayoutProps) {
   const { t } = useLocale();
-  const session = useSession();
   const router = useRouter();
-  const isAdmin = session.data?.user.role === "ADMIN";
 
   return (
     <Shell {...rest} actions={actions?.("block")}>

apps/web/lib/__tests__/getThemeProviderProps.test.ts

@@ -195,6 +195,11 @@ describe("getUniqueIdentifierForBookingPage", () => {
       const result = getUniqueIdentifierForBookingPage({ pathname: path });
       expect(result).toBe(expected);
     });
+
+    it("should return / for root path", () => {
+      const result = getUniqueIdentifierForBookingPage({ pathname: "/" });
+      expect(result).toBe("/");
+    });
   });
 
   describe("Team Pages", () => {

apps/web/lib/apps/getServerSideProps.tsx

@@ -1,47 +0,0 @@
-import type { GetServerSidePropsContext } from "next";
-
-import { getAppRegistry, getAppRegistryWithCredentials } from "@calcom/app-store/_appRegistry";
-import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-import { UserRepository } from "@calcom/lib/server/repository/user";
-import type { AppCategories } from "@calcom/prisma/enums";
-
-export const getServerSideProps = async (context: GetServerSidePropsContext) => {
-  const { req } = context;
-
-  const session = await getServerSession({ req });
-
-  let appStore, userAdminTeamsIds: number[];
-  if (session?.user?.id) {
-    const userAdminTeams = await UserRepository.getUserAdminTeams(session.user.id);
-    userAdminTeamsIds = userAdminTeams?.teams?.map(({ team }) => team.id) ?? [];
-    appStore = await getAppRegistryWithCredentials(session.user.id, userAdminTeamsIds);
-  } else {
-    appStore = await getAppRegistry();
-    userAdminTeamsIds = [];
-  }
-
-  const categoryQuery = appStore.map(({ categories }) => ({
-    categories: categories || [],
-  }));
-  const categories = categoryQuery.reduce((c, app) => {
-    for (const category of app.categories) {
-      c[category] = c[category] ? c[category] + 1 : 1;
-    }
-    return c;
-  }, {} as Record<string, number>);
-
-  return {
-    props: {
-      categories: Object.entries(categories)
-        .map(([name, count]): { name: AppCategories; count: number } => ({
-          name: name as AppCategories,
-          count,
-        }))
-        .sort(function (a, b) {
-          return b.count - a.count;
-        }),
-      appStore,
-      userAdminTeams: userAdminTeamsIds,
-    },
-  };
-};

apps/web/lib/event-types/[type]/getServerSideProps.ts

@@ -1,51 +0,0 @@
-import { createRouterCaller } from "app/_trpc/context";
-import type { GetServerSidePropsContext } from "next";
-import { redirect, notFound } from "next/navigation";
-
-import { getServerSession } from "@calcom/features/auth/lib/getServerSession";
-import logger from "@calcom/lib/logger";
-import { safeStringify } from "@calcom/lib/safeStringify";
-import type { RouterOutputs } from "@calcom/trpc";
-import { eventTypesRouter } from "@calcom/trpc/server/routers/viewer/eventTypes/_router";
-
-import { asStringOrThrow } from "@lib/asStringOrNull";
-
-export type PageProps = {
-  type: number;
-  data: RouterOutputs["viewer"]["eventTypes"]["get"];
-};
-
-export const getServerSideProps = async (context: GetServerSidePropsContext) => {
-  const { req, query } = context;
-
-  const session = await getServerSession({ req });
-
-  const typeParam = parseInt(asStringOrThrow(query.type));
-
-  if (Number.isNaN(typeParam)) {
-    return notFound();
-  }
-
-  if (!session?.user?.id) {
-    return redirect("/auth/login");
-  }
-  const getEventTypeById = async (eventTypeId: number) => {
-    const caller = await createRouterCaller(eventTypesRouter);
-
-    try {
-      return await caller.get({ id: eventTypeId });
-    } catch (e: unknown) {
-      logger.error(safeStringify(e));
-      // reject, user has no access to this event type.
-      return null;
-    }
-  };
-  const data = await getEventTypeById(typeParam);
-  if (!data?.eventType) {
-    return redirect("/event-types");
-  }
-  return {
-    data,
-    type: typeParam,
-  };
-};

apps/web/lib/getThemeProviderProps.ts

@@ -16,6 +16,11 @@ const enum ThemeSupport {
  * The theme stays same for same identifier.
  */
 export function getUniqueIdentifierForBookingPage({ pathname }: { pathname: string }) {
+  if (pathname === "/") {
+    // For Org domains, we could have a booking page at root path too, so we use '/' as identifier
+    // As localStorage isn't shared for different org domains, it's safe to use '/' as identifier
+    return "/";
+  }
   const pathTokens = pathname.split("/").slice(1);
 
   // If it is a booking page then it could be one of the following:

apps/web/lib/hooks/settings/platform/billing/useUnsubscribeTeamToStripe.ts

@@ -0,0 +1,36 @@
+import { useMutation } from "@tanstack/react-query";
+
+import { SUCCESS_STATUS } from "@calcom/platform-constants";
+import type { ApiResponse } from "@calcom/platform-types";
+
+export const useUnsubscribeTeamToStripe = (
+  { onSuccess, onError, teamId }: { teamId?: number | null; onSuccess: () => void; onError: () => void } = {
+    onSuccess: () => {
+      return;
+    },
+    onError: () => {
+      return;
+    },
+  }
+) => {
+  const mutation = useMutation<ApiResponse, unknown>({
+    mutationFn: (data) => {
+      return fetch(`/api/v2/billing/${teamId}/unsubscribe`, {
+        method: "delete",
+        headers: { "Content-type": "application/json" },
+      }).then((res) => res?.json());
+    },
+    onSuccess: (data) => {
+      if (data.status === SUCCESS_STATUS) {
+        onSuccess?.();
+      } else {
+        onError?.();
+      }
+    },
+    onError: () => {
+      onError?.();
+    },
+  });
+
+  return mutation;
+};

apps/web/middleware.test.ts

@@ -3,7 +3,7 @@ import { describe, it, expect } from "vitest";
 
 import { WEBAPP_URL } from "@calcom/lib/constants";
 
-import { checkPostMethod, POST_METHODS_ALLOWED_APP_ROUTES } from "./middleware";
+import { checkPostMethod } from "./middleware";
 
 describe("Middleware - POST requests restriction", () => {
   const createRequest = (path: string, method: string) => {
@@ -24,14 +24,6 @@ describe("Middleware - POST requests restriction", () => {
     expect(res2).toBeNull();
   });
 
-  it("should allow POST requests to allowed app routes", async () => {
-    POST_METHODS_ALLOWED_APP_ROUTES.forEach(async (route) => {
-      const req = createRequest(route, "POST");
-      const res = checkPostMethod(req);
-      expect(res).toBeNull();
-    });
-  });
-
   it("should block POST requests to not-allowed app routes", async () => {
     const req = createRequest("/team/xyz", "POST");
     const res = checkPostMethod(req);

apps/web/middleware.ts

@@ -16,21 +16,9 @@ const safeGet = async <T = any>(key: string): Promise<T | undefined> => {
 };
 
 export const POST_METHODS_ALLOWED_API_ROUTES = ["/api/auth/signup", "/api/trpc/"];
-// Some app routes are allowed because "revalidatePath()" is used to revalidate the cache for them
-export const POST_METHODS_ALLOWED_APP_ROUTES = [
-  "/settings/my-account/general",
-  "/settings/developer/webhooks",
-  "/settings/developer/api-keys",
-  "/teams",
-];
 export function checkPostMethod(req: NextRequest) {
   const pathname = req.nextUrl.pathname;
-  if (
-    ![...POST_METHODS_ALLOWED_API_ROUTES, ...POST_METHODS_ALLOWED_APP_ROUTES].some((route) =>
-      pathname.startsWith(route)
-    ) &&
-    req.method === "POST"
-  ) {
+  if (!POST_METHODS_ALLOWED_API_ROUTES.some((route) => pathname.startsWith(route)) && req.method === "POST") {
     return new NextResponse(null, {
       status: 405,
       statusText: "Method Not Allowed",
@@ -191,11 +179,6 @@ export const config = {
     // API routes
     "/api/auth/signup",
     "/api/trpc/:path*",
-    // Routes allowed for POST method (matching `POST_METHODS_ALLOWED_APP_ROUTES` array)
-    "/settings/my-account/general",
-    "/settings/developer/webhooks",
-    "/settings/developer/api-keys",
-    "/teams",
   ],
 };
 

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

@@ -8,15 +8,14 @@ import { AppStoreCategories } from "@calcom/features/apps/components/Categories"
 import { PopularAppsSlider } from "@calcom/features/apps/components/PopularAppsSlider";
 import { RecentAppsSlider } from "@calcom/features/apps/components/RecentAppsSlider";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
-import type { inferSSRProps } from "@calcom/types/inferSSRProps";
+import type { AppCategories } from "@calcom/prisma/enums";
+import type { AppFrontendPayload } from "@calcom/types/App";
 import classNames from "@calcom/ui/classNames";
 import { TextField } from "@calcom/ui/components/form";
 import { Icon } from "@calcom/ui/components/icon";
 import type { HorizontalTabItemProps } from "@calcom/ui/components/navigation";
 import { HorizontalTabs } from "@calcom/ui/components/navigation";
 
-import { type getServerSideProps } from "@lib/apps/getServerSideProps";
-
 import AppsLayout from "@components/apps/layouts/AppsLayout";
 
 const tabs: HorizontalTabItemProps[] = [
@@ -51,15 +50,24 @@ function AppsSearch({
   );
 }
 
-export type PageProps = inferSSRProps<typeof getServerSideProps>;
+export type PageProps = {
+  categories: {
+    name: AppCategories;
+    count: number;
+  }[];
+  appStore: AppFrontendPayload[];
+  userAdminTeams: number[];
+  isAdmin: boolean;
+};
 
-export default function Apps({ categories, appStore, userAdminTeams }: PageProps) {
+export default function Apps({ isAdmin, categories, appStore, userAdminTeams }: PageProps) {
   const { t } = useLocale();
   const [searchText, setSearchText] = useState<string | undefined>(undefined);
 
   return (
     <AppsLayout
       isPublic
+      isAdmin={isAdmin}
       heading={t("app_store")}
       subtitle={t("app_store_description")}
       actions={(className) => (

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

@@ -113,16 +113,19 @@ const OnboardingPage = ({
   const STEPS_MAP: StepObj = {
     [AppOnboardingSteps.ACCOUNTS_STEP]: {
       getTitle: () => `${t("select_account_header")}`,
-      getDescription: (appName) => `${t("select_account_description", { appName })}`,
+      getDescription: (appName) =>
+        `${t("select_account_description", { appName, interpolation: { escapeValue: false } })}`,
       stepNumber: 1,
     },
     [AppOnboardingSteps.EVENT_TYPES_STEP]: {
       getTitle: () => `${t("select_event_types_header")}`,
-      getDescription: (appName) => `${t("select_event_types_description", { appName })}`,
+      getDescription: (appName) =>
+        `${t("select_event_types_description", { appName, interpolation: { escapeValue: false } })}`,
       stepNumber: installableOnTeams ? 2 : 1,
     },
     [AppOnboardingSteps.CONFIGURE_STEP]: {
-      getTitle: (appName) => `${t("configure_app_header", { appName })}`,
+      getTitle: (appName) =>
+        `${t("configure_app_header", { appName, interpolation: { escapeValue: false } })}`,
       getDescription: () => `${t("configure_app_description")}`,
       stepNumber: installableOnTeams ? 3 : 2,
     },

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

@@ -150,6 +150,10 @@ export default function Success(props: PageProps) {
   const { data: session } = useSession();
   const isHost = props.isLoggedInUserHost;
 
+  const [showUtmParams, setShowUtmParams] = useState(false);
+
+  const utmParams = bookingInfo.tracking;
+
   const [date, setDate] = useState(dayjs.utc(bookingInfo.startTime));
   const calendarLinks = getCalendarLinks({
     booking: bookingWithParsedMetadata,
@@ -681,6 +685,46 @@ export default function Success(props: PageProps) {
                             </div>
                           </>
                         )}
+                        {!!utmParams && isHost && (
+                          <>
+                            <div className="mt-9 pr-2 font-medium sm:pr-0">{t("utm_params")}</div>
+                            <div className="col-span-2 mb-2 ml-3 mt-9 sm:ml-0">
+                              <button
+                                data-testid="utm-dropdown"
+                                onClick={() => {
+                                  setShowUtmParams((prev) => !prev);
+                                }}
+                                className="font-medium transition hover:text-blue-500 focus:outline-none">
+                                <div className="flex items-center gap-1">
+                                  {showUtmParams ? t("hide") : t("show")}
+                                  <Icon
+                                    name={showUtmParams ? "chevron-up" : "chevron-down"}
+                                    className="size-4"
+                                  />
+                                </div>
+                              </button>
+
+                              {showUtmParams && (
+                                <div className="col-span-2 mb-2 mt-2">
+                                  {Object.entries(utmParams).filter(([_, value]) => Boolean(value)).length >
+                                  0 ? (
+                                    <ul className="list-disc space-y-1 p-1 pl-5 sm:w-80">
+                                      {Object.entries(utmParams)
+                                        .filter(([_, value]) => Boolean(value))
+                                        .map(([key, value]) => (
+                                          <li key={key} className="text-muted space-x-1 text-sm">
+                                            <span>{key}</span>: <span>{value}</span>
+                                          </li>
+                                        ))}
+                                    </ul>
+                                  ) : (
+                                    <p className="text-muted text-sm">{t("no_utm_params")}</p>
+                                  )}
+                                </div>
+                              )}
+                            </div>
+                          </>
+                        )}
                       </div>
                       <div className="text-bookingdark dark:border-darkgray-200 mt-8 text-left dark:text-gray-300">
                         {eventType.bookingFields.map((field) => {

apps/web/modules/event-types/views/event-types-listing-view.tsx

@@ -14,10 +14,7 @@ import { EventTypeEmbedButton, EventTypeEmbedDialog } from "@calcom/features/emb
 import { EventTypeDescription } from "@calcom/features/eventtypes/components";
 import CreateEventTypeDialog from "@calcom/features/eventtypes/components/CreateEventTypeDialog";
 import { DuplicateDialog } from "@calcom/features/eventtypes/components/DuplicateDialog";
-import {
-  InfiniteSkeletonLoader,
-  EventTypesSkeletonLoader,
-} from "@calcom/features/eventtypes/components/SkeletonLoader";
+import { InfiniteSkeletonLoader } from "@calcom/features/eventtypes/components/SkeletonLoader";
 import { parseEventTypeColor } from "@calcom/lib";
 import { APP_NAME, WEBSITE_URL } from "@calcom/lib/constants";
 import { useCopy } from "@calcom/lib/hooks/useCopy";
@@ -32,7 +29,6 @@ import { SchedulingType } from "@calcom/prisma/enums";
 import type { RouterOutputs } from "@calcom/trpc/react";
 import { trpc } from "@calcom/trpc/react";
 import classNames from "@calcom/ui/classNames";
-import { Alert } from "@calcom/ui/components/alert";
 import { ArrowButton } from "@calcom/ui/components/arrow-button";
 import { UserAvatarGroup } from "@calcom/ui/components/avatar";
 import { Badge } from "@calcom/ui/components/badge";
@@ -58,8 +54,6 @@ import { Skeleton } from "@calcom/ui/components/skeleton";
 import { showToast } from "@calcom/ui/components/toast";
 import { Tooltip } from "@calcom/ui/components/tooltip";
 
-import useMeQuery from "@lib/hooks/useMeQuery";
-
 import { TRPCClientError } from "@trpc/client";
 
 type GetUserEventGroupsResponse = RouterOutputs["viewer"]["eventTypes"]["getUserEventGroups"];
@@ -839,7 +833,6 @@ const CreateFirstEventTypeView = ({ slug, searchTerm }: { slug: string; searchTe
 
 const CTA = ({
   profileOptions,
-  isOrganization,
 }: {
   profileOptions: {
     teamId: number | null | undefined;
@@ -848,7 +841,6 @@ const CTA = ({
     membershipRole: MembershipRole | null | undefined;
     slug: string | null;
   }[];
-  isOrganization: boolean;
 }) => {
   const { t } = useLocale();
 
@@ -890,28 +882,16 @@ const EmptyEventTypeList = ({
 };
 
 const InfiniteScrollMain = ({
-  status,
-  errorMessage,
   eventTypeGroups,
   profiles,
 }: {
-  status: string;
-  errorMessage?: string;
-  eventTypeGroups: GetUserEventGroupsResponse["eventTypeGroups"] | undefined;
-  profiles: GetUserEventGroupsResponse["profiles"] | undefined;
+  eventTypeGroups: GetUserEventGroupsResponse["eventTypeGroups"];
+  profiles: GetUserEventGroupsResponse["profiles"];
 }) => {
   const searchParams = useSearchParams();
   const { data } = useTypedQuery(querySchema);
   const orgBranding = useOrgBranding();
 
-  if (status === "error") {
-    return <Alert severity="error" title="Something went wrong" message={errorMessage} />;
-  }
-
-  if (!eventTypeGroups || !profiles || status === "pending") {
-    return <EventTypesSkeletonLoader />;
-  }
-
   const tabs = eventTypeGroups.map((item) => ({
     name: item.profile.name ?? "",
     href: item.teamId ? `/event-types?teamId=${item.teamId}` : "/event-types",
@@ -947,25 +927,13 @@ const InfiniteScrollMain = ({
 };
 
 type Props = {
-  initialData: RouterOutputs["viewer"]["eventTypes"]["getUserEventGroups"];
-  filters?: { teamIds?: number[] | undefined; userIds?: number[] | undefined; upIds?: string[] | undefined };
+  userEventGroupsData: GetUserEventGroupsResponse;
+  user: RouterOutputs["viewer"]["me"]["get"];
 };
 
-export const EventTypesCTA = ({ initialData, filters }: Props) => {
-  const { data: user } = useMeQuery();
-  const { data: userEventGroupsQuery } = trpc.viewer.eventTypes.getUserEventGroups.useQuery(
-    filters && { filters },
-    {
-      refetchOnWindowFocus: false,
-      gcTime: 1 * 60 * 60 * 1000,
-      staleTime: 1 * 60 * 60 * 1000,
-    }
-  );
-
-  const getUserEventGroupsData = userEventGroupsQuery ?? initialData;
-
+export const EventTypesCTA = ({ userEventGroupsData }: Omit<Props, "user">) => {
   const profileOptions =
-    getUserEventGroupsData?.profiles
+    userEventGroupsData?.profiles
       ?.filter((profile) => !profile.readOnly)
       ?.filter((profile) => !profile.eventTypesLockedByOrg)
       ?.map((profile) => {
@@ -978,28 +946,14 @@ export const EventTypesCTA = ({ initialData, filters }: Props) => {
         };
       }) ?? [];
 
-  return <CTA profileOptions={profileOptions} isOrganization={!!user?.organizationId} />;
+  return <CTA profileOptions={profileOptions} />;
 };
 
-const EventTypesPage = ({ initialData, filters }: Props) => {
-  const { data: user } = useMeQuery();
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+const EventTypesPage = ({ userEventGroupsData, user }: Props) => {
   const [_showProfileBanner, setShowProfileBanner] = useState(false);
   const orgBranding = useOrgBranding();
   const router = useRouter();
 
-  // TODO: Maybe useSuspenseQuery to focus on success case only? Remember that it would crash the page when there is an error in query. Also, it won't support skeleton
-  const {
-    data: getUserEventGroupsData,
-    status: getUserEventGroupsStatus,
-    error: getUserEventGroupsStatusError,
-  } = trpc.viewer.eventTypes.getUserEventGroups.useQuery(filters && { filters }, {
-    refetchOnWindowFocus: false,
-    gcTime: 1 * 60 * 60 * 1000,
-    staleTime: 1 * 60 * 60 * 1000,
-    initialData,
-  });
-
   useEffect(() => {
     /**
      * During signup, if the account already exists, we redirect the user to /event-types instead of onboarding.
@@ -1019,10 +973,8 @@ const EventTypesPage = ({ initialData, filters }: Props) => {
 
   return (
     <InfiniteScrollMain
-      profiles={getUserEventGroupsData?.profiles}
-      eventTypeGroups={getUserEventGroupsData?.eventTypeGroups}
-      status={getUserEventGroupsStatus}
-      errorMessage={getUserEventGroupsStatusError?.message}
+      profiles={userEventGroupsData.profiles}
+      eventTypeGroups={userEventGroupsData.eventTypeGroups}
     />
   );
 };

apps/web/modules/event-types/views/event-types-single-view.tsx

@@ -1,11 +0,0 @@
-"use client";
-
-import { EventTypeWebWrapper as EventType } from "@calcom/atoms/event-types/wrappers/EventTypeWebWrapper";
-
-import type { PageProps } from "@lib/event-types/[type]/getServerSideProps";
-
-const EventTypePageWrapper = ({ type, data }: PageProps) => {
-  return <EventType data={data} id={type} />;
-};
-
-export default EventTypePageWrapper;

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

@@ -2,7 +2,7 @@
 
 import { useState } from "react";
 
-import { TestForm } from "@calcom/app-store/routing-forms/components/SingleForm";
+import { TestForm } from "@calcom/app-store/routing-forms/components/_components/TestForm";
 import type { RoutingForm } from "@calcom/app-store/routing-forms/types/types";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { trpc } from "@calcom/trpc";
@@ -40,7 +40,7 @@ export default function InsightsVirtualQueuesPage() {
       />
       <div className="mt-10">
         {selectedForm ? (
-          <TestForm form={selectedForm} supportsTeamMembersMatchingLogic={true} showAllData={false} />
+          <TestForm form={selectedForm} supportsTeamMembersMatchingLogic={true} showRRData={true} />
         ) : (
           <></>
         )}

apps/web/modules/settings/organizations/new/create-new-view.tsx

@@ -1,9 +1,25 @@
 "use client";
 
 import { CreateANewOrganizationForm } from "@calcom/features/ee/organizations/components";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Alert } from "@calcom/ui/components/alert";
 import { WizardLayout } from "@calcom/ui/components/layout";
+import { useGetUserAttributes } from "@calcom/web/components/settings/platform/hooks/useGetUserAttributes";
 
 export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
+  const { t } = useLocale();
+  const { isPlatformUser } = useGetUserAttributes();
+
+  if (isPlatformUser) {
+    return (
+      <div className="flex h-full min-h-screen items-center justify-center">
+        <div className="max-w-lg">
+          <Alert severity="warning" title={t("platform_customer_cant_create_organization")} />
+        </div>
+      </div>
+    );
+  }
+
   return (
     <WizardLayout currentStep={1} maxSteps={5}>
       {children}

apps/web/modules/settings/platform/billing/billing-view.tsx

@@ -2,12 +2,17 @@
 
 import { usePathname } from "next/navigation";
 
+import { Dialog } from "@calcom/features/components/controlled-dialog";
 import Shell from "@calcom/features/shell/Shell";
 import { WEBAPP_URL } from "@calcom/lib/constants";
 import { useLocale } from "@calcom/lib/hooks/useLocale";
 import { Button } from "@calcom/ui/components/button";
+import { DialogTrigger, ConfirmationDialogContent } from "@calcom/ui/components/dialog";
+import { showToast } from "@calcom/ui/components/toast";
 import { PlatformPricing } from "@calcom/web/components/settings/platform/pricing/platform-pricing/index";
 
+import { useUnsubscribeTeamToStripe } from "@lib/hooks/settings/platform/billing/useUnsubscribeTeamToStripe";
+
 import NoPlatformPlan from "@components/settings/platform/dashboard/NoPlatformPlan";
 import { useGetUserAttributes } from "@components/settings/platform/hooks/useGetUserAttributes";
 
@@ -37,6 +42,18 @@ export default function PlatformBillingUpgrade() {
   const { isUserLoading, isUserBillingDataLoading, isPlatformUser, userBillingData, isPaidUser, userOrgId } =
     useGetUserAttributes();
 
+  const { mutateAsync: removeTeamSubscription, isPending: isRemoveTeamSubscriptionLoading } =
+    useUnsubscribeTeamToStripe({
+      onSuccess: () => {
+        window.location.href = "/settings/platform/";
+        showToast(t("team_subscription_cancelled_successfully"), "success");
+      },
+      onError: () => {
+        showToast(t("team_subscription_cancellation_error"), "error");
+      },
+      teamId: userOrgId,
+    });
+
   if (isUserLoading || (isUserBillingDataLoading && !userBillingData)) {
     return <div className="m-5">{t("loading")}</div>;
   }
@@ -92,6 +109,18 @@ export default function PlatformBillingUpgrade() {
 
             <hr className="border-subtle" />
 
+            <CtaRow title="Cancel subscription" description={t("Cancel your existing platform subscription")}>
+              <CancelSubscriptionButton
+                buttonClassName="hidden me-2 sm:inline"
+                isPending={isRemoveTeamSubscriptionLoading}
+                handleDelete={() => {
+                  removeTeamSubscription();
+                }}
+              />
+            </CtaRow>
+
+            <hr className="border-subtle" />
+
             <CtaRow title={t("need_anything_else")} description={t("further_billing_help")}>
               <Button color="secondary" onClick={onContactSupportClick}>
                 {t("contact_support")}
@@ -103,3 +132,41 @@ export default function PlatformBillingUpgrade() {
     </div>
   );
 }
+
+const CancelSubscriptionButton = ({
+  buttonClassName,
+  isPending,
+  onDeleteConfirmed,
+  handleDelete,
+}: {
+  onDeleteConfirmed?: () => void;
+  buttonClassName: string;
+  handleDelete: () => void;
+  isPending: boolean;
+}) => {
+  const { t } = useLocale();
+
+  return (
+    <Dialog>
+      <DialogTrigger asChild>
+        <Button color="destructive" className={buttonClassName}>
+          {t("cancel")}
+        </Button>
+      </DialogTrigger>
+
+      <ConfirmationDialogContent
+        isPending={isPending}
+        variety="danger"
+        title={t("cancel_subscription")}
+        confirmBtnText={t("confirm_subscription_cancellation")}
+        loadingText={t("confirm_subscription_cancellation")}
+        cancelBtnText={t("back")}
+        onConfirm={() => {
+          handleDelete();
+          onDeleteConfirmed?.();
+        }}>
+        {t("cancel_subscription_description")}
+      </ConfirmationDialogContent>
+    </Dialog>
+  );
+};

apps/web/modules/settings/platform/new/create-new-view.tsx

@@ -1,9 +1,25 @@
 "use client";
 
 import { CreateANewPlatformForm } from "@calcom/features/ee/platform/components/index";
+import { useLocale } from "@calcom/lib/hooks/useLocale";
+import { Alert } from "@calcom/ui/components/alert";
 import { WizardLayout } from "@calcom/ui/components/layout";
+import { useGetUserAttributes } from "@calcom/web/components/settings/platform/hooks/useGetUserAttributes";
 
 export const LayoutWrapper = ({ children }: { children: React.ReactNode }) => {
+  const { t } = useLocale();
+  const { isPlatformUser, userOrgId } = useGetUserAttributes();
+
+  if (!isPlatformUser && userOrgId) {
+    return (
+      <div className="flex h-full min-h-screen items-center justify-center">
+        <div className="max-w-lg">
+          <Alert severity="warning" title={t("organization_customer_cant_create_platform")} />
+        </div>
+      </div>
+    );
+  }
+
   return (
     <WizardLayout currentStep={1} maxSteps={1}>
       {children}

apps/web/modules/signup-view.tsx

@@ -146,6 +146,7 @@ function UsernameField({
                 <p>
                   {t("premium_username", {
                     price: getPremiumPlanPriceValue(),
+                    interpolation: { escapeValue: false },
                   })}
                 </p>
               </div>