[server] Make sure to re-add project -> org relation on failed deleti…

…on (#18055)
gitpod-io · Jun 26, 2023 · 8a2be48 · 8a2be48
1 parent 0111756
commit 8a2be48
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/components/server/src/projects/projects-service.ts b/components/server/src/projects/projects-service.ts
@@ -217,19 +217,23 @@ export class ProjectsService {
     }
 
     async deleteProject(projectId: string): Promise<void> {
+        let orgId: string | undefined = undefined;
         try {
             await this.projectDB.transaction(async (db) => {
                 // TODO(gpl): This is a case where we'd need to extend the service + API to also accept the orgId as first parameter
                 const project = await db.findProjectById(projectId);
                 if (!project) {
                     throw new Error("Project does not exist");
                 }
+                orgId = project.teamId;
                 await db.markDeleted(projectId);
 
-                await this.authorizer.writeRelationships(removeProjectFromOrg(project.teamId, projectId));
+                await this.authorizer.writeRelationships(removeProjectFromOrg(orgId, projectId));
             });
         } catch (err) {
-            // As the remove relationships is the last call that might fail, we don't have to do anything here.
+            if (orgId) {
+                await this.authorizer.writeRelationships(addProjectToOrg(orgId, projectId));
+            }
             throw err;
         }
     }