Skip to content

The open alternative to Salesforce, designed for AI.

fix(user-workspace): stop pretending role targets are soft deleted (#24295)

Félix Malfait376d31ca31f4
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts
index bdcbe19a459..8d83b761183 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.module.ts
@@ -17,6 +17,7 @@ import { UserEntity } from 'src/engine/core-modules/user/user.entity';
import { WorkspaceInvitationModule } from 'src/engine/core-modules/workspace-invitation/workspace-invitation.module';
import { PermissionsModule } from 'src/engine/metadata-modules/permissions/permissions.module';
import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';
+import { provideWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/provide-workspace-scoped-repository';
import { RoleValidationModule } from 'src/engine/metadata-modules/role-validation/role-validation.module';
import { UserRoleModule } from 'src/engine/metadata-modules/user-role/user-role.module';
import { TwentyORMModule } from 'src/engine/twenty-orm/twenty-orm.module';
@@ -46,6 +47,10 @@ import { WorkspaceDataSourceModule } from 'src/engine/workspace-datasource/works
CoreEntityCacheModule,
],
exports: [UserWorkspaceService],
- providers: [UserWorkspaceService, UserWorkspaceEntityCacheProviderService],
+ providers: [
+ UserWorkspaceService,
+ UserWorkspaceEntityCacheProviderService,
+ provideWorkspaceScopedRepository(RoleTargetEntity),
+ ],
})
export class UserWorkspaceModule {}
diff --git a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
index 53f71c4db17..fde53c92fdc 100644
--- a/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user-workspace/user-workspace.service.ts
@@ -35,6 +35,8 @@ import {
PermissionsExceptionMessage,
} from 'src/engine/metadata-modules/permissions/permissions.exception';
import { RoleTargetEntity } from 'src/engine/metadata-modules/role-target/role-target.entity';
+import { InjectWorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/inject-workspace-scoped-repository.decorator';
+import { WorkspaceScopedRepository } from 'src/engine/twenty-orm/workspace-scoped-repository/workspace-scoped-repository';
import { RoleValidationService } from 'src/engine/metadata-modules/role-validation/services/role-validation.service';
import { UserRoleService } from 'src/engine/metadata-modules/user-role/user-role.service';
import { GlobalWorkspaceOrmManager } from 'src/engine/twenty-orm/global-workspace-datasource/global-workspace-orm.manager';
@@ -51,10 +53,8 @@ export class UserWorkspaceService {
private readonly userWorkspaceRepository: Repository<UserWorkspaceEntity>,
@InjectRepository(UserEntity)
private readonly userRepository: Repository<UserEntity>,
- // softRemove is not supported by WorkspaceScopedRepository.
- // eslint-disable-next-line twenty/prefer-workspace-scoped-repository
- @InjectRepository(RoleTargetEntity)
- private readonly roleTargetRepository: Repository<RoleTargetEntity>,
+ @InjectWorkspaceScopedRepository(RoleTargetEntity)
+ private readonly roleTargetRepository: WorkspaceScopedRepository<RoleTargetEntity>,
private readonly roleValidationService: RoleValidationService,
private readonly workspaceInvitationService: WorkspaceInvitationService,
private readonly workspaceDomainsService: WorkspaceDomainsService,
@@ -341,21 +341,21 @@ export class UserWorkspaceService {
return await this.userWorkspaceRepository.count({ where: { userId } });
}
- // TODO migrate roleTargetRepository to WorkspaceScopedRepository once workspaceId
- // is threaded through all deleteUserWorkspace callers (user.service.ts does not
- // currently have it at the call site).
async deleteUserWorkspace({
userWorkspaceId,
+ workspaceId,
softDelete = false,
}: {
userWorkspaceId: string;
+ workspaceId: string;
softDelete?: boolean;
}): Promise<void> {
if (softDelete) {
- await this.roleTargetRepository.softRemove({ userWorkspaceId });
+ // roleTarget has no deletedAt column, so its rows cannot be soft deleted.
+ // Access stays gated by the soft-deleted userWorkspace.
await this.userWorkspaceRepository.softDelete({ id: userWorkspaceId });
} else {
- await this.roleTargetRepository.delete({ userWorkspaceId }); // TODO remove once userWorkspace foreign key is added on roleTarget
+ await this.roleTargetRepository.delete(workspaceId, { userWorkspaceId }); // TODO remove once userWorkspace foreign key is added on roleTarget
await this.userWorkspaceRepository.delete({ id: userWorkspaceId });
}
}
diff --git a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
index 8db2de100a8..464ca83713c 100644
--- a/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/user/services/user.service.ts
@@ -427,6 +427,7 @@ export class UserService {
await this.userWorkspaceService.deleteUserWorkspace({
userWorkspaceId,
+ workspaceId,
});
}
diff --git a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
index abaa8c16cc3..45e6bcb10f2 100644
--- a/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
+++ b/packages/twenty-server/src/engine/core-modules/workspace/services/workspace.service.ts
@@ -785,6 +785,7 @@ export class WorkspaceService {
if (isDefined(userWorkspaceOfRemovedWorkspaceMember)) {
await this.userWorkspaceService.deleteUserWorkspace({
userWorkspaceId: userWorkspaceOfRemovedWorkspaceMember.id,
+ workspaceId,
softDelete,
});
await this.coreEntityCacheService.invalidate(
diff --git a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts
index 5637a2f15f8..4c5d3a49d36 100644
--- a/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts
+++ b/packages/twenty-server/src/modules/workspace-member/query-hooks/workspace-member-delete-one.post-query.hook.ts
@@ -89,6 +89,7 @@ export class WorkspaceMemberDeleteOnePostQueryHook implements WorkspacePostQuery
await this.userWorkspaceService.deleteUserWorkspace({
userWorkspaceId: userWorkspace.id,
+ workspaceId: workspace.id,
});
}
}