changing token provider to be async

Author: siddhijain

src/integrationtest/java/com.microsoft.aad.msal4j/ConfidentialClientApplicationUnitT.java

@@ -29,6 +29,7 @@
 import java.security.*;
 import java.security.cert.CertificateException;
 import java.util.*;
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.Future;
 import java.util.function.Function;
 
@@ -362,7 +363,7 @@ public void validateAppTokenProviderAsync() throws Exception{
 
     }
 
-    private TokenProviderResult getAppTokenProviderResult(String differentScopesForAt)
+    private CompletableFuture<TokenProviderResult> getAppTokenProviderResult(String differentScopesForAt)
     {
         long currTimestampSec = new Date().getTime() / 1000;
         TokenProviderResult token = new TokenProviderResult();
@@ -371,7 +372,7 @@ private TokenProviderResult getAppTokenProviderResult(String differentScopesForA
         token.setExpiresInSeconds(currTimestampSec + 1000000);
         token.setRefreshInSeconds(currTimestampSec + 800000);
 
-        return token;
+        return CompletableFuture.completedFuture(token);
     }
 
     private SignedJWT createClientAssertion(String issuer) throws KeyStoreException, IOException, NoSuchAlgorithmException, CertificateException, UnrecoverableKeyException, NoSuchProviderException, JOSEException {

src/main/java/com/microsoft/aad/msal4j/AcquireTokenByAppProviderSupplier.java

@@ -3,6 +3,7 @@
 
 package com.microsoft.aad.msal4j;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutionException;
 
 class AcquireTokenByAppProviderSupplier extends AuthenticationResultSupplier {
@@ -53,12 +54,11 @@ AuthenticationResult execute() throws Exception {
         return authenticationResult;
     }
 
-    public AuthenticationResult fetchTokenUsingAppTokenProvider(AppTokenProviderParameters appTokenProviderParameters) {
+    public AuthenticationResult fetchTokenUsingAppTokenProvider(AppTokenProviderParameters appTokenProviderParameters) throws ExecutionException, InterruptedException {
 
-//        CompletableFuture<TokenProviderResult> completableFuture =
-//                CompletableFuture.supplyAsync(() -> this.clientCredentialRequest.appTokenProvider.apply(appTokenProviderParameters));
+        CompletableFuture<TokenProviderResult> completableFuture = this.clientCredentialRequest.appTokenProvider.apply(appTokenProviderParameters);
 
-        TokenProviderResult tokenProviderResult = this.clientCredentialRequest.appTokenProvider.apply(appTokenProviderParameters);
+        TokenProviderResult tokenProviderResult = completableFuture.get();
 
         validateTokenProviderResult(tokenProviderResult);
 

src/main/java/com/microsoft/aad/msal4j/ClientCredentialRequest.java

@@ -5,12 +5,13 @@
 
 import com.nimbusds.oauth2.sdk.ClientCredentialsGrant;
 
+import java.util.concurrent.CompletableFuture;
 import java.util.function.Function;
 
 class ClientCredentialRequest extends MsalRequest {
 
     ClientCredentialParameters parameters;
-    Function<AppTokenProviderParameters, TokenProviderResult> appTokenProvider;
+    Function<AppTokenProviderParameters, CompletableFuture<TokenProviderResult>> appTokenProvider;
 
     ClientCredentialRequest(ClientCredentialParameters parameters,
                             ConfidentialClientApplication application,
@@ -23,7 +24,7 @@ class ClientCredentialRequest extends MsalRequest {
     ClientCredentialRequest(ClientCredentialParameters parameters,
                             ConfidentialClientApplication application,
                             RequestContext requestContext,
-                            Function<AppTokenProviderParameters, TokenProviderResult> appTokenProvider) {
+                            Function<AppTokenProviderParameters, CompletableFuture<TokenProviderResult>> appTokenProvider) {
         super(application, createMsalGrant(parameters), requestContext);
         this.parameters = parameters;
         this.appTokenProvider = appTokenProvider;

src/main/java/com/microsoft/aad/msal4j/ConfidentialClientApplication.java

@@ -34,7 +34,7 @@ public class ConfidentialClientApplication extends AbstractClientApplicationBase
     private boolean clientCertAuthentication = false;
     private ClientCertificate clientCertificate;
 
-    public Function<AppTokenProviderParameters, TokenProviderResult> appTokenProvider;
+    public Function<AppTokenProviderParameters, CompletableFuture<TokenProviderResult>> appTokenProvider;
 
     @Accessors(fluent = true)
     @Getter
@@ -167,7 +167,7 @@ public static class Builder extends AbstractClientApplicationBase.Builder<Builde
 
         private boolean sendX5c = true;
 
-        private Function<AppTokenProviderParameters, TokenProviderResult> appTokenProvider;
+        private Function<AppTokenProviderParameters, CompletableFuture<TokenProviderResult>> appTokenProvider;
 
         private Builder(String clientId, IClientCredential clientCredential) {
             super(clientId);
@@ -196,7 +196,7 @@ public ConfidentialClientApplication.Builder sendX5c(boolean val) {
         /// </summary>
         /// <param name="appTokenProvider">Authentication callback which returns an access token.</param>
         /// <returns>The builder to chain the .With methods</returns>
-        public ConfidentialClientApplication.Builder appTokenProvider(Function<AppTokenProviderParameters, TokenProviderResult> appTokenProvider){
+        public ConfidentialClientApplication.Builder appTokenProvider(Function<AppTokenProviderParameters, CompletableFuture<TokenProviderResult>> appTokenProvider){
             if(appTokenProvider!=null){
                 this.appTokenProvider = appTokenProvider;
                 return self();