Fix CI (#8862)

packages/twenty-server/src/engine/core-modules/auth/services/sign-in-up.service.spec.ts

@@ -2,22 +2,23 @@ import { HttpService } from '@nestjs/axios';
 import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
 
-import bcrypt from 'bcrypt';
 import { expect, jest } from '@jest/globals';
+import bcrypt from 'bcrypt';
 
+import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
 import { SignInUpService } from 'src/engine/core-modules/auth/services/sign-in-up.service';
+import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
+import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { FileUploadService } from 'src/engine/core-modules/file/file-upload/services/file-upload.service';
 import { OnboardingService } from 'src/engine/core-modules/onboarding/onboarding.service';
 import { UserWorkspaceService } from 'src/engine/core-modules/user-workspace/user-workspace.service';
 import { User } from 'src/engine/core-modules/user/user.entity';
+import { WorkspaceInvitationService } from 'src/engine/core-modules/workspace-invitation/services/workspace-invitation.service';
+import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
 import {
   Workspace,
   WorkspaceActivationStatus,
 } from 'src/engine/core-modules/workspace/workspace.entity';
-import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { AppToken } from 'src/engine/core-modules/app-token/app-token.entity';
-import { WorkspaceInvitationService } from 'src/engine/core-modules/workspace-invitation/services/workspace-invitation.service';
-import { WorkspaceService } from 'src/engine/core-modules/workspace/services/workspace.service';
 
 jest.mock('bcrypt');
 
@@ -75,9 +76,7 @@ describe('SignInUpService', () => {
         },
         {
           provide: WorkspaceService,
-          useValue: {
-            generateSubdomain: jest.fn().mockReturnValue('tartanpion'),
-          },
+          useValue: {},
         },
         {
           provide: UserWorkspaceService,
@@ -114,6 +113,12 @@ describe('SignInUpService', () => {
               workspaceInvitationFindInvitationByWorkspaceSubdomainAndUserEmailMock,
           },
         },
+        {
+          provide: DomainManagerService,
+          useValue: {
+            generateSubdomain: jest.fn().mockReturnValue('testSubDomain'),
+          },
+        },
       ],
     }).compile();
 
@@ -139,7 +144,7 @@ describe('SignInUpService', () => {
     await service.signInUp({
       email: 'test@test.com',
       fromSSO: true,
-      targetWorkspaceSubdomain: 'tartanpion',
+      targetWorkspaceSubdomain: 'testSubDomain',
     });
 
     expect(spy).toHaveBeenCalledWith(
@@ -169,7 +174,7 @@ describe('SignInUpService', () => {
     const result = await service.signInUp({
       email,
       fromSSO: true,
-      targetWorkspaceSubdomain: 'tartanpion',
+      targetWorkspaceSubdomain: 'testSubDomain',
     });
 
     expect(result).toEqual(existingUser);
@@ -204,7 +209,7 @@ describe('SignInUpService', () => {
     await service.signInUp({
       email,
       fromSSO: true,
-      targetWorkspaceSubdomain: 'tartanpion',
+      targetWorkspaceSubdomain: 'testSubDomain',
     });
 
     expect(spySignInUpOnExistingWorkspace).toHaveBeenCalledWith(
@@ -257,7 +262,7 @@ describe('SignInUpService', () => {
     const result = await service.signInUp({
       email,
       fromSSO: true,
-      targetWorkspaceSubdomain: 'tartanpion',
+      targetWorkspaceSubdomain: 'testSubDomain',
     });
 
     expect(result).toEqual(existingUser);
@@ -297,7 +302,7 @@ describe('SignInUpService', () => {
       email,
       fromSSO: true,
       workspacePersonalInviteToken,
-      targetWorkspaceSubdomain: 'tartanpion',
+      targetWorkspaceSubdomain: 'testSubDomain',
     });
 
     expect(spySignInUpOnExistingWorkspace).toHaveBeenCalledWith(
@@ -348,7 +353,7 @@ describe('SignInUpService', () => {
       email,
       fromSSO: true,
       workspacePersonalInviteToken,
-      targetWorkspaceSubdomain: 'tartanpion',
+      targetWorkspaceSubdomain: 'testSubDomain',
     });
 
     expect(
@@ -375,7 +380,7 @@ describe('SignInUpService', () => {
       email,
       password,
       fromSSO: false,
-      targetWorkspaceSubdomain: 'tartanpion',
+      targetWorkspaceSubdomain: 'testSubDomain',
     });
 
     expect(
@@ -400,7 +405,7 @@ describe('SignInUpService', () => {
       email,
       password,
       fromSSO: false,
-      targetWorkspaceSubdomain: 'tartanpion',
+      targetWorkspaceSubdomain: 'testSubDomain',
     });
 
     expect(UserCreateMock).toHaveBeenCalledTimes(1);
@@ -436,7 +441,7 @@ describe('SignInUpService', () => {
       password,
       fromSSO: false,
       workspacePersonalInviteToken,
-      targetWorkspaceSubdomain: 'tartanpion',
+      targetWorkspaceSubdomain: 'testSubDomain',
     });
 
     expect(UserCreateMock).toHaveBeenCalledTimes(1);

packages/twenty-server/src/engine/core-modules/domain-manager/service/domain-manager.service.ts

@@ -4,17 +4,16 @@ import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
-import { isDefined } from 'src/utils/is-defined';
+import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
 import {
   WorkspaceException,
   WorkspaceExceptionCode,
 } from 'src/engine/core-modules/workspace/workspace.exception';
-import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { isWorkEmail } from 'src/utils/is-work-email';
 import { getDomainNameByEmail } from 'src/utils/get-domain-name-by-email';
+import { isDefined } from 'src/utils/is-defined';
+import { isWorkEmail } from 'src/utils/is-work-email';
 
 @Injectable()
-// eslint-disable-next-line @nx/workspace-inject-workspace-repository
 export class DomainManagerService {
   constructor(
     @InjectRepository(Workspace, 'core')
@@ -126,6 +125,7 @@ export class DomainManagerService {
         order: {
           createdAt: 'DESC',
         },
+        relations: ['workspaceSSOIdentityProviders'],
       });
 
       if (workspaces.length > 1) {
@@ -153,7 +153,12 @@ export class DomainManagerService {
 
       if (!isDefined(subdomain)) return;
 
-      return this.workspaceRepository.findOneBy({ subdomain });
+      const workspace = await this.workspaceRepository.findOne({
+        where: { subdomain },
+        relations: ['workspaceSSOIdentityProviders'],
+      });
+
+      return workspace;
     } catch (e) {
       throw new WorkspaceException(
         'Workspace not found',

packages/twenty-server/src/engine/core-modules/workspace-invitation/services/workspace-invitation.service.ts

@@ -17,19 +17,19 @@ import {
   AuthException,
   AuthExceptionCode,
 } from 'src/engine/core-modules/auth/auth.exception';
+import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
 import { EmailService } from 'src/engine/core-modules/email/email.service';
 import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
 import { OnboardingService } from 'src/engine/core-modules/onboarding/onboarding.service';
 import { UserWorkspace } from 'src/engine/core-modules/user-workspace/user-workspace.entity';
 import { User } from 'src/engine/core-modules/user/user.entity';
 import { SendInvitationsOutput } from 'src/engine/core-modules/workspace-invitation/dtos/send-invitations.output';
+import { castAppTokenToWorkspaceInvitationUtil } from 'src/engine/core-modules/workspace-invitation/utils/cast-app-token-to-workspace-invitation.util';
 import {
   WorkspaceInvitationException,
   WorkspaceInvitationExceptionCode,
 } from 'src/engine/core-modules/workspace-invitation/workspace-invitation.exception';
 import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
-import { DomainManagerService } from 'src/engine/core-modules/domain-manager/service/domain-manager.service';
-import { castAppTokenToWorkspaceInvitationUtil } from 'src/engine/core-modules/workspace-invitation/utils/cast-app-token-to-workspace-invitation.util';
 
 @Injectable()
 // eslint-disable-next-line @nx/workspace-inject-workspace-repository
@@ -338,7 +338,7 @@ export class WorkspaceInvitationService {
             ? {
                 inviteToken: invitation.value.appToken.value,
                 email: invitation.value.email,
-            }
+              }
             : {},
         });
         const emailData = {