Allow integrating with 'github.com' without a GitHub App

Author: jankeromnes

components/dashboard/src/projects/NewProject.tsx

@@ -29,7 +29,7 @@ export default function NewProject() {
     const [reposInAccounts, setReposInAccounts] = useState<ProviderRepository[]>([]);
     const [repoSearchFilter, setRepoSearchFilter] = useState<string>("");
     const [selectedAccount, setSelectedAccount] = useState<string | undefined>(undefined);
-    const [showGitProviders, setShowGitProviders] = useState<boolean>(false);
+    const [showGitProviders, setShowGitProviders] = useState<boolean>(true);
     const [selectedRepo, setSelectedRepo] = useState<ProviderRepository | undefined>(undefined);
     const [selectedTeamOrUser, setSelectedTeamOrUser] = useState<Team | User | undefined>(undefined);
 
@@ -41,11 +41,16 @@ export default function NewProject() {
     const [sourceOfConfig, setSourceOfConfig] = useState<"repo" | "db" | undefined>();
 
     const [authProviders, setAuthProviders] = useState<AuthProviderInfo[]>([]);
+    const [isGitHubAppEnabled, setIsGitHubAppEnabled] = useState<boolean>();
+
+    console.log("isGitHubAppEnabled", isGitHubAppEnabled);
 
     useEffect(() => {
-        (async () => {
-            setAuthProviders(await getGitpodService().server.getAuthProviders());
-        })();
+        const { server } = getGitpodService();
+        Promise.all([
+            server.getAuthProviders().then((v) => () => setAuthProviders(v)),
+            server.isGitHubAppEnabled().then((v) => () => setIsGitHubAppEnabled(v)),
+        ]).then((setters) => setters.forEach((s) => s()));
     }, []);
 
     useEffect(() => {
@@ -275,7 +280,7 @@ export default function NewProject() {
                 onClick: () => setSelectedAccount(account),
             });
         }
-        if (isGitHub()) {
+        if (isGitHub() && isGitHubAppEnabled) {
             result.push({
                 title: "Add another GitHub account",
                 customContent: renderItemContent("Add GitHub Orgs or Account", Plus),
@@ -437,7 +442,7 @@ export default function NewProject() {
                         )}
                     </div>
                 </div>
-                {reposInAccounts.length > 0 && isGitHub() && (
+                {reposInAccounts.length > 0 && isGitHub() && isGitHubAppEnabled && (
                     <div>
                         <div className="text-gray-500 text-center w-96 mx-8">
                             Repository not found?{" "}
@@ -634,14 +639,13 @@ function GitProviders(props: {
         setErrorMessage(undefined);
 
         const token = await getGitpodService().server.getToken({ host: ap.host });
-        const isGitHubEnterprise = AuthProviderInfo.isGitHubEnterprise(ap);
-        if (token && !(isGitHubEnterprise && !token.scopes.includes("repo"))) {
+        if (token && !(ap.authProviderType === "GitHub" && !token.scopes.includes("repo"))) {
             props.onHostSelected(ap.host);
             return;
         }
         await openAuthorizeWindow({
             host: ap.host,
-            scopes: isGitHubEnterprise ? ["repo"] : ap.requirements?.default,
+            scopes: ap.authProviderType === "GitHub" ? ["repo"] : ap.requirements?.default,
             onSuccess: async () => {
                 props.onHostSelected(ap.host, true);
             },

components/gitpod-protocol/src/gitpod-service.ts

@@ -189,6 +189,7 @@ export interface GitpodServer extends JsonRpcServer<GitpodClient>, AdminServer,
 
     // misc
     sendFeedback(feedback: string): Promise<string | undefined>;
+    isGitHubAppEnabled(): Promise<boolean>;
     registerGithubApp(installationId: string): Promise<void>;
 
     /**

components/gitpod-protocol/src/protocol.ts

@@ -1159,12 +1159,6 @@ export interface AuthProviderInfo {
     };
 }
 
-export namespace AuthProviderInfo {
-    export function isGitHubEnterprise(info?: AuthProviderInfo): boolean {
-        return !!info && info.authProviderType === "GitHub" && info.host !== "github.com";
-    }
-}
-
 export interface AuthProviderEntry {
     readonly id: string;
     readonly type: AuthProviderEntry.Type;

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

@@ -1781,7 +1781,7 @@ export class GitpodServerEEImpl extends GitpodServerImpl {
         const providerHost = params.provider;
         const provider = (await this.getAuthProviders(ctx)).find((ap) => ap.host === providerHost);
 
-        if (providerHost === "github.com") {
+        if (providerHost === "github.com" && this.config.githubApp?.enabled) {
             repositories.push(...(await this.githubAppSupport.getProviderRepositoriesForUser({ user, ...params })));
         } else if (provider?.authProviderType === "GitHub") {
             const hostContext = this.hostContextProvider.get(providerHost);

components/server/src/auth/rate-limiter.ts

@@ -121,6 +121,7 @@ function getConfig(config: RateLimiterConfig): RateLimiterConfig {
         generateNewGitpodToken: { group: "default", points: 1 },
         deleteGitpodToken: { group: "default", points: 1 },
         sendFeedback: { group: "default", points: 1 },
+        isGitHubAppEnabled: { group: "default", points: 1 },
         registerGithubApp: { group: "default", points: 1 },
         takeSnapshot: { group: "default", points: 1 },
         waitForSnapshot: { group: "default", points: 1 },

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

@@ -7,7 +7,6 @@
 import { inject, injectable } from "inversify";
 import { DBWithTracing, ProjectDB, TeamDB, TracedWorkspaceDB, UserDB, WorkspaceDB } from "@gitpod/gitpod-db/lib";
 import {
-    AuthProviderInfo,
     Branch,
     PrebuildWithStatus,
     CreateProjectParams,
@@ -20,6 +19,7 @@ import { HostContextProvider } from "../auth/host-context-provider";
 import { RepoURL } from "../repohost";
 import { log } from "@gitpod/gitpod-protocol/lib/util/logging";
 import { PartialProject, ProjectUsage } from "@gitpod/gitpod-protocol/src/teams-projects-protocol";
+import { Config } from "../config";
 
 @injectable()
 export class ProjectsService {
@@ -28,6 +28,7 @@ export class ProjectsService {
     @inject(UserDB) protected readonly userDB: UserDB;
     @inject(TracedWorkspaceDB) protected readonly workspaceDb: DBWithTracing<WorkspaceDB>;
     @inject(HostContextProvider) protected readonly hostContextProvider: HostContextProvider;
+    @inject(Config) protected readonly config: Config;
 
     async getProject(projectId: string): Promise<Project | undefined> {
         return this.projectDB.findProjectById(projectId);
@@ -154,7 +155,7 @@ export class ProjectsService {
             type === "GitLab" ||
             type === "Bitbucket" ||
             type === "BitbucketServer" ||
-            AuthProviderInfo.isGitHubEnterprise(authProvider)
+            (type === "GitHub" && (authProvider?.host !== "github.com" || !this.config.githubApp?.enabled))
         ) {
             const repositoryService = hostContext?.services?.repositoryService;
             if (repositoryService) {

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

@@ -1710,6 +1710,11 @@ export class GitpodServerImpl implements GitpodServerWithTracing, Disposable {
         throw new ResponseError(ErrorCodes.EE_FEATURE, "Sending feedback is not implemented");
     }
 
+    async isGitHubAppEnabled(ctx: TraceContext): Promise<boolean> {
+        this.checkAndBlockUser();
+        return !!this.config.githubApp?.enabled;
+    }
+
     async registerGithubApp(ctx: TraceContext, installationId: string): Promise<void> {
         traceAPIParams(ctx, { installationId });