admin/twenty
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

refactor(domain-manager): improve default workspace resolution (#10282)

Browse Source 
Refactor logic for determining the default workspace in single-workspace
mode. Added fallback to Apple workspace when multiple workspaces are
found and updated validations to ensure a workspace is always returned.
Simplified handling of scenarios where multi-workspace mode is enabled.

---------

Co-authored-by: greptile-apps[bot] <165735046+greptile-apps[bot]@users.noreply.github.com>
This commit is contained in:
Antoine Moreaux
2025-02-19 10:06:34 +01:00
committed by GitHub
parent dca4fc1423
commit c0014cfe96
1 changed files with 29 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
packages/twenty-server/src/engine/core-modules/domain-manager/services/domain-manager.service.ts
View File

@ -11,6 +11,8 @@ import { getSubdomainNameFromDisplayName } from 'src/engine/core-modules/domain-
import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service'; import { EnvironmentService } from 'src/engine/core-modules/environment/environment.service';
import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity'; import { Workspace } from 'src/engine/core-modules/workspace/workspace.entity';
import { WorkspaceSubdomainCustomDomainAndIsCustomDomainEnabledType } from 'src/engine/core-modules/domain-manager/domain-manager.type'; import { WorkspaceSubdomainCustomDomainAndIsCustomDomainEnabledType } from 'src/engine/core-modules/domain-manager/domain-manager.type';
import { SEED_APPLE_WORKSPACE_ID } from 'src/database/typeorm-seeds/core/workspaces';
import { workspaceValidator } from 'src/engine/core-modules/workspace/workspace.validate';
@Injectable() @Injectable()
export class DomainManagerService { export class DomainManagerService {
@ -128,41 +130,35 @@ export class DomainManagerService {
} }
private async getDefaultWorkspace() { private async getDefaultWorkspace() {
if (!this.environmentService.get('IS_MULTIWORKSPACE_ENABLED')) { if (this.environmentService.get('IS_MULTIWORKSPACE_ENABLED')) {
const defaultWorkspaceSubDomain = throw new Error(
this.environmentService.get('DEFAULT_SUBDOMAIN'); 'Default workspace does not exist when multi-workspace is enabled',
);
if (isDefined(defaultWorkspaceSubDomain)) {
const foundWorkspaceForDefaultSubDomain =
await this.workspaceRepository.findOne({
where: { subdomain: defaultWorkspaceSubDomain },
relations: ['workspaceSSOIdentityProviders'],
});
if (isDefined(foundWorkspaceForDefaultSubDomain)) {
return foundWorkspaceForDefaultSubDomain;
}
}
const workspaces = await this.workspaceRepository.find({
order: {
createdAt: 'DESC',
},
relations: ['workspaceSSOIdentityProviders'],
});
if (workspaces.length > 1) {
Logger.warn(
`In single-workspace mode, there should be only one workspace. Today there are ${workspaces.length} workspaces`,
);
}
return workspaces[0];
} }
throw new Error( const workspaces = await this.workspaceRepository.find({
'Default workspace not exist when multi-workspace is enabled', order: {
); createdAt: 'DESC',
},
relations: ['workspaceSSOIdentityProviders'],
});
if (workspaces.length > 1) {
Logger.warn(
` ${workspaces.length} workspaces found in database. In single-workspace mode, there should be only one workspace. Apple seed workspace will be used as fallback if it found.`,
);
}
const foundWorkspace =
workspaces.length === 1
? workspaces[0]
: workspaces.filter(
(workspace) => workspace.id === SEED_APPLE_WORKSPACE_ID,
)?.[0];
workspaceValidator.assertIsDefinedOrThrow(foundWorkspace);
return foundWorkspace;
} }
async getWorkspaceByOriginOrDefaultWorkspace(origin: string) { async getWorkspaceByOriginOrDefaultWorkspace(origin: string) {