From cf55b5b4628876bf9357c4d73c8ce9abda406089 Mon Sep 17 00:00:00 2001
From: Morgan <33722304+ThyMinimalDev@users.noreply.github.com>
Date: Thu, 5 Feb 2026 11:22:29 +0200
Subject: [PATCH] fix: ensure default calendars domain (#27645)

* fix: ensure default calendars delegation credential domain

* fix: ensure default calendars delegation credential domain
---
 ...organizations-delegation-credential.controller.e2e-spec.ts | 4 ++--
 .../organizations-delegation-credential.repository.ts         | 2 +-
 .../organizations-delegation-credential.service.spec.ts       | 4 ++--
 .../services/organizations-delegation-credential.service.ts   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/apps/api/v2/src/modules/organizations/delegation-credentials/organizations-delegation-credential.controller.e2e-spec.ts b/apps/api/v2/src/modules/organizations/delegation-credentials/organizations-delegation-credential.controller.e2e-spec.ts
index ec6305618e..26d2ba7ad3 100644
--- a/apps/api/v2/src/modules/organizations/delegation-credentials/organizations-delegation-credential.controller.e2e-spec.ts
+++ b/apps/api/v2/src/modules/organizations/delegation-credentials/organizations-delegation-credential.controller.e2e-spec.ts
@@ -139,7 +139,7 @@ describe("Organizations Delegation Credentials Endpoints", () => {
         data: {
           workspacePlatformId: workspacePlatform.id,
           organizationId: org.id,
-          domain: "@test-domain.com",
+          domain: "test-domain.com",
           serviceAccountKey: encryptedServiceAccountKey,
           enabled: false,
         },
@@ -194,7 +194,7 @@ describe("Organizations Delegation Credentials Endpoints", () => {
       expect(responseBody.status).toEqual(SUCCESS_STATUS);
       expect(responseBody.data.enabled).toEqual(true);
 
-      expect(ensureDefaultCalendarsSpy).toHaveBeenCalledWith(org.id, "@test-domain.com");
+      expect(ensureDefaultCalendarsSpy).toHaveBeenCalledWith(org.id, "test-domain.com");
     });
 
     it("should not call ensureDefaultCalendars when disabling delegation credentials", async () => {
diff --git a/apps/api/v2/src/modules/organizations/delegation-credentials/organizations-delegation-credential.repository.ts b/apps/api/v2/src/modules/organizations/delegation-credentials/organizations-delegation-credential.repository.ts
index 540e8aca9b..840e0ed454 100644
--- a/apps/api/v2/src/modules/organizations/delegation-credentials/organizations-delegation-credential.repository.ts
+++ b/apps/api/v2/src/modules/organizations/delegation-credentials/organizations-delegation-credential.repository.ts
@@ -37,7 +37,7 @@ export class OrganizationsDelegationCredentialRepository {
       },
       where: {
         organizationId: orgId,
-        user: { email: { endsWith: domain } },
+        user: { email: { endsWith: `@${domain}`, mode: "insensitive" } },
       },
     });
   }
diff --git a/apps/api/v2/src/modules/organizations/delegation-credentials/services/organizations-delegation-credential.service.spec.ts b/apps/api/v2/src/modules/organizations/delegation-credentials/services/organizations-delegation-credential.service.spec.ts
index 33c636dff7..5e0f571a5e 100644
--- a/apps/api/v2/src/modules/organizations/delegation-credentials/services/organizations-delegation-credential.service.spec.ts
+++ b/apps/api/v2/src/modules/organizations/delegation-credentials/services/organizations-delegation-credential.service.spec.ts
@@ -172,7 +172,7 @@ describe("OrganizationsDelegationCredentialService", () => {
 
       await service.ensureDefaultCalendarsForUser(orgId, userId, userEmail);
 
-      expect(mockRepository.findEnabledByOrgIdAndDomain).toHaveBeenCalledWith(orgId, "@example.com");
+      expect(mockRepository.findEnabledByOrgIdAndDomain).toHaveBeenCalledWith(orgId, "example.com");
       expect(mockQueue.add).toHaveBeenCalledWith(
         DEFAULT_CALENDARS_JOB,
         { userId },
@@ -198,7 +198,7 @@ describe("OrganizationsDelegationCredentialService", () => {
 
       await service.ensureDefaultCalendarsForUser(orgId, userId, userEmail);
 
-      expect(mockRepository.findEnabledByOrgIdAndDomain).toHaveBeenCalledWith(orgId, "@example.com");
+      expect(mockRepository.findEnabledByOrgIdAndDomain).toHaveBeenCalledWith(orgId, "example.com");
       expect(mockQueue.add).not.toHaveBeenCalled();
     });
 
diff --git a/apps/api/v2/src/modules/organizations/delegation-credentials/services/organizations-delegation-credential.service.ts b/apps/api/v2/src/modules/organizations/delegation-credentials/services/organizations-delegation-credential.service.ts
index 2b312dbdcd..2e1e3725dd 100644
--- a/apps/api/v2/src/modules/organizations/delegation-credentials/services/organizations-delegation-credential.service.ts
+++ b/apps/api/v2/src/modules/organizations/delegation-credentials/services/organizations-delegation-credential.service.ts
@@ -174,7 +174,7 @@ export class OrganizationsDelegationCredentialService {
         this.logger.warn(`Invalid email format for user ${userId}: missing domain`);
         return;
       }
-      const emailDomain = `@${emailParts[1]}`;
+      const emailDomain = emailParts[1];
 
       const delegationCredential =
         await this.organizationsDelegationCredentialRepository.findEnabledByOrgIdAndDomain(