Merge pull request #381 from internxt/fix/get-teams-permissions-and-f…

…ilter-default-team [_] fix: fixed get workspace teams endpoint permissions and response
internxt · Aug 5, 2024 · fb062dd · fb062dd
2 parents f125796 + 3fc9946
commit fb062dd
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 6 deletions.
diff --git a/src/modules/workspaces/workspaces.controller.ts b/src/modules/workspaces/workspaces.controller.ts
@@ -505,15 +505,13 @@ export class WorkspacesController {
   @ApiOkResponse({
     description: 'Teams in the workspace along with its members quantity',
   })
+  @UseGuards(WorkspaceGuard)
+  @WorkspaceRequiredAccess(AccessContext.WORKSPACE, WorkspaceRole.MEMBER)
   async getWorkspaceTeams(
     @Param('workspaceId', ValidateUUIDPipe)
     workspaceId: WorkspaceAttributes['id'],
     @UserDecorator() user: User,
   ) {
-    if (!workspaceId || !isUUID(workspaceId)) {
-      throw new BadRequestException('Invalid workspace ID');
-    }
-
     return this.workspaceUseCases.getWorkspaceTeams(user, workspaceId);
   }
 

diff --git a/src/modules/workspaces/workspaces.usecase.ts b/src/modules/workspaces/workspaces.usecase.ts
@@ -1617,7 +1617,6 @@ export class WorkspacesUsecases {
 
   async getWorkspaceTeams(user: User, workspaceId: WorkspaceAttributes['id']) {
     const workspace = await this.workspaceRepository.findOne({
-      ownerId: user.uuid,
       id: workspaceId,
     });
 
@@ -1630,7 +1629,11 @@ export class WorkspacesUsecases {
         workspace.id,
       );
 
-    return teamsWithMemberCount;
+    const teamsWithouDefaultTeam = teamsWithMemberCount.filter(
+      (teamAndMembers) => workspace.defaultTeamId !== teamAndMembers.team.id,
+    );
+
+    return teamsWithouDefaultTeam;
   }
 
   async getWorkspaceMembers(