Caching OAuthClient

Author: tracyboehrer

libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java

@@ -124,6 +124,11 @@ public class BotFrameworkAdapter extends BotAdapter
      */
     private Map<String, ConnectorClient> connectorClients = new ConcurrentHashMap<>();
 
+    /**
+     * OAuthClient cache.
+     */
+    private Map<String, OAuthClient> oAuthClients = new ConcurrentHashMap<>();
+
     /**
      * Initializes a new instance of the {@link BotFrameworkAdapter} class, using a
      * credential provider.
@@ -1287,31 +1292,37 @@ protected CompletableFuture<OAuthClient> createOAuthClient(
         }
 
         String appId = getBotAppId(turnContext);
+        String cacheKey = appId + (oAuthAppCredentials != null ? oAuthAppCredentials.getAppId() : "");
         String oAuthScope = getBotFrameworkOAuthScope();
         AppCredentials credentials = oAuthAppCredentials != null
             ? oAuthAppCredentials
             : getAppCredentials(appId, oAuthScope).join();
 
-        OAuthClient oAuthClient = new RestOAuthClient(
-            OAuthClientConfig.emulateOAuthCards
-                ? turnContext.getActivity().getServiceUrl()
-                : OAuthClientConfig.OAUTHENDPOINT,
-            credentials
-        );
+        OAuthClient client = oAuthClients.computeIfAbsent(cacheKey, key -> {
+                OAuthClient oAuthClient = new RestOAuthClient(
+                    OAuthClientConfig.emulateOAuthCards
+                        ? turnContext.getActivity().getServiceUrl()
+                        : OAuthClientConfig.OAUTHENDPOINT,
+                    credentials
+                );
+
+                if (OAuthClientConfig.emulateOAuthCards) {
+                    // do not join task - we want this to run in the background.
+                    OAuthClientConfig
+                        .sendEmulateOAuthCards(oAuthClient, OAuthClientConfig.emulateOAuthCards);
+                }
+
+                return oAuthClient;
+            });
 
         // adding the oAuthClient into the TurnState
         // TokenResolver.cs will use it get the correct credentials to poll for
         // token for streaming scenario
-        turnContext.getTurnState().add(BotAdapter.OAUTH_CLIENT_KEY, oAuthClient);
-
-        if (OAuthClientConfig.emulateOAuthCards) {
-            // do not join task - we want this to run in the background.
-            return OAuthClientConfig
-                .sendEmulateOAuthCards(oAuthClient, OAuthClientConfig.emulateOAuthCards)
-                .thenApply(result -> oAuthClient);
+        if (turnContext.getTurnState().get(BotAdapter.OAUTH_CLIENT_KEY) == null) {
+            turnContext.getTurnState().add(BotAdapter.OAUTH_CLIENT_KEY, client);
         }
 
-        return CompletableFuture.completedFuture(oAuthClient);
+        return CompletableFuture.completedFuture(client);
     }
 
     /**

samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleAuthProvider.java

@@ -1,3 +1,6 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License.
+
 package com.microsoft.bot.sample.teamssearchauth;
 
 
@@ -14,7 +17,6 @@
 import java.util.List;
 
 public class SimpleGraphClient {
-
     private String token;
     public SimpleGraphClient(String token) {
         this.token = token;
@@ -34,18 +36,18 @@ public List<Message> searchMailInbox(String search) {
         return message.getCurrentPage().subList(0, 10);
     }
 
-    private IGraphServiceClient getAuthenticatedClient () {
-
+    private IGraphServiceClient getAuthenticatedClient() {
         // Create default logger to only log errors
         DefaultLogger logger = new DefaultLogger();
         logger.setLoggingLevel(LoggerLevel.ERROR);
 
-        SimpleAuthProvider authProvider = new SimpleAuthProvider(this.token);
         // Build a Graph client
         return GraphServiceClient.builder()
-            .authenticationProvider(authProvider)
+            .authenticationProvider(request -> {
+                // Add the access token in the Authorization header
+                request.addHeader("Authorization", "Bearer " + SimpleGraphClient.this.token);
+            })
             .logger(logger)
             .buildClient();
     }
-
 }