Add EnvVar AZURE_AUTHORITY_HOST (#9392)

Azure · Apr 2, 2020 · 6edef4f · 6edef4f
1 parent a1bef67
commit 6edef4f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 3 deletions.
diff --git a/sdk/core/azure-core/src/main/java/com/azure/core/util/Configuration.java b/sdk/core/azure-core/src/main/java/com/azure/core/util/Configuration.java
@@ -79,7 +79,12 @@ public class Configuration implements Cloneable {
      * Name of the Azure cloud to connect to.
      */
     public static final String PROPERTY_AZURE_CLOUD = "AZURE_CLOUD";
-
+
+    /**
+     * The Azure Active Directory endpoint to connect to.
+     */  
+    public static final String PROPERTY_AZURE_AUTHORITY_HOST = "AZURE_AUTHORITY_HOST";
+
     /**
      * Disables telemetry collection.
      */
@@ -124,6 +129,7 @@ public class Configuration implements Cloneable {
         PROPERTY_AZURE_TENANT_ID,
         PROPERTY_AZURE_RESOURCE_GROUP,
         PROPERTY_AZURE_CLOUD,
+        PROPERTY_AZURE_AUTHORITY_HOST,
         PROPERTY_AZURE_TELEMETRY_DISABLED,
         PROPERTY_AZURE_LOG_LEVEL,
         PROPERTY_AZURE_TRACING_DISABLED,

diff --git a/sdk/identity/azure-identity/pom.xml b/sdk/identity/azure-identity/pom.xml
@@ -27,7 +27,7 @@
     <dependency>
       <groupId>com.azure</groupId>
       <artifactId>azure-core</artifactId>
-      <version>1.3.0</version> <!-- {x-version-update;com.azure:azure-core;dependency} -->
+      <version>1.4.0-beta.1</version> <!-- {x-version-update;unreleased_com.azure:azure-core;dependency} -->
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>

diff --git a/...azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java b/...azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java
@@ -6,6 +6,7 @@
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.ProxyOptions;
+import com.azure.core.util.Configuration;
 import com.azure.identity.KnownAuthorityHosts;
 
 import java.time.Duration;
@@ -33,7 +34,8 @@ public final class IdentityClientOptions {
      * Creates an instance of IdentityClientOptions with default settings.
      */
     public IdentityClientOptions() {
-        authorityHost = KnownAuthorityHosts.AZURE_CLOUD;
+        Configuration configuration = Configuration.getGlobalConfiguration();
+        authorityHost = configuration.get(Configuration.PROPERTY_AZURE_AUTHORITY_HOST, KnownAuthorityHosts.AZURE_CLOUD);
         maxRetry = MAX_RETRY_DEFAULT_LIMIT;
         retryTimeout = i -> Duration.ofSeconds((long) Math.pow(2, i.getSeconds() - 1));
     }