[server] don't error on project not_found

Author: svenefftinge

components/gitpod-protocol/src/messaging/error.ts

@@ -25,6 +25,17 @@ export namespace ApplicationError {
     export function hasErrorCode(e: any): e is Error & { code: ErrorCode; data?: any } {
         return e && e.code !== undefined;
     }
+
+    export async function notFoundToUndefined<T>(p: Promise<T>): Promise<T | undefined> {
+        try {
+            return await p;
+        } catch (e) {
+            if (hasErrorCode(e) && e.code === ErrorCodes.NOT_FOUND) {
+                return undefined;
+            }
+            throw e;
+        }
+    }
 }
 
 export namespace ErrorCode {

components/server/src/workspace/env-var-service.ts

@@ -15,6 +15,7 @@ import {
 } from "@gitpod/gitpod-protocol";
 import { inject, injectable } from "inversify";
 import { ProjectsService } from "../projects/projects-service";
+import { ApplicationError } from "@gitpod/gitpod-protocol/lib/messaging/error";
 
 export interface ResolvedEnvVars {
     // all project env vars, censored included always
@@ -43,8 +44,11 @@ export class EnvVarService {
         };
 
         const projectEnvVars = workspace.projectId
-            ? await this.projectsService.getProjectEnvironmentVariables(workspace.ownerId, workspace.projectId)
+            ? (await ApplicationError.notFoundToUndefined(
+                  this.projectsService.getProjectEnvironmentVariables(workspace.ownerId, workspace.projectId),
+              )) || []
             : [];
+
         if (workspace.type === "prebuild") {
             // prebuild does not have access to user env vars and cannot be started via prewfix URL
             const withValues = await this.projectDB.getProjectEnvironmentVariableValues(projectEnvVars);

components/server/src/workspace/gitpod-server-impl.ts

@@ -848,7 +848,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         const user = await this.checkUser("getTeamMembersByProject");
         if (projectId) {
             const project = await this.projectsService.getProject(user.id, projectId);
-            if (project && project.teamId) {
+            if (project.teamId) {
                 return await this.organizationService.listMembers(user.id, project.teamId);
             }
         }
@@ -978,7 +978,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         }
         const envVarsPromise = this.envVarService.resolve(workspace);
         const projectPromise = workspace.projectId
-            ? this.projectsService.getProject(user.id, workspace.projectId)
+            ? ApplicationError.notFoundToUndefined(this.projectsService.getProject(user.id, workspace.projectId))
             : Promise.resolve(undefined);
 
         await mayStartPromise;
@@ -1593,9 +1593,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         const user = await this.checkAndBlockUser("getPrebuildEvents");
 
         const project = await this.projectsService.getProject(user.id, projectId);
-        if (!project) {
-            throw new ApplicationError(ErrorCodes.NOT_FOUND, "Project not found");
-        }
         await this.guardProjectOperation(user, projectId, "get");
 
         const events = await this.projectsService.getPrebuildEvents(user.id, project.cloneUrl);
@@ -1612,9 +1609,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         const user = await this.checkAndBlockUser("triggerPrebuild");
 
         const project = await this.projectsService.getProject(user.id, projectId);
-        if (!project) {
-            throw new ApplicationError(ErrorCodes.NOT_FOUND, "Project not found");
-        }
         await this.guardProjectOperation(user, projectId, "update");
 
         const branchDetails = !!branchName
@@ -2810,9 +2804,6 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
 
     private async guardProjectOperation(user: User, projectId: string, op: ResourceAccessOp): Promise<void> {
         const project = await this.projectsService.getProject(user.id, projectId);
-        if (!project) {
-            throw new ApplicationError(ErrorCodes.NOT_FOUND, "Project not found");
-        }
         // Anyone who can read a team's information (i.e. any team member) can manage team projects
         await this.guardTeamOperation(project.teamId, "get", "not_implemented");
     }
@@ -2954,10 +2945,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
 
         const user = await this.checkAndBlockUser("cancelPrebuild");
 
-        const project = await this.projectsService.getProject(user.id, projectId);
-        if (!project) {
-            throw new ApplicationError(ErrorCodes.NOT_FOUND, "Project not found");
-        }
+        await this.projectsService.getProject(user.id, projectId);
         await this.guardProjectOperation(user, projectId, "update");
 
         const prebuild = await this.workspaceDb.trace(ctx).findPrebuildByID(prebuildId);

components/server/src/workspace/headless-log-controller.ts

@@ -34,6 +34,7 @@ import { BearerAuth } from "../auth/bearer-authenticator";
 import { ProjectsService } from "../projects/projects-service";
 import { HostContextProvider } from "../auth/host-context-provider";
 import { TraceContext } from "@gitpod/gitpod-protocol/lib/util/tracing";
+import { ApplicationError } from "@gitpod/gitpod-protocol/lib/messaging/error";
 
 export const HEADLESS_LOGS_PATH_PREFIX = "/headless-logs";
 export const HEADLESS_LOG_DOWNLOAD_PATH_PREFIX = "/headless-log-download";
@@ -214,7 +215,9 @@ export class HeadlessLogController {
 
         let teamMembers: TeamMemberInfo[] = [];
         if (workspace?.projectId) {
-            const p = await this.projectService.getProject(user.id, workspace.projectId);
+            const p = await ApplicationError.notFoundToUndefined(
+                this.projectService.getProject(user.id, workspace.projectId),
+            );
             if (p?.teamId) {
                 teamMembers = await this.teamDb.findMembersByTeam(p.teamId);
             }

components/server/src/workspace/workspace-starter.ts

@@ -696,10 +696,7 @@ export class WorkspaceStarter {
         metadata.setMetaId(workspace.id);
         if (workspace.projectId) {
             metadata.setProject(workspace.projectId);
-            const project = await this.projectDB.findProjectById(workspace.projectId);
-            if (project && project.teamId) {
-                metadata.setTeam(project.teamId);
-            }
+            metadata.setTeam(workspace.organizationId);
         }
 
         return metadata;