- Add a max iteration to loop - Hide gateways on frontend if license

does not allow them - Fix capitalization issue with GitHub secret sync

backend/src/services/app-connection/github/github-connection-fns.ts

@@ -116,6 +116,18 @@ export const getGitHubAppAuthToken = async (appConnection: TGitHubConnection) =>
   return token;
 };
 
+function extractNextPageUrl(linkHeader: string | undefined): string | null {
+  if (!linkHeader) return null;
+
+  const links = linkHeader.split(",");
+  const nextLink = links.find((link) => link.includes('rel="next"'));
+
+  if (!nextLink) return null;
+
+  const match = new RE2(/<([^>]+)>/).exec(nextLink);
+  return match ? match[1] : null;
+}
+
 export const makePaginatedGitHubRequest = async <T, R = T[]>(
   appConnection: TGitHubConnection,
   gatewayService: Pick<TGatewayServiceFactory, "fnGetGatewayClientTlsByGatewayId">,
@@ -128,8 +140,9 @@ export const makePaginatedGitHubRequest = async <T, R = T[]>(
     method === GitHubConnectionMethod.OAuth ? credentials.accessToken : await getGitHubAppAuthToken(appConnection);
   let url: string | null = `https://api.${credentials.host || "github.com"}${path}`;
   let results: T[] = [];
+  let i = 0;
 
-  while (url) {
+  while (url && i < 1000) {
     // eslint-disable-next-line no-await-in-loop
     const response: AxiosResponse<R> = await requestWithGitHubGateway<R>(appConnection, gatewayService, {
       url,
@@ -144,14 +157,8 @@ export const makePaginatedGitHubRequest = async <T, R = T[]>(
     const items = dataMapper ? dataMapper(response.data) : (response.data as unknown as T[]);
     results = results.concat(items);
 
-    const linkHeader = response.headers.link as string | undefined;
+    url = extractNextPageUrl(response.headers.link as string | undefined);
-    const nextLink =
+    i += 1;
-      typeof linkHeader === "string" ? linkHeader.split(",").find((s) => s.includes('rel="next"')) : undefined;
-    if (nextLink) {
-      url = new RE2(/<(.+)>/).exec(nextLink)?.[1] || null;
-    } else {
-      url = null;
-    }
   }
 
   return results;

backend/src/services/secret-sync/github/github-sync-fns.ts

@@ -171,9 +171,11 @@ const putSecret = async (
 export const GithubSyncFns = {
   syncSecrets: async (
     secretSync: TGitHubSyncWithCredentials,
-    secretMap: TSecretMap,
+    ogSecretMap: TSecretMap,
     gatewayService: Pick<TGatewayServiceFactory, "fnGetGatewayClientTlsByGatewayId">
   ) => {
+    const secretMap = Object.fromEntries(Object.entries(ogSecretMap).map(([i, v]) => [i.toUpperCase(), v]));
+
     switch (secretSync.destinationConfig.scope) {
       case GitHubSyncScope.Organization:
         if (Object.values(secretMap).length > 1000) {
@@ -252,9 +254,11 @@ export const GithubSyncFns = {
   },
   removeSecrets: async (
     secretSync: TGitHubSyncWithCredentials,
-    secretMap: TSecretMap,
+    ogSecretMap: TSecretMap,
     gatewayService: Pick<TGatewayServiceFactory, "fnGetGatewayClientTlsByGatewayId">
   ) => {
+    const secretMap = Object.fromEntries(Object.entries(ogSecretMap).map(([i, v]) => [i.toUpperCase(), v]));
+
     const { connection } = secretSync;
     const token =
       connection.method === GitHubConnectionMethod.OAuth

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/GitHubConnectionForm.tsx

@@ -20,6 +20,7 @@ import {
   SelectItem,
   Tooltip
 } from "@app/components/v2";
+import { useSubscription } from "@app/context";
 import {
   OrgGatewayPermissionActions,
   OrgPermissionSubjects
@@ -80,6 +81,7 @@ export const GitHubConnectionForm = ({ appConnection }: Props) => {
     formState: { isSubmitting, isDirty }
   } = form;
 
+  const { subscription } = useSubscription();
   const { data: gateways, isPending: isGatewaysLoading } = useQuery(gatewaysQueryKeys.list());
 
   const selectedMethod = watch("method");
@@ -173,6 +175,7 @@ export const GitHubConnectionForm = ({ appConnection }: Props) => {
             </FormControl>
           )}
         />
+        {subscription.gateway && (
           <Accordion type="single" collapsible className="w-full">
             <AccordionItem value="enterprise-options" className="data-[state=open]:border-none">
               <AccordionTrigger className="h-fit flex-none pl-1 text-sm">
@@ -246,7 +249,7 @@ export const GitHubConnectionForm = ({ appConnection }: Props) => {
               </AccordionContent>
             </AccordionItem>
           </Accordion>
-
+        )}
         <div className="mt-8 flex items-center">
           <Button
             className="mr-4"

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/MsSqlConnectionForm.tsx

@@ -6,6 +6,7 @@ import { z } from "zod";
 
 import { OrgPermissionCan } from "@app/components/permissions";
 import { Button, FormControl, ModalClose, Select, SelectItem, Tooltip } from "@app/components/v2";
+import { useSubscription } from "@app/context";
 import {
   OrgGatewayPermissionActions,
   OrgPermissionSubjects
@@ -78,6 +79,7 @@ export const MsSqlConnectionForm = ({ appConnection, onSubmit }: Props) => {
     formState: { isSubmitting, isDirty }
   } = form;
 
+  const { subscription } = useSubscription();
   const isPlatformManagedCredentials = appConnection?.isPlatformManagedCredentials ?? false;
   const { data: gateways, isPending: isGatewaysLoading } = useQuery(gatewaysQueryKeys.list());
 
@@ -99,6 +101,7 @@ export const MsSqlConnectionForm = ({ appConnection, onSubmit }: Props) => {
         }}
       >
         {!isUpdate && <GenericAppConnectionsFields />}
+        {subscription.gateway && (
           <OrgPermissionCan
             I={OrgGatewayPermissionActions.AttachGateways}
             a={OrgPermissionSubjects.Gateway}
@@ -148,6 +151,7 @@ export const MsSqlConnectionForm = ({ appConnection, onSubmit }: Props) => {
               />
             )}
           </OrgPermissionCan>
+        )}
         <Controller
           name="method"
           control={control}

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/MySqlConnectionForm.tsx

@@ -6,6 +6,7 @@ import { z } from "zod";
 
 import { OrgPermissionCan } from "@app/components/permissions";
 import { Button, FormControl, ModalClose, Select, SelectItem, Tooltip } from "@app/components/v2";
+import { useSubscription } from "@app/context";
 import {
   OrgGatewayPermissionActions,
   OrgPermissionSubjects
@@ -75,6 +76,7 @@ export const MySqlConnectionForm = ({ appConnection, onSubmit }: Props) => {
     formState: { isSubmitting, isDirty }
   } = form;
 
+  const { subscription } = useSubscription();
   const isPlatformManagedCredentials = appConnection?.isPlatformManagedCredentials ?? false;
   const { data: gateways, isPending: isGatewaysLoading } = useQuery(gatewaysQueryKeys.list());
 
@@ -96,6 +98,7 @@ export const MySqlConnectionForm = ({ appConnection, onSubmit }: Props) => {
         }}
       >
         {!isUpdate && <GenericAppConnectionsFields />}
+        {subscription.gateway && (
           <OrgPermissionCan
             I={OrgGatewayPermissionActions.AttachGateways}
             a={OrgPermissionSubjects.Gateway}
@@ -145,6 +148,7 @@ export const MySqlConnectionForm = ({ appConnection, onSubmit }: Props) => {
               />
             )}
           </OrgPermissionCan>
+        )}
         <Controller
           name="method"
           control={control}

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/OracleDBConnectionForm.tsx

@@ -6,6 +6,7 @@ import { z } from "zod";
 
 import { OrgPermissionCan } from "@app/components/permissions";
 import { Button, FormControl, ModalClose, Select, SelectItem, Tooltip } from "@app/components/v2";
+import { useSubscription } from "@app/context";
 import {
   OrgGatewayPermissionActions,
   OrgPermissionSubjects
@@ -75,6 +76,7 @@ export const OracleDBConnectionForm = ({ appConnection, onSubmit }: Props) => {
     formState: { isSubmitting, isDirty }
   } = form;
 
+  const { subscription } = useSubscription();
   const isPlatformManagedCredentials = appConnection?.isPlatformManagedCredentials ?? false;
   const { data: gateways, isPending: isGatewaysLoading } = useQuery(gatewaysQueryKeys.list());
 
@@ -96,6 +98,7 @@ export const OracleDBConnectionForm = ({ appConnection, onSubmit }: Props) => {
         }}
       >
         {!isUpdate && <GenericAppConnectionsFields />}
+        {subscription.gateway && (
           <OrgPermissionCan
             I={OrgGatewayPermissionActions.AttachGateways}
             a={OrgPermissionSubjects.Gateway}
@@ -145,6 +148,7 @@ export const OracleDBConnectionForm = ({ appConnection, onSubmit }: Props) => {
               />
             )}
           </OrgPermissionCan>
+        )}
         <Controller
           name="method"
           control={control}

frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/PostgresConnectionForm.tsx

@@ -6,6 +6,7 @@ import { z } from "zod";
 
 import { OrgPermissionCan } from "@app/components/permissions";
 import { Button, FormControl, ModalClose, Select, SelectItem, Tooltip } from "@app/components/v2";
+import { useSubscription } from "@app/context";
 import {
   OrgGatewayPermissionActions,
   OrgPermissionSubjects
@@ -75,6 +76,7 @@ export const PostgresConnectionForm = ({ appConnection, onSubmit }: Props) => {
     formState: { isSubmitting, isDirty }
   } = form;
 
+  const { subscription } = useSubscription();
   const isPlatformManagedCredentials = appConnection?.isPlatformManagedCredentials ?? false;
   const { data: gateways, isPending: isGatewaysLoading } = useQuery(gatewaysQueryKeys.list());
 
@@ -96,6 +98,7 @@ export const PostgresConnectionForm = ({ appConnection, onSubmit }: Props) => {
         }}
       >
         {!isUpdate && <GenericAppConnectionsFields />}
+        {subscription.gateway && (
           <OrgPermissionCan
             I={OrgGatewayPermissionActions.AttachGateways}
             a={OrgPermissionSubjects.Gateway}
@@ -145,6 +148,7 @@ export const PostgresConnectionForm = ({ appConnection, onSubmit }: Props) => {
               />
             )}
           </OrgPermissionCan>
+        )}
         <Controller
           name="method"
           control={control}