fix: disable cal branding for user, team, organisation

apps/api/v2/src/modules/atoms/controllers/atoms.verification.controller.ts

@@ -24,7 +24,10 @@ import {
   Get,
   Query,
 } from "@nestjs/common";
-import { ApiTags as DocsTags, ApiExcludeController as DocsExcludeController } from "@nestjs/swagger";
+import {
+  ApiTags as DocsTags,
+  ApiExcludeController as DocsExcludeController,
+} from "@nestjs/swagger";
 
 import { SUCCESS_STATUS } from "@calcom/platform-constants";
 import { ApiResponse } from "@calcom/platform-types";
@@ -41,7 +44,12 @@ export class AtomsVerificationController {
   @Post("/verification/email/send-code")
   @Version(VERSION_NEUTRAL)
   @HttpCode(HttpStatus.OK)
-  @Throttle({ limit: 3, ttl: 60000, blockDuration: 60000, name: "atoms_verification_email_send_code" })
+  @Throttle({
+    limit: 3,
+    ttl: 60000,
+    blockDuration: 60000,
+    name: "atoms_verification_email_send_code",
+  })
   async sendEmailVerificationCode(
     @Body() body: SendVerificationEmailInput
   ): Promise<SendVerificationEmailOutput> {
@@ -50,6 +58,7 @@ export class AtomsVerificationController {
       username: body.username,
       language: body.language,
       isVerifyingEmail: body.isVerifyingEmail,
+      eventTypeId: body.eventTypeId,
     });
 
     return {
@@ -64,10 +73,11 @@ export class AtomsVerificationController {
   async checkEmailVerificationRequired(
     @Query() query: CheckEmailVerificationRequiredParams
   ): Promise<ApiResponse<boolean>> {
-    const required = await this.verificationService.checkEmailVerificationRequired({
-      email: query.email,
-      userSessionEmail: query.userSessionEmail,
-    });
+    const required =
+      await this.verificationService.checkEmailVerificationRequired({
+        email: query.email,
+        userSessionEmail: query.userSessionEmail,
+      });
 
     return {
       data: required,
@@ -78,7 +88,9 @@ export class AtomsVerificationController {
   @Post("/verification/email/verify-code")
   @Version(VERSION_NEUTRAL)
   @HttpCode(HttpStatus.OK)
-  async verifyEmailCode(@Body() body: VerifyEmailCodeInput): Promise<VerifyEmailCodeOutput> {
+  async verifyEmailCode(
+    @Body() body: VerifyEmailCodeInput
+  ): Promise<VerifyEmailCodeOutput> {
     await this.verificationService.verifyEmailCodeUnAuthenticated({
       email: body.email,
       code: body.code,
@@ -98,10 +110,11 @@ export class AtomsVerificationController {
     @Body() body: VerifyEmailCodeInput,
     @GetUser() user: UserWithProfile
   ): Promise<VerifyEmailCodeOutput> {
-    const verified = await this.verificationService.verifyEmailCodeAuthenticated(user, {
-      email: body.email,
-      code: body.code,
-    });
+    const verified =
+      await this.verificationService.verifyEmailCodeAuthenticated(user, {
+        email: body.email,
+        code: body.code,
+      });
 
     return {
       data: { verified },

apps/api/v2/src/modules/atoms/inputs/send-verification-email.input.ts

@@ -1,5 +1,5 @@
 import { ApiProperty, ApiPropertyOptional } from "@nestjs/swagger";
-import { IsEmail, IsOptional, IsString, IsBoolean } from "class-validator";
+import { IsBoolean, IsEmail, IsInt, IsOptional, IsString } from "class-validator";
 
 export class SendVerificationEmailInput {
   @ApiProperty({ example: "user@example.com" })
@@ -20,4 +20,9 @@ export class SendVerificationEmailInput {
   @IsOptional()
   @IsBoolean()
   isVerifyingEmail?: boolean;
+
+  @ApiPropertyOptional({ example: 123 })
+  @IsOptional()
+  @IsInt()
+  eventTypeId?: number;
 }

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

@@ -5,7 +5,11 @@ import { SendVerificationEmailInput } from "@/modules/atoms/inputs/send-verifica
 import { VerifyEmailCodeInput } from "@/modules/atoms/inputs/verify-email-code.input";
 import { UserWithProfile } from "@/modules/users/users.repository";
 import { UsersRepository } from "@/modules/users/users.repository";
-import { Injectable, BadRequestException, UnauthorizedException } from "@nestjs/common";
+import {
+  Injectable,
+  BadRequestException,
+  UnauthorizedException,
+} from "@nestjs/common";
 
 import {
   verifyCodeUnAuthenticated,
@@ -21,7 +25,9 @@ export class VerificationAtomsService {
     private readonly usersRepository: UsersRepository
   ) {}
 
-  async checkEmailVerificationRequired(input: CheckEmailVerificationRequiredParams) {
+  async checkEmailVerificationRequired(
+    input: CheckEmailVerificationRequiredParams
+  ) {
     return await checkEmailVerificationRequired(input);
   }
 
@@ -41,7 +47,10 @@ export class VerificationAtomsService {
     }
   }
 
-  async verifyEmailCodeAuthenticated(user: UserWithProfile, input: VerifyEmailCodeInput) {
+  async verifyEmailCodeAuthenticated(
+    user: UserWithProfile,
+    input: VerifyEmailCodeInput
+  ) {
     try {
       return await verifyCodeAuthenticated({
         user,
@@ -54,7 +63,9 @@ export class VerificationAtomsService {
           throw new BadRequestException("Invalid verification code");
         }
         if (error.message === "BAD_REQUEST") {
-          throw new BadRequestException("Email, code, and user ID are required");
+          throw new BadRequestException(
+            "Email, code, and user ID are required"
+          );
         }
       }
       throw new UnauthorizedException("Verification failed");
@@ -67,28 +78,35 @@ export class VerificationAtomsService {
       username: input.username,
       language: input.language,
       isVerifyingEmail: input.isVerifyingEmail,
+      eventTypeId: input.eventTypeId,
     });
   }
 
   async getVerifiedEmails(input: GetVerifiedEmailsInput): Promise<string[]> {
     const { userId, userEmail, teamId } = input;
-    const userEmailWithoutOauthClientId = this.removeClientIdFromEmail(userEmail);
+    const userEmailWithoutOauthClientId =
+      this.removeClientIdFromEmail(userEmail);
 
     if (teamId) {
       const verifiedEmails: string[] = [];
 
-      const teamMembers = await this.usersRepository.getUserEmailsVerifiedForTeam(teamId);
+      const teamMembers =
+        await this.usersRepository.getUserEmailsVerifiedForTeam(teamId);
 
       if (teamMembers.length === 0) {
         return verifiedEmails;
       }
 
       teamMembers.forEach((member) => {
-        const memberEmailWithoutOauthClientId = this.removeClientIdFromEmail(member.email);
+        const memberEmailWithoutOauthClientId = this.removeClientIdFromEmail(
+          member.email
+        );
 
         verifiedEmails.push(memberEmailWithoutOauthClientId);
         member.secondaryEmails.forEach((secondaryEmail) => {
-          verifiedEmails.push(this.removeClientIdFromEmail(secondaryEmail.email));
+          verifiedEmails.push(
+            this.removeClientIdFromEmail(secondaryEmail.email)
+          );
         });
       });
 
@@ -97,9 +115,14 @@ export class VerificationAtomsService {
 
     let verifiedEmails = [userEmailWithoutOauthClientId];
 
-    const secondaryEmails = await this.atomsSecondaryEmailsRepository.getSecondaryEmailsVerified(userId);
+    const secondaryEmails =
+      await this.atomsSecondaryEmailsRepository.getSecondaryEmailsVerified(
+        userId
+      );
     verifiedEmails = verifiedEmails.concat(
-      secondaryEmails.map((secondaryEmail) => this.removeClientIdFromEmail(secondaryEmail.email))
+      secondaryEmails.map((secondaryEmail) =>
+        this.removeClientIdFromEmail(secondaryEmail.email)
+      )
     );
 
     return verifiedEmails;
@@ -115,8 +138,14 @@ export class VerificationAtomsService {
     email: string;
   }): Promise<boolean> {
     const existingSecondaryEmail =
-      await this.atomsSecondaryEmailsRepository.getExistingSecondaryEmailByUserAndEmail(userId, email);
-    const alreadyExistingEmail = await this.atomsSecondaryEmailsRepository.getExistingSecondaryEmail(email);
+      await this.atomsSecondaryEmailsRepository.getExistingSecondaryEmailByUserAndEmail(
+        userId,
+        email
+      );
+    const alreadyExistingEmail =
+      await this.atomsSecondaryEmailsRepository.getExistingSecondaryEmail(
+        email
+      );
 
     if (alreadyExistingEmail) {
       throw new BadRequestException("Email already exists");
@@ -126,7 +155,10 @@ export class VerificationAtomsService {
       return true;
     }
 
-    await this.atomsSecondaryEmailsRepository.addSecondaryEmailVerified(userId, email);
+    await this.atomsSecondaryEmailsRepository.addSecondaryEmailVerified(
+      userId,
+      email
+    );
 
     return true;
   }

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

@@ -5,6 +5,9 @@ import { NextResponse } from "next/server";
 import dayjs from "@calcom/dayjs";
 import { sendOrganizerRequestReminderEmail } from "@calcom/emails/email-manager";
 import { getCalEventResponses } from "@calcom/features/bookings/lib/getCalEventResponses";
+import { shouldHideBrandingForEvent, withHideBranding } from "@calcom/features/profile/lib/hideBranding";
+import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
+import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType";
 import { isPrismaObjOrUndefined } from "@calcom/lib/isPrismaObj";
 import { parseRecurringEvent } from "@calcom/lib/isRecurringEvent";
 import { getTranslation } from "@calcom/lib/server/i18n";
@@ -57,14 +60,30 @@ async function postHandler(request: NextRequest) {
             timeZone: true,
             destinationCalendar: true,
             isPlatformManaged: true,
+            hideBranding: true,
+            organizationId: true,
             platformOAuthClients: { select: { id: true, areEmailsEnabled: true } },
           },
         },
         eventType: {
           select: {
+            id: true,
+            parentId: true,
             recurringEvent: true,
             bookingFields: true,
             metadata: true,
+            team: {
+              select: {
+                id: true,
+                parentId: true,
+                hideBranding: true,
+                parent: {
+                  select: {
+                    hideBranding: true,
+                  },
+                },
+              },
+            },
           },
         },
         responses: true,
@@ -116,6 +135,24 @@ async function postHandler(request: NextRequest) {
 
       const attendeesList = await Promise.all(attendeesListPromises);
       const selectedDestinationCalendar = booking.destinationCalendar || user.destinationCalendar;
+
+      const teamId = await getTeamIdFromEventType({
+        eventType: {
+          team: { id: booking.eventType?.team?.id ?? null },
+          parentId: booking.eventType?.parentId ?? null,
+        },
+      });
+      const orgId = await getOrgIdFromMemberOrTeamId({
+        memberId: booking.user?.id ?? null,
+        teamId,
+      });
+      const hideBranding = await shouldHideBrandingForEvent({
+        eventTypeId: booking.eventType?.id ?? 0,
+        team: booking.eventType?.team ?? null,
+        owner: booking.user ?? null,
+        organizationId: orgId ?? null,
+      });
+
       const evt: CalendarEvent = {
         type: booking.title,
         title: booking.title,
@@ -139,9 +176,13 @@ async function postHandler(request: NextRequest) {
         uid: booking.uid,
         recurringEvent: parseRecurringEvent(booking.eventType?.recurringEvent),
         destinationCalendar: selectedDestinationCalendar ? [selectedDestinationCalendar] : [],
+        hideBranding,
       };
 
-      await sendOrganizerRequestReminderEmail(evt, booking?.eventType?.metadata as EventTypeMetadata);
+      await sendOrganizerRequestReminderEmail(
+        withHideBranding(evt),
+        booking?.eventType?.metadata as EventTypeMetadata
+      );
 
       await prisma.reminderMail.create({
         data: {

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

@@ -251,11 +251,11 @@ export async function getServerSideProps(context: GetServerSidePropsContext) {
       hideBranding: isPlatformBooking
         ? true
         : await shouldHideBrandingForEvent({
-          eventTypeId: eventType.id,
-          team: eventType?.parent?.team ?? eventType?.team,
-          owner: eventType.users[0] ?? null,
-          organizationId: session?.user?.profile?.organizationId ?? session?.user?.org?.id ?? null,
-        }),
+            eventTypeId: eventType.id,
+            team: eventType?.parent?.team ?? eventType?.team,
+            owner: eventType.users[0] ?? null,
+            organizationId: session?.user?.profile?.organizationId ?? session?.user?.org?.id ?? null,
+          }),
       profile,
       eventType,
       recurringBookings: await getRecurringBookings(bookingInfo.recurringEventId),

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

@@ -18,6 +18,7 @@
   "reset_password_subject": "{{appName}}: Reset password instructions",
   "verify_email_subject": "{{appName}}: Verify your account",
   "verify_email_subject_verifying_email": "{{appName}}: Verify your email",
+  "hide_branding_verify_email_subject": "Action Required: Verify your email",
   "check_your_email": "Check your email",
   "old_email_address": "Old email",
   "new_email_address": "New email",

packages/app-store/_utils/payments/handlePaymentSuccess.ts

@@ -12,13 +12,14 @@ import { getAllWorkflowsFromEventType } from "@calcom/features/ee/workflows/lib/
 import { WorkflowService } from "@calcom/features/ee/workflows/lib/service/WorkflowService";
 import { getPlatformParams } from "@calcom/features/platform-oauth-client/get-platform-params";
 import { PlatformOAuthClientRepository } from "@calcom/features/platform-oauth-client/platform-oauth-client.repository";
+import { shouldHideBrandingForEvent } from "@calcom/features/profile/lib/hideBranding";
+import tasker from "@calcom/features/tasker";
 import getWebhooks from "@calcom/features/webhooks/lib/getWebhooks";
 import sendPayload from "@calcom/features/webhooks/lib/sendOrSchedulePayload";
 import type { EventPayloadType, EventTypeInfo } from "@calcom/features/webhooks/lib/sendPayload";
 import { getVideoCallUrlFromCalEvent } from "@calcom/lib/CalEventParser";
 import getOrgIdFromMemberOrTeamId from "@calcom/lib/getOrgIdFromMemberOrTeamId";
 import { getTeamIdFromEventType } from "@calcom/lib/getTeamIdFromEventType";
-import tasker from "@calcom/features/tasker";
 import { HttpError as HttpCode } from "@calcom/lib/http-error";
 import logger from "@calcom/lib/logger";
 import { safeStringify } from "@calcom/lib/safeStringify";
@@ -260,7 +261,27 @@ export async function handlePaymentSuccess(params: {
       log.debug(`handling booking request for eventId ${eventType.id}`);
     }
   } else if (areEmailsEnabled) {
-    await sendScheduledEmailsAndSMS({ ...evt }, undefined, undefined, undefined, eventType.metadata);
+    const teamId = await getTeamIdFromEventType({
+      eventType: {
+        team: { id: booking.eventType?.teamId ?? null },
+        parentId: booking?.eventType?.parentId ?? null,
+      },
+    });
+    const orgId = await getOrgIdFromMemberOrTeamId({ memberId: booking.userId, teamId });
+    const hideBranding = await shouldHideBrandingForEvent({
+      eventTypeId: booking.eventType?.id ?? 0,
+      team: booking.eventType?.team ?? null,
+      owner: userWithCredentials ?? null,
+      organizationId: orgId ?? null,
+    });
+
+    await sendScheduledEmailsAndSMS(
+      { ...evt, hideBranding },
+      undefined,
+      undefined,
+      undefined,
+      booking.eventType?.metadata as EventTypeMetadata
+    );
   }
 
   throw new HttpCode({