Merge pull request #1017 from Infisical/debug-self-hosted-gitlab

Patch self-hosted gitlab integration

backend/src/helpers/integration.ts

@@ -15,6 +15,7 @@ import { IntegrationAuthMetadata } from "../models/integrationAuth/types";
 interface Update {
   workspace: string;
   integration: string;
+  url?: string;
   teamId?: string;
   accountId?: string;
   metadata?: IntegrationAuthMetadata
@@ -64,6 +65,10 @@ export const handleOAuthExchangeHelper = async ({
     integration
   };
   
+  if (res.url) {
+    update.url = res.url;
+  }
+
   switch (integration) {
     case INTEGRATION_VERCEL:
       update.teamId = res.teamId;

backend/src/integrations/exchange.ts

@@ -423,6 +423,7 @@ const exchangeCodeGitlab = async ({
     accessToken: res.access_token,
     refreshToken: res.refresh_token,
     accessExpiresAt,
+    url
   };
 };
 

frontend/src/pages/integrations/gitlab/create.tsx

@@ -84,6 +84,7 @@ export default function GitLabCreateIntegrationPage() {
   const selectedSourceEnvironment = watch("selectedSourceEnvironment");
   const targetEntity = watch("targetEntity");
   const targetTeamId = watch("targetTeamId");
+  const targetAppIdValue = watch("targetAppId");
 
   const { mutateAsync } = useCreateIntegration();
 
@@ -440,6 +441,7 @@ export default function GitLabCreateIntegrationPage() {
           size="sm"
           type="submit"
           isLoading={isLoading}
+          isDisabled={targetAppIdValue === "none"}
         >
           Create Integration
         </Button>