Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Communication] - Chat - Replaced ChatUserCredentialPolicy with BearerTokenAuthenticationPolicy #17452

Merged
merged 3 commits into from
Nov 19, 2020
Merged

[Communication] - Chat - Replaced ChatUserCredentialPolicy with BearerTokenAuthenticationPolicy #17452

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
7ff99e8
Replaced ChatUserCredentialPolicy with BearerTokenAuthenticationPolicy
jorge-beauregard Nov 10, 2020
b665cab
Removed ChatUserCredentialPolicy
jorge-beauregard Nov 10, 2020
77e3250
Added tests for CommunicationTokenCredential
jorge-beauregard Nov 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ...zure-communication-chat/src/main/java/com/azure/communication/chat/ChatClientBuilder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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;
Expand Down Expand Up @@ -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
*
Expand All @@ -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
*
Expand All @@ -166,9 +168,10 @@ public ChatAsyncClient buildAsyncClient() {
} else {
Objects.requireNonNull(communicationUserCredential);
Objects.requireNonNull(httpClient);
CommunicationTokenCredential tokenCredential = new CommunicationTokenCredential(communicationUserCredential);

pipeline = createHttpPipeline(httpClient,
new ChatUserCredentialPolicy(communicationUserCredential),
ankitarorabit marked this conversation as resolved.
Show resolved Hide resolved
new BearerTokenAuthenticationPolicy(tokenCredential, ""),
customPolicies);
}

Expand Down
32 changes: 32 additions & 0 deletions ...ion-common/src/main/java/com/azure/communication/common/CommunicationTokenCredential.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
// 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;

public class CommunicationTokenCredential implements TokenCredential {
private CommunicationUserCredential credential;

public CommunicationTokenCredential(CommunicationUserCredential communicationUserCrendential){
credential = communicationUserCrendential;
}

@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);
}
}
}