fixup: circular dependency problem

Author: AlexTugarev

components/server/src/projects/projects-service.ts

@@ -26,7 +26,6 @@ import { ErrorCodes, ApplicationError } from "@gitpod/gitpod-protocol/lib/messag
 import { URL } from "url";
 import { Authorizer } from "../authorization/authorizer";
 import { TransactionalContext } from "@gitpod/gitpod-db/lib/typeorm/transactional-db-impl";
-import { GitHubAppSupport } from "../github/github-app-support";
 
 @injectable()
 export class ProjectsService {
@@ -38,7 +37,6 @@ export class ProjectsService {
         @inject(IAnalyticsWriter) private readonly analytics: IAnalyticsWriter,
         @inject(WebhookEventDB) private readonly webhookEventDB: WebhookEventDB,
         @inject(Authorizer) private readonly auth: Authorizer,
-        @inject(GitHubAppSupport) private readonly githubAppSupport: GitHubAppSupport,
     ) {}
 
     async getProject(userId: string, projectId: string): Promise<Project> {
@@ -217,13 +215,7 @@ export class ProjectsService {
                     return await repositoryService.canInstallAutomatedPrebuilds(currentUser, cloneURL);
                 }
             }
-            if (host === "github.com" && this.config.githubApp?.enabled) {
-                const availableRepositories = await this.githubAppSupport.getProviderRepositoriesForUser({
-                    user: currentUser,
-                    provider: "github.com",
-                });
-                return availableRepositories.some((r) => r.cloneUrl === cloneURL);
-            }
+            // The GitHub App case isn't handled here due to a circular dependency problem.
         } catch (error) {
             log.error("Failed to check precondition for creating a project.");
         }

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

@@ -2793,7 +2793,7 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         } catch (err) {
             throw new ApplicationError(ErrorCodes.BAD_REQUEST, "Clone URL must be a valid URL.");
         }
-        const canCreateProject = await this.projectsService.canCreateProject(user, params.cloneUrl);
+        const canCreateProject = await this.canCreateProject(user, params.cloneUrl);
         if (!canCreateProject) {
             throw new ApplicationError(
                 ErrorCodes.BAD_REQUEST,
@@ -2823,6 +2823,35 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         return project;
     }
 
+    /**
+     * Checks if a project can be created, i.e. the current user has the required permissions
+     * at the given git provider.
+     */
+    private async canCreateProject(currentUser: User, cloneURL: string) {
+        try {
+            const parsedUrl = RepoURL.parseRepoUrl(cloneURL);
+            const host = parsedUrl?.host;
+            if (!host) {
+                throw Error("Unknown host: " + parsedUrl?.host);
+            }
+            if (host === "github.com" && this.config.githubApp?.enabled) {
+                const availableRepositories = await this.githubAppSupport.getProviderRepositoriesForUser({
+                    user: currentUser,
+                    provider: "github.com",
+                });
+                return availableRepositories.some((r) => r.cloneUrl === cloneURL);
+            } else {
+                return await this.projectsService.canCreateProject(currentUser, cloneURL);
+
+                // note: the GitHub App based check is not included in the ProjectService due
+                // to a circular dependency problem which would otherwise occur.
+            }
+        } catch (error) {
+            log.error("Failed to check precondition for creating a project.");
+        }
+        return false;
+    }
+
     public async updateProjectPartial(ctx: TraceContext, partialProject: PartialProject): Promise<void> {
         traceAPIParams(ctx, {
             // censor everything irrelevant