diff --git a/apps/api/src/workspace/service/workspace.service.ts b/apps/api/src/workspace/service/workspace.service.ts index b965a7d3d..db5cab097 100644 --- a/apps/api/src/workspace/service/workspace.service.ts +++ b/apps/api/src/workspace/service/workspace.service.ts @@ -171,12 +171,18 @@ export class WorkspaceService { user: User, workspaceSlug: Workspace['slug'] ): Promise { - return await this.authorityCheckerService.checkAuthorityOverWorkspace({ - userId: user.id, - entity: { slug: workspaceSlug }, - authorities: [Authority.READ_USERS], - prisma: this.prisma - }) + const workspace = + await this.authorityCheckerService.checkAuthorityOverWorkspace({ + userId: user.id, + entity: { slug: workspaceSlug }, + authorities: [Authority.READ_USERS], + prisma: this.prisma + }) + + return { + ...workspace, + isDefault: workspace.isDefault && workspace.ownerId === user.id + } } /** @@ -241,7 +247,13 @@ export class WorkspaceService { search }) - return { items, metadata } + return { + items: items.map((item) => ({ + ...item, + isDefault: item.isDefault && item.ownerId === user.id + })), + metadata + } } /**