[Communication] - Chat - Replaced ChatUserCredentialPolicy with BearerTokenAuthenticationPolicy

sdk/communication/azure-communication-chat/src/main/java/com/azure/communication/chat/ChatClientBuilder.java

@@ -4,6 +4,7 @@
 package com.azure.communication.chat;
 
 import com.azure.communication.chat.implementation.AzureCommunicationChatServiceImplBuilder;
+import com.azure.communication.common.CommunicationTokenCredential;
 import com.azure.communication.common.CommunicationUserCredential;
 
 import java.util.ArrayList;
@@ -14,6 +15,7 @@
 import com.azure.core.http.HttpClient;
 import com.azure.core.http.HttpPipeline;
 import com.azure.core.http.HttpPipelineBuilder;
+import com.azure.core.http.policy.BearerTokenAuthenticationPolicy;
 import com.azure.core.http.policy.CookiePolicy;
 import com.azure.core.http.policy.HttpLogOptions;
 import com.azure.core.http.policy.HttpLoggingPolicy;
@@ -139,7 +141,7 @@ public ChatClientBuilder configuration(Configuration configuration) {
     }
 
     /**
-     * Create synchronous client applying ChatUserCredentialPolicy, UserAgentPolicy,
+     * Create synchronous client applying CommunicationTokenCredential, UserAgentPolicy,
      * RetryPolicy, and CookiePolicy.
      * Additional HttpPolicies specified by additionalPolicies will be applied after them
      *
@@ -151,7 +153,7 @@ public ChatClient buildClient() {
     }
 
     /**
-     * Create asynchronous client applying ChatUserCredentialPolicy, UserAgentPolicy,
+     * Create asynchronous client applying CommunicationTokenCredential, UserAgentPolicy,
      * RetryPolicy, and CookiePolicy.
      * Additional HttpPolicies specified by additionalPolicies will be applied after them
      *
@@ -166,9 +168,11 @@ public ChatAsyncClient buildAsyncClient() {
         } else {
             Objects.requireNonNull(communicationUserCredential);
             Objects.requireNonNull(httpClient);
+            CommunicationTokenCredential tokenCredential = 
+                new CommunicationTokenCredential(communicationUserCredential);
 
             pipeline = createHttpPipeline(httpClient,
-                new ChatUserCredentialPolicy(communicationUserCredential),
+                new BearerTokenAuthenticationPolicy(tokenCredential, ""),
                 customPolicies);
         }
 

sdk/communication/azure-communication-common/src/main/java/com/azure/communication/common/CommunicationTokenCredential.java

@@ -0,0 +1,41 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
+package com.azure.communication.common;
+
+import java.util.concurrent.ExecutionException;
+
+import com.azure.core.credential.AccessToken;
+import com.azure.core.credential.TokenCredential;
+import com.azure.core.credential.TokenRequestContext;
+
+import reactor.core.publisher.Mono;
+
+/**
+ * This class serves as a CommunicationUserCredential wrapper that 
+ * allows using BearerAuthenticationPolicy in different clients
+ */
+public class CommunicationTokenCredential implements TokenCredential {
+    private final CommunicationUserCredential credential;
+
+    /**
+     * Creates a CommunicationTokenCredential
+     *
+     * @param communicationUserCredential The {@link CommunicationUserCredential} to use 
+     * in the BearerAuthenticationPolicy.
+     */
+    public CommunicationTokenCredential(CommunicationUserCredential communicationUserCredential) {
+        credential = communicationUserCredential;
+    }
+
+    @Override
+    public Mono<AccessToken> getToken(TokenRequestContext request) {
+        try {
+            return Mono.just(credential.getToken().get());
+        } catch (InterruptedException ex) {
+            return Mono.error(ex);
+        } catch (ExecutionException ex) {
+            return Mono.error(ex);
+        }
+    }
+}

sdk/communication/azure-communication-common/src/test/java/com/azure/communication/common/CommunicationTokenCrendentialTests.java

@@ -0,0 +1,53 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+package com.azure.communication.common;
+
+import com.azure.communication.common.implementation.JwtTokenMocker;
+import com.azure.core.credential.AccessToken;
+import com.azure.core.credential.TokenRequestContext;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
+
+public class CommunicationTokenCrendentialTests {
+    private final JwtTokenMocker tokenMocker = new JwtTokenMocker();
+
+    public TokenRequestContext mockTokenRequestContext() {
+        String scope = "the scope value";
+        List<String> scopes = new ArrayList<>();
+        scopes.add(scope);
+        TokenRequestContext tokenRequestContext = new TokenRequestContext().setScopes(scopes);
+        return tokenRequestContext;
+    }
+    @Test
+    public void constructWithValidTokenWithoutFresher() throws InterruptedException, ExecutionException, IOException {
+        String tokenStr = tokenMocker.generateRawToken("resourceId", "userIdentity", 3 * 60);
+        CommunicationUserCredential userCredential = new CommunicationUserCredential(tokenStr);
+        CommunicationTokenCredential tokenCredential = new CommunicationTokenCredential(userCredential);
+
+        AccessToken token = tokenCredential.getToken(mockTokenRequestContext()).block();
+        assertFalse(token.isExpired(),
+                "Statically cached AccessToken should not expire when expiry is set to 3 minutes later");
+        assertEquals(tokenStr, token.getToken());
+        userCredential.close();
+    }
+
+    @Test
+    public void constructWithExpiredTokenWithoutRefresher() throws InterruptedException, ExecutionException, IOException {
+        String tokenStr = tokenMocker.generateRawToken("resourceId", "userIdentity", -3 * 60);
+        CommunicationUserCredential userCredential = new CommunicationUserCredential(tokenStr);
+        CommunicationTokenCredential tokenCredential = new CommunicationTokenCredential(userCredential);
+        AccessToken token = tokenCredential.getToken(mockTokenRequestContext()).block();
+        assertTrue(token.isExpired(),
+                "Statically cached AccessToken should expire when expiry is set to 3 minutes before");
+        userCredential.close();
+    }
+}