Merge remote-tracking branch 'upstream/main' into gitea

components/server/ee/src/auth/host-container-mapping.ts

@@ -9,24 +9,27 @@ import { HostContainerMapping } from "../../../src/auth/host-container-mapping";
 import { gitlabContainerModuleEE } from "../gitlab/container-module";
 import { bitbucketContainerModuleEE } from "../bitbucket/container-module";
 import { giteaContainerModuleEE } from "../gitea/container-module";
+import { gitHubContainerModuleEE } from "../github/container-module";
 
 @injectable()
 export class HostContainerMappingEE extends HostContainerMapping {
-  public get(type: string): interfaces.ContainerModule[] | undefined {
-    let modules = super.get(type) || [];
+    public get(type: string): interfaces.ContainerModule[] | undefined {
+        let modules = super.get(type) || [];
 
-    switch (type) {
-      case "GitLab":
-        return (modules || []).concat([gitlabContainerModuleEE]);
-      case "Bitbucket":
-        return (modules || []).concat([bitbucketContainerModuleEE]);
-      case "Gitea":
-        return (modules || []).concat([giteaContainerModuleEE]);
-      // case "BitbucketServer":
-      // FIXME
-      // return (modules || []).concat([bitbucketContainerModuleEE]);
-      default:
-        return modules;
+        switch (type) {
+        case "GitLab":
+            return (modules || []).concat([gitlabContainerModuleEE]);
+        case "Bitbucket":
+            return (modules || []).concat([bitbucketContainerModuleEE]);
+        // case "BitbucketServer":
+            // FIXME
+            // return (modules || []).concat([bitbucketContainerModuleEE]);
+        case "GitHub":
+            return (modules || []).concat([gitHubContainerModuleEE]);
+        case "Gitea":
+              return (modules || []).concat([giteaContainerModuleEE]);
+        default:
+            return modules;
+        }
     }
-  }
 }

components/server/ee/src/container-module.ts

@@ -73,6 +73,7 @@ export const productionEEContainerModule = new ContainerModule((bind, unbind, is
     bind(BitbucketAppSupport).toSelf().inSingletonScope();
     bind(GiteaApp).toSelf().inSingletonScope();
     bind(GiteaAppSupport).toSelf().inSingletonScope();
+    bind(GitHubEnterpriseApp).toSelf().inSingletonScope();
 
     bind(LicenseEvaluator).toSelf().inSingletonScope();
     bind(LicenseKeySource).to(DBLicenseKeySource).inSingletonScope();

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

@@ -138,7 +138,7 @@ export class ProjectsService {
         const hostContext = parsedUrl?.host ? this.hostContextProvider.get(parsedUrl?.host) : undefined;
         const type = hostContext && hostContext.authProvider.info.authProviderType;
         // TODO: handle gitea
-        if (type === "GitLab" || type === "Bitbucket") {
+        if (type !== "github.com") {
             const repositoryService = hostContext?.services?.repositoryService;
             if (repositoryService) {
                 // Note: For GitLab, we expect .canInstallAutomatedPrebuilds() to always return true, because earlier