From 6c7289ebe67cf105d10bac164d09334d9abb11cf Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <daniel@infisical.com>
Date: Thu, 6 Feb 2025 04:28:30 +0400
Subject: [PATCH] fix: smaller fixes

---
 .../azure-connection-router.ts                   |  2 --
 .../src/services/secret-sync/secret-sync-fns.ts  | 16 +++++++++++++++-
 .../AzureAppConfigurationSyncFields.tsx          |  2 +-
 .../AppConnectionForm/AppConnectionForm.tsx      |  2 ++
 .../AppConnectionForm/AzureConnectionForm.tsx    | 15 ++++++++++-----
 5 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/backend/src/server/routes/v1/app-connection-routers/azure-connection-router.ts b/backend/src/server/routes/v1/app-connection-routers/azure-connection-router.ts
index 35bef681b..20ef199a4 100644
--- a/backend/src/server/routes/v1/app-connection-routers/azure-connection-router.ts
+++ b/backend/src/server/routes/v1/app-connection-routers/azure-connection-router.ts
@@ -15,6 +15,4 @@ export const registerAzureConnectionRouter = async (server: FastifyZodProvider)
     createSchema: CreateAzureConnectionSchema,
     updateSchema: UpdateAzureConnectionSchema
   });
-
-  // The below endpoints are not exposed and for Infisical App use
 };
diff --git a/backend/src/services/secret-sync/secret-sync-fns.ts b/backend/src/services/secret-sync/secret-sync-fns.ts
index 1d8e1595c..22bfdbd6c 100644
--- a/backend/src/services/secret-sync/secret-sync-fns.ts
+++ b/backend/src/services/secret-sync/secret-sync-fns.ts
@@ -131,6 +131,11 @@ export const SecretSyncFns = {
       kmsService
     });
 
+    const azureAppConfigurationSecretSync = azureAppConfigurationSecretSyncFactory({
+      appConnectionDAL,
+      kmsService
+    });
+
     let secretMap: TSecretMap;
     switch (secretSync.destination) {
       case SecretSync.AWSParameterStore:
@@ -148,7 +153,9 @@ export const SecretSyncFns = {
       case SecretSync.AzureKeyVault:
         secretMap = await azureKeyVaultSecretSync.getSecrets(secretSync);
         break;
-
+      case SecretSync.AzureAppConfiguration:
+        secretMap = await azureAppConfigurationSecretSync.getSecrets(secretSync);
+        break;
       default:
         throw new Error(
           `Unhandled sync destination for get secrets fns: ${(secretSync as TSecretSyncWithCredentials).destination}`
@@ -170,6 +177,11 @@ export const SecretSyncFns = {
       kmsService
     });
 
+    const azureAppConfigurationSecretSync = azureAppConfigurationSecretSyncFactory({
+      appConnectionDAL,
+      kmsService
+    });
+
     switch (secretSync.destination) {
       case SecretSync.AWSParameterStore:
         return AwsParameterStoreSyncFns.removeSecrets(secretSync, secretMap);
@@ -181,6 +193,8 @@ export const SecretSyncFns = {
         return GcpSyncFns.removeSecrets(secretSync, secretMap);
       case SecretSync.AzureKeyVault:
         return azureKeyVaultSecretSync.removeSecrets(secretSync, secretMap);
+      case SecretSync.AzureAppConfiguration:
+        return azureAppConfigurationSecretSync.removeSecrets(secretSync, secretMap);
       default:
         throw new Error(
           `Unhandled sync destination for remove secrets fns: ${(secretSync as TSecretSyncWithCredentials).destination}`
diff --git a/frontend/src/components/secret-syncs/forms/SecretSyncDestinationFields/AzureAppConfigurationSyncFields.tsx b/frontend/src/components/secret-syncs/forms/SecretSyncDestinationFields/AzureAppConfigurationSyncFields.tsx
index 739009182..46c481463 100644
--- a/frontend/src/components/secret-syncs/forms/SecretSyncDestinationFields/AzureAppConfigurationSyncFields.tsx
+++ b/frontend/src/components/secret-syncs/forms/SecretSyncDestinationFields/AzureAppConfigurationSyncFields.tsx
@@ -36,7 +36,7 @@ export const AzureAppConfigurationSyncFields = () => {
           <FormControl
             isError={Boolean(error)}
             errorText={error?.message}
-            label="Vault Base URL"
+            label="Configuration URL"
             tooltipText="Enter your Azure App Configuration URL. This is the base URL for your Azure App Configuration, e.g. https://resource-name-here.azconfig.io."
           >
             <Input {...field} placeholder="https://resource-name-here.azconfig.io" />
diff --git a/frontend/src/pages/organization/SettingsPage/components/AppConnectionsTab/components/AppConnectionForm/AppConnectionForm.tsx b/frontend/src/pages/organization/SettingsPage/components/AppConnectionsTab/components/AppConnectionForm/AppConnectionForm.tsx
index b5b91a8e8..2c1e8b8b0 100644
--- a/frontend/src/pages/organization/SettingsPage/components/AppConnectionsTab/components/AppConnectionForm/AppConnectionForm.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/AppConnectionsTab/components/AppConnectionForm/AppConnectionForm.tsx
@@ -95,6 +95,8 @@ const UpdateForm = ({ appConnection, onComplete }: UpdateFormProps) => {
       return <GitHubConnectionForm appConnection={appConnection} />;
     case AppConnection.GCP:
       return <GcpConnectionForm appConnection={appConnection} onSubmit={onSubmit} />;
+    case AppConnection.Azure:
+      return <AzureConnectionForm appConnection={appConnection} />;
     default:
       throw new Error(`Unhandled App ${(appConnection as TAppConnection).app}`);
   }
diff --git a/frontend/src/pages/organization/SettingsPage/components/AppConnectionsTab/components/AppConnectionForm/AzureConnectionForm.tsx b/frontend/src/pages/organization/SettingsPage/components/AppConnectionsTab/components/AppConnectionForm/AzureConnectionForm.tsx
index 23d05a09e..4d1664829 100644
--- a/frontend/src/pages/organization/SettingsPage/components/AppConnectionsTab/components/AppConnectionForm/AzureConnectionForm.tsx
+++ b/frontend/src/pages/organization/SettingsPage/components/AppConnectionsTab/components/AppConnectionForm/AzureConnectionForm.tsx
@@ -50,11 +50,16 @@ export const AzureConnectionForm = ({ appConnection }: Props) => {
 
   const form = useForm<FormData>({
     resolver: zodResolver(formSchema),
-    defaultValues: appConnection ?? {
-      app: AppConnection.Azure,
-      method: AzureConnectionMethod.OAuth,
-      resource: AzureResources.KeyVault
-    }
+    defaultValues: appConnection
+      ? {
+          ...appConnection,
+          resource: appConnection?.credentials.resource
+        }
+      : {
+          app: AppConnection.Azure,
+          method: AzureConnectionMethod.OAuth,
+          resource: AzureResources.KeyVault
+        }
   });
 
   const {