Identity credential Bug Fixes

sdk/identity/azure-identity/src/main/java/com/azure/identity/AadCredentialBuilderBase.java

@@ -3,6 +3,8 @@
 
 package com.azure.identity;
 
+import java.util.concurrent.ExecutorService;
+
 /**
  * The base class for credential builders that allow specifying a client ID and tenant ID for an Azure Active Directory.
  * @param <T> the type of the credential builder
@@ -14,7 +16,7 @@ public abstract class AadCredentialBuilderBase<T extends AadCredentialBuilderBas
     /**
      * Specifies the Azure Active Directory endpoint to acquire tokens.
      * @param authorityHost the Azure Active Directory endpoint
-     * @return itself
+     * @return An updated instance of this builder with the authority host set as specified.
      */
     @SuppressWarnings("unchecked")
     public T authorityHost(String authorityHost) {
@@ -26,7 +28,7 @@ public T authorityHost(String authorityHost) {
      * Sets the client ID of the application.
      *
      * @param clientId the client ID of the application.
-     * @return itself
+     * @return An updated instance of this builder with the client id set as specified.
      */
     @SuppressWarnings("unchecked")
     public T clientId(String clientId) {
@@ -38,11 +40,24 @@ public T clientId(String clientId) {
      * Sets the tenant ID of the application.
      *
      * @param tenantId the tenant ID of the application.
-     * @return itself
+     * @return An updated instance of this builder with the tenant id set as specified.
      */
     @SuppressWarnings("unchecked")
     public T tenantId(String tenantId) {
         this.tenantId = tenantId;
         return (T) this;
     }
+
+    /**
+     * Specifies the  ExecutorService to be used to execute the requests.
+     * Developer is responsible for maintaining the lifecycle of the ExecutorService.
+     *
+     * @param executorService the executor service to use for executing authentication requests.
+     * @return An updated instance of this builder with the executor service set as specified.
+     */
+    @SuppressWarnings("unchecked")
+    public T executorService(ExecutorService executorService) {
+        this.identityClientOptions.setExecutorService(executorService);
+        return (T) this;
+    }
 }

sdk/identity/azure-identity/src/main/java/com/azure/identity/DefaultAzureCredentialBuilder.java

@@ -3,12 +3,37 @@
 
 package com.azure.identity;
 
+import java.util.concurrent.ExecutorService;
+
 /**
  * Fluent credential builder for instantiating a {@link DefaultAzureCredential}.
  *
  * @see DefaultAzureCredential
  */
 public class DefaultAzureCredentialBuilder extends CredentialBuilderBase<DefaultAzureCredentialBuilder> {
+
+    /**
+     * Specifies the Azure Active Directory endpoint to acquire tokens.
+     * @param authorityHost the Azure Active Directory endpoint
+     * @return An updated instance of this builder with the authority host set as specified.
+     */
+    public DefaultAzureCredentialBuilder authorityHost(String authorityHost) {
+        this.identityClientOptions.setAuthorityHost(authorityHost);
+        return this;
+    }
+
+    /**
+     * Specifies the  ExecutorService to be used to execute the requests.
+     * Developer is responsible for maintaining the lifecycle of the ExecutorService.
+     *
+     * @param executorService the executor service to use for executing authentication requests.
+     * @return An updated instance of this builder with the executor service set as specified.
+     */
+    public DefaultAzureCredentialBuilder executorService(ExecutorService executorService) {
+        this.identityClientOptions.setExecutorService(executorService);
+        return this;
+    }
+
     /**
      * Creates new {@link DefaultAzureCredential} with the configured options set.
      *

sdk/identity/azure-identity/src/main/java/com/azure/identity/EnvironmentCredentialBuilder.java

@@ -3,6 +3,8 @@
 
 package com.azure.identity;
 
+import java.util.concurrent.ExecutorService;
+
 /**
  * Fluent credential builder for instantiating a {@link EnvironmentCredential}.
  *
@@ -12,13 +14,25 @@ public class EnvironmentCredentialBuilder extends CredentialBuilderBase<Environm
     /**
      * Specifies the Azure Active Directory endpoint to acquire tokens.
      * @param authorityHost the Azure Active Directory endpoint
-     * @return itself
+     * @return An updated instance of this builder with the authority host set as specified.
      */
     public EnvironmentCredentialBuilder authorityHost(String authorityHost) {
         this.identityClientOptions.setAuthorityHost(authorityHost);
         return this;
     }
 
+    /**
+     * Specifies the  ExecutorService to be used to execute the requests.
+     * Developer is responsible for maintaining the lifecycle of the ExecutorService.
+     *
+     * @param executorService the executor service to use for executing authentication requests.
+     * @return An updated instance of this builder with the executor service set as specified.
+     */
+    public EnvironmentCredentialBuilder executorService(ExecutorService executorService) {
+        this.identityClientOptions.setExecutorService(executorService);
+        return this;
+    }
+
     /**
      * Creates a new {@link EnvironmentCredential} with the current configurations.
      *

sdk/identity/azure-identity/src/main/java/com/azure/identity/SharedTokenCacheCredential.java

@@ -76,7 +76,12 @@ public Mono<AccessToken> getToken(TokenRequestContext request) {
         if (pubClient == null) {
             try {
                 PersistentTokenCacheAccessAspect accessAspect = new PersistentTokenCacheAccessAspect();
-                pubClient = PublicClientApplication.builder(this.clientId)
+                PublicClientApplication.Builder applicationBuilder =  PublicClientApplication.builder(this.clientId);
+                if (options.getExecutorService() != null) {
+                    applicationBuilder.executorService(options.getExecutorService());
+                }
+
+                pubClient = applicationBuilder
                     .authority(authorityUrl)
                     .setTokenCacheAccessAspect(accessAspect)
                     .build();

sdk/identity/azure-identity/src/main/java/com/azure/identity/SharedTokenCacheCredentialBuilder.java

@@ -18,7 +18,7 @@ public class SharedTokenCacheCredentialBuilder extends AadCredentialBuilderBase<
      * @param username The username for the account.
      *
      * @return The updated SharedTokenCacheCredentialBuilder object.
-     * */
+     */
     public SharedTokenCacheCredentialBuilder username(String username) {
         this.username = username;
         return this;

sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClient.java

@@ -119,6 +119,10 @@ public class IdentityClient {
                     publicClientApplicationBuilder.httpClient(httpPipelineAdapter);
                 }
             }
+
+            if (options.getExecutorService() != null) {
+                publicClientApplicationBuilder.executorService(options.getExecutorService());
+            }
             this.publicClientApplication = publicClientApplicationBuilder.build();
         }
     }
@@ -144,6 +148,10 @@ public Mono<AccessToken> authenticateWithClientSecret(String clientSecret, Token
                 applicationBuilder.proxy(proxyOptionsToJavaNetProxy(options.getProxyOptions()));
             }
 
+            if (options.getExecutorService() != null) {
+                applicationBuilder.executorService(options.getExecutorService());
+            }
+
             ConfidentialClientApplication application = applicationBuilder.build();
             return Mono.fromFuture(application.acquireToken(
                 ClientCredentialParameters.builder(new HashSet<>(request.getScopes()))
@@ -191,6 +199,10 @@ public Mono<AccessToken> authenticateWithPfxCertificate(String pfxCertificatePat
                 applicationBuilder.proxy(proxyOptionsToJavaNetProxy(options.getProxyOptions()));
             }
 
+            if (options.getExecutorService() != null) {
+                applicationBuilder.executorService(options.getExecutorService());
+            }
+
             return applicationBuilder.build();
         }).flatMap(application -> Mono.fromFuture(application.acquireToken(
                 ClientCredentialParameters.builder(new HashSet<>(request.getScopes())).build())))
@@ -222,6 +234,10 @@ public Mono<AccessToken> authenticateWithPemCertificate(String pemCertificatePat
                 applicationBuilder.proxy(proxyOptionsToJavaNetProxy(options.getProxyOptions()));
             }
 
+            if (options.getExecutorService() != null) {
+                applicationBuilder.executorService(options.getExecutorService());
+            }
+
             ConfidentialClientApplication application = applicationBuilder.build();
             return Mono.fromFuture(application.acquireToken(
                 ClientCredentialParameters.builder(new HashSet<>(request.getScopes()))

sdk/identity/azure-identity/src/main/java/com/azure/identity/implementation/IdentityClientOptions.java

@@ -8,6 +8,7 @@
 import com.azure.core.http.ProxyOptions;
 
 import java.time.Duration;
+import java.util.concurrent.ExecutorService;
 import java.util.function.Function;
 
 /**
@@ -22,6 +23,7 @@ public final class IdentityClientOptions {
     private Function<Duration, Duration> retryTimeout;
     private ProxyOptions proxyOptions;
     private HttpPipeline httpPipeline;
+    private ExecutorService executorService;
     private HttpClient httpClient;
 
     /**
@@ -125,6 +127,25 @@ public IdentityClientOptions setHttpPipeline(HttpPipeline httpPipeline) {
         return this;
     }
 
+    /**
+     * Specifies the  ExecutorService to be used to execute the requests.
+     * Developer is responsible for maintaining the lifecycle of the ExecutorService.
+     *
+     * @param executorService the executor service to use for executing authentication requests.
+     * @return IdentityClientOptions
+     */
+    public IdentityClientOptions setExecutorService(ExecutorService executorService) {
+        this.executorService = executorService;
+        return this;
+    }
+
+    /**
+     * @return the ExecutorService to execute authentication requests.
+     */
+    public ExecutorService getExecutorService() {
+        return executorService;
+    }
+
     /**
      * Specifies the HttpClient to send use for requests.
      * @param httpClient the http client to use for requests