From f6c0cc590ca69bf5299ce71dcfaf1e5661bb8020 Mon Sep 17 00:00:00 2001
From: "Laurie T. Malau" <laurie@gitpod.io>
Date: Tue, 5 Oct 2021 16:01:02 +0000
Subject: [PATCH] Use the member's userId in removal

Fixes #6016
---
 components/server/src/workspace/gitpod-server-impl.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/components/server/src/workspace/gitpod-server-impl.ts b/components/server/src/workspace/gitpod-server-impl.ts
index 5d3213397275ce..068a2b609bbd41 100644
--- a/components/server/src/workspace/gitpod-server-impl.ts
+++ b/components/server/src/workspace/gitpod-server-impl.ts
@@ -1559,7 +1559,6 @@ export class GitpodServerImpl<Client extends GitpodClient, Server extends Gitpod
         const user = this.checkAndBlockUser("deleteTeam");
         await this.guardTeamOperation(teamId, "delete");
 
-        await this.teamDB.deleteTeam(teamId);
         const teamProjects = await this.projectsService.getTeamProjects(teamId);
         teamProjects.forEach(project => {
             this.deleteProject(project.id);
@@ -1567,9 +1566,11 @@ export class GitpodServerImpl<Client extends GitpodClient, Server extends Gitpod
 
         const teamMembers = await this.teamDB.findMembersByTeam(teamId);
         teamMembers.forEach(member => {
-            this.removeTeamMember(teamId, userId);
+            this.removeTeamMember(teamId, member.userId);
         })
 
+        await this.teamDB.deleteTeam(teamId);
+
         return this.analytics.track({
             userId: user.id,
             event: "team_deleted",