diff --git a/docs/images/app-connections/azure/app-configuration/create-client-secrets-method.png b/docs/images/app-connections/azure/app-configuration/create-client-secrets-method.png new file mode 100644 index 000000000..063fa1f90 Binary files /dev/null and b/docs/images/app-connections/azure/app-configuration/create-client-secrets-method.png differ diff --git a/docs/images/app-connections/azure/devops/create-client-secrets-method.png b/docs/images/app-connections/azure/devops/create-client-secrets-method.png new file mode 100644 index 000000000..b0563dcb9 Binary files /dev/null and b/docs/images/app-connections/azure/devops/create-client-secrets-method.png differ diff --git a/docs/images/app-connections/azure/key-vault/create-client-secrets-method.png b/docs/images/app-connections/azure/key-vault/create-client-secrets-method.png new file mode 100644 index 000000000..b857c99fb Binary files /dev/null and b/docs/images/app-connections/azure/key-vault/create-client-secrets-method.png differ diff --git a/docs/integrations/app-connections/azure-app-configuration.mdx b/docs/integrations/app-connections/azure-app-configuration.mdx index c8c4895f9..df5072725 100644 --- a/docs/integrations/app-connections/azure-app-configuration.mdx +++ b/docs/integrations/app-connections/azure-app-configuration.mdx @@ -86,25 +86,35 @@ Infisical currently only supports one method for connecting to Azure, which is O Navigate to the **App Connections** tab on the **Organization Settings** page. ![App Connections Tab](/images/app-connections/general/add-connection.png) - - Select the **Azure Connection** option from the connection options modal. ![Select Azure Connection](/images/app-connections/azure/app-configuration/select-connection.png) - - - You can optionally authenticate against a specific tenant by providing the Azure Tenant or Directory ID. + + Select the **Azure Connection** option from the connection options modal. ![Select Azure Connection](/images/app-connections/azure/app-configuration/select-connection.png) + + + + + + You can optionally authenticate against a specific tenant by providing the Azure Tenant or Directory ID. - Now select the **OAuth** method and click **Connect to Azure**. + Now select the **OAuth** method and click **Connect to Azure**. - ![Connect via Azure OAUth](/images/app-connections/azure/app-configuration/create-oauth-method.png) + ![Connect via Azure OAUth](/images/app-connections/azure/app-configuration/create-oauth-method.png) + + + You will then be redirected to Azure to grant Infisical access to your Azure account. Once granted, + you will redirect you back to Infisical's App Connections page. ![Azure App Configuration + Authorization](/images/app-connections/azure/grant-access.png) + + + + + Fill in the **Tenant ID**, **Client ID** and **Client Secret** fields with the Directory (Tenant) ID, Application (Client) ID and Client Secret you obtained in the previous step. - - - - - You will then be redirected to Azure to grant Infisical access to your Azure account. Once granted, - you will redirect you back to Infisical's App Connections page. ![Azure App Configuration - Authorization](/images/app-connections/azure/grant-access.png) - - + ![Connect via Azure OAUth](/images/app-connections/azure/app-configuration/create-client-secrets-method.png) + + + + + Your **Azure App Configuration Connection** is now available for use. ![Assume Role AWS Connection](/images/app-connections/azure/app-configuration/oauth-connection.png) diff --git a/docs/integrations/app-connections/azure-devops.mdx b/docs/integrations/app-connections/azure-devops.mdx index 44ff55e64..201790d7f 100644 --- a/docs/integrations/app-connections/azure-devops.mdx +++ b/docs/integrations/app-connections/azure-devops.mdx @@ -155,6 +155,17 @@ Infisical currently supports two methods for connecting to Azure DevOps, which a + + + + Fill in the **Tenant ID**, **Client ID**, **Client Secret** and **Organization Name** fields with the Directory (Tenant) ID, Application (Client) ID, Client Secret and the organization name you obtained in the previous step. + + You can find the **Organization Name** on https://dev.azure.com/ + + ![Connect via Azure OAUth](/images/app-connections/azure/devops/create-client-secrets-method.png) + + + diff --git a/docs/integrations/app-connections/azure-key-vault.mdx b/docs/integrations/app-connections/azure-key-vault.mdx index 1847ec607..b14f559c1 100644 --- a/docs/integrations/app-connections/azure-key-vault.mdx +++ b/docs/integrations/app-connections/azure-key-vault.mdx @@ -89,21 +89,37 @@ Infisical currently only supports one method for connecting to Azure, which is O Select the **Azure Connection** option from the connection options modal. ![Select Azure Connection](/images/app-connections/azure/key-vault/select-connection.png) - - You can optionally authenticate against a specific tenant by providing the Azure Tenant or Directory ID. + + + + + + You can optionally authenticate against a specific tenant by providing the Azure Tenant or Directory ID. - Now select the **OAuth** method and click **Connect to Azure**. + Now select the **OAuth** method and click **Connect to Azure**. - ![Connect via Azure OAUth](/images/app-connections/azure/key-vault/create-oauth-method.png) + ![Connect via Azure OAUth](/images/app-connections/azure/key-vault/create-oauth-method.png) - + - - - You will then be redirected to Azure to grant Infisical access to your Azure account. Once granted, - you will redirect you back to Infisical's App Connections page. ![Azure Key Vault - Authorization](/images/app-connections/azure/grant-access.png) - + + + You will then be redirected to Azure to grant Infisical access to your Azure account. Once granted, + you will redirect you back to Infisical's App Connections page. ![Azure Key Vault + Authorization](/images/app-connections/azure/grant-access.png) + + + + + + + Fill in the **Tenant ID**, **Client ID**, **Client Secret** fields with the Directory (Tenant) ID, Application (Client) ID, Client Secret you obtained in the previous step. + ![Connect via Azure OAUth](/images/app-connections/azure/key-vault/create-client-secrets-method.png) + + + + + Your **Azure Key Vault Connection** is now available for use. ![Assume Role AWS Connection](/images/app-connections/azure/key-vault/oauth-connection.png) diff --git a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AzureAppConfigurationConnectionForm.tsx b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AzureAppConfigurationConnectionForm.tsx index c33541a24..cb0f955c8 100644 --- a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AzureAppConfigurationConnectionForm.tsx +++ b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AzureAppConfigurationConnectionForm.tsx @@ -209,7 +209,7 @@ export const AzureAppConfigurationConnectionForm = ({ appConnection, onSubmit }: tooltipText="The Azure Active Directory (Entra ID) Tenant ID." isError={Boolean(error?.message)} label="Tenant ID" - isOptional + isOptional={selectedMethod === AzureAppConfigurationConnectionMethod.OAuth} errorText={error?.message} > ; -type OnSubmitForm = z.infer; +type OnSubmitForm = z.infer | z.infer; type Props = { appConnection?: TAzureDevOpsConnection; diff --git a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AzureKeyVaultConnectionForm.tsx b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AzureKeyVaultConnectionForm.tsx index 8b811c200..ac1d3705c 100644 --- a/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AzureKeyVaultConnectionForm.tsx +++ b/frontend/src/pages/organization/AppConnections/AppConnectionsPage/components/AppConnectionForm/AzureKeyVaultConnectionForm.tsx @@ -211,7 +211,7 @@ export const AzureKeyVaultConnectionForm = ({ appConnection, onSubmit }: Props) tooltipText="The Azure Active Directory (Entra ID) Tenant ID." isError={Boolean(error?.message)} label="Tenant ID" - isOptional + isOptional={selectedMethod === AzureKeyVaultConnectionMethod.OAuth} errorText={error?.message} >