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

fix(): avoid undefined workspaces with appToken when load availableWorkspaces (#12712)

Browse Source
This commit is contained in:
Antoine Moreaux
2025-06-18 18:39:06 +02:00
committed by GitHub
parent 3acdf369ab
commit 1bae411e58
4 changed files with 4 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/twenty-front/src/modules/auth/components/Logo.tsx
View File

@ -5,7 +5,7 @@ import { Avatar } from 'twenty-ui/display';
import { UndecoratedLink } from 'twenty-ui/navigation';
import { REACT_APP_SERVER_BASE_URL } from '~/config';
import { useRedirectToDefaultDomain } from '~/modules/domain-manager/hooks/useRedirectToDefaultDomain';
import { useReadDefaultDomainFromConfiguration } from '@/domain-manager/hooks/useReadDefaultDomainFromConfiguration';
import { useReadDefaultDomainFromConfiguration } from '~/modules/domain-manager/hooks/useReadDefaultDomainFromConfiguration';
type LogoProps = {
primaryLogo?: string | null;

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

@ -112,14 +112,6 @@ export class DomainManagerService {
};
};
async getWorkspaceBySubdomainOrDefaultWorkspace(subdomain?: string) {
return subdomain
? await this.workspaceRepository.findOne({
where: { subdomain },
})
: await this.getDefaultWorkspace();
}
isDefaultSubdomain(subdomain: string) {
return subdomain === this.twentyConfigService.get('DEFAULT_SUBDOMAIN');
}

4
packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
View File

@ -282,11 +282,11 @@ export class UserWorkspaceService extends TypeOrmQueryService<UserWorkspace> {
await this.workspaceInvitationService.findInvitationsByEmail(email)
)
.filter(
({ workspaceId }) =>
({ workspace }) =>
![
...alreadyMemberWorkspacesIds,
...workspacesFromApprovedAccessDomainIds,
].includes(workspaceId),
].includes(workspace.id),
)
.map((appToken) => ({
workspace: appToken.workspace,

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

@ -85,26 +85,10 @@ export class WorkspaceInvitationService {
}
}
async findInvitationByWorkspaceSubdomainAndUserEmail({
subdomain,
email,
}: {
subdomain: string;
email: string;
}) {
const workspace =
await this.domainManagerService.getWorkspaceBySubdomainOrDefaultWorkspace(
subdomain,
);
if (!workspace) return;
return await this.getOneWorkspaceInvitation(workspace.id, email);
}
async findInvitationsByEmail(email: string) {
return await this.appTokenRepository
.createQueryBuilder('appToken')
.innerJoinAndSelect('appToken.workspace', 'workspace')
.where('"appToken".type = :type', {
type: AppTokenType.InvitationToken,
})
@ -113,7 +97,6 @@ export class WorkspaceInvitationService {
.andWhere('appToken.expiresAt > :now', {
now: new Date(),
})
.leftJoinAndSelect('appToken.workspace', 'workspace')
.getMany();
}