From 3fb7fa45a364888085c2ac81832ed753da13510f Mon Sep 17 00:00:00 2001
From: Emilio Munoz <emmunozp@microsoft.com>
Date: Thu, 23 Apr 2020 04:01:53 -0700
Subject: [PATCH 1/7] Adding bot and graph search

---
 .../pom.xml                                   |  13 +-
 .../teamssearchauth/SimpleAuthProvider.java   |  22 +
 .../teamssearchauth/SimpleGraphClient.java    |  51 ++
 ...essagingExtensionsSearchAuthConfigBot.java | 472 ++++++++++++------
 .../main/resources/public/searchSettings.html |  54 ++
 5 files changed, 451 insertions(+), 161 deletions(-)
 create mode 100644 samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleAuthProvider.java
 create mode 100644 samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java
 create mode 100644 samples/52.teams-messaging-extensions-search-auth-config/src/main/resources/public/searchSettings.html

diff --git a/samples/52.teams-messaging-extensions-search-auth-config/pom.xml b/samples/52.teams-messaging-extensions-search-auth-config/pom.xml
index 4f9f9771a..383dcc517 100644
--- a/samples/52.teams-messaging-extensions-search-auth-config/pom.xml
+++ b/samples/52.teams-messaging-extensions-search-auth-config/pom.xml
@@ -48,6 +48,11 @@
     </properties>
 
     <dependencies>
+      <dependency>
+        <groupId>com.microsoft.graph</groupId>
+        <artifactId>microsoft-graph</artifactId>
+        <version>1.7.1</version>
+      </dependency>
       <dependency>
         <groupId>junit</groupId>
         <artifactId>junit</artifactId>
@@ -82,7 +87,13 @@
         <version>4.0.0-SNAPSHOT</version>
         <scope>compile</scope>
       </dependency>
-  </dependencies>
+      <dependency>
+        <groupId>org.json</groupId>
+        <artifactId>json</artifactId>
+        <version>20190722</version>
+        <scope>compile</scope>
+      </dependency>
+    </dependencies>
 
   <repositories>
     <repository>
diff --git a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleAuthProvider.java b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleAuthProvider.java
new file mode 100644
index 000000000..b2439758d
--- /dev/null
+++ b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleAuthProvider.java
@@ -0,0 +1,22 @@
+package com.microsoft.bot.sample.teamssearchauth;
+
+import com.microsoft.graph.authentication.IAuthenticationProvider;
+import com.microsoft.graph.http.IHttpRequest;
+
+/**
+ * SimpleAuthProvider
+ */
+public class SimpleAuthProvider implements IAuthenticationProvider {
+
+    private String accessToken;
+
+    public SimpleAuthProvider(String accessToken) {
+        this.accessToken = accessToken;
+    }
+
+    @Override
+    public void authenticateRequest(IHttpRequest request) {
+        // Add the access token in the Authorization header
+        request.addHeader("Authorization", "Bearer " + accessToken);
+    }
+}
diff --git a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java
new file mode 100644
index 000000000..2764b33f3
--- /dev/null
+++ b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java
@@ -0,0 +1,51 @@
+package com.microsoft.bot.sample.teamssearchauth;
+
+
+import com.microsoft.graph.logger.DefaultLogger;
+import com.microsoft.graph.logger.LoggerLevel;
+import com.microsoft.graph.models.extensions.Message;
+import com.microsoft.graph.options.Option;
+import com.microsoft.graph.options.QueryOption;
+import com.microsoft.graph.requests.extensions.GraphServiceClient;
+import com.microsoft.graph.models.extensions.IGraphServiceClient;
+import com.microsoft.graph.requests.extensions.IMessageCollectionPage;
+
+import java.util.LinkedList;
+import java.util.List;
+
+public class SimpleGraphClient {
+
+    private String token;
+    public SimpleGraphClient(String token) {
+        this.token = token;
+    }
+
+    public List<Message> searchMailInbox (String search) {
+        IGraphServiceClient client = getAuthenticatedClient();
+
+        final List<Option> options = new LinkedList<Option>();
+        options.add(new QueryOption("search", search));
+
+        IMessageCollectionPage message = client.me().messages()
+            .buildRequest(options)
+            .select("internetMessageHeaders")
+            .get();
+
+        return message.getCurrentPage().subList(0, 10);
+    }
+
+    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)
+            .logger(logger)
+            .buildClient();
+    }
+
+}
diff --git a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java
index fdc7cc3df..24b0e66a8 100644
--- a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java
+++ b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java
@@ -3,33 +3,28 @@
 
 package com.microsoft.bot.sample.teamssearchauth;
 
-import com.codepoetics.protonpack.collectors.CompletableFutures;
-import com.microsoft.bot.builder.BotFrameworkAdapter;
-import com.microsoft.bot.builder.MessageFactory;
+import com.microsoft.bot.builder.StatePropertyAccessor;
 import com.microsoft.bot.builder.TurnContext;
+import com.microsoft.bot.builder.UserState;
+import com.microsoft.bot.builder.UserTokenProvider;
 import com.microsoft.bot.builder.teams.TeamsActivityHandler;
-import com.microsoft.bot.builder.teams.TeamsInfo;
-import com.microsoft.bot.connector.authentication.MicrosoftAppCredentials;
 import com.microsoft.bot.integration.Configuration;
-import com.microsoft.bot.schema.ActionTypes;
-import com.microsoft.bot.schema.Activity;
-import com.microsoft.bot.schema.CardAction;
-import com.microsoft.bot.schema.ConversationParameters;
-import com.microsoft.bot.schema.ConversationReference;
-import com.microsoft.bot.schema.HeroCard;
-import com.microsoft.bot.schema.Mention;
-import com.microsoft.bot.schema.teams.TeamInfo;
-import com.microsoft.bot.schema.teams.TeamsChannelAccount;
+import com.microsoft.bot.schema.*;
+import com.microsoft.bot.schema.teams.*;
+import com.microsoft.graph.models.extensions.Message;
+import okhttp3.OkHttpClient;
+import okhttp3.Request;
+import okhttp3.Response;
 import org.apache.commons.lang3.StringUtils;
+import org.json.JSONArray;
+import org.json.JSONObject;
+import org.slf4j.LoggerFactory;
 import org.springframework.stereotype.Component;
 
-import java.net.URLEncoder;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.io.IOException;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
+import java.util.concurrent.CompletionException;
 
 /**
  * This class implements the functionality of the Bot.
@@ -43,170 +38,327 @@
 public class TeamsMessagingExtensionsSearchAuthConfigBot extends TeamsActivityHandler {
     private String appId;
     private String appPassword;
+    private String siteUrl;
+    private String connectionName;
+    private UserState userState;
+    private StatePropertyAccessor<String> userConfigProperty;
 
-    public TeamsMessagingExtensionsSearchAuthConfigBot(Configuration configuration) {
+    public TeamsMessagingExtensionsSearchAuthConfigBot(Configuration configuration, UserState userState) {
         appId = configuration.getProperty("MicrosoftAppId");
         appPassword = configuration.getProperty("MicrosoftAppPassword");
+        connectionName = configuration.getProperty("ConnectionName");
+        siteUrl = configuration.getProperty("SiteUrl");
+        userConfigProperty = userState.createProperty("UserConfiguration");
+        this.userState = userState;
     }
 
-    @Override
-    protected CompletableFuture<Void> onMessageActivity(TurnContext turnContext) {
-        turnContext.getActivity().removeRecipientMention();
-
-        switch (turnContext.getActivity().getText().trim()) {
-            case "MentionMe":
-                return mentionActivity(turnContext);
-
-            case "UpdateCardAction":
-                return updateCardActivity(turnContext);
-
-            case "Delete":
-                return deleteCardActivity(turnContext);
-
-            case "MessageAllMembers":
-                return messageAllMembers(turnContext);
-
-            default:
-                // This will come back deserialized as a Map.
-                Object value = new Object() {
-                    int count = 0;
-                };
-
-                HeroCard card = new HeroCard() {{
-                    setTitle("Welcome Card");
-                    setText("Click the buttons below to update this card");
-                    setButtons(Arrays.asList(
-                        new CardAction() {{
-                            setType(ActionTypes.MESSAGE_BACK);
-                            setTitle("Update Card");
-                            setText("UpdateCardAction");
-                            setValue(value);
-                        }},
-                        new CardAction() {{
-                            setType(ActionTypes.MESSAGE_BACK);
-                            setTitle("Message All Members");
-                            setText("MessageAllMembers");
-                        }}
-                    ));
-                }};
 
-                return turnContext.sendActivity(MessageFactory.attachment(card.toAttachment()))
-                    .thenApply(resourceResponse -> null);
-        }
+    @Override
+    public CompletableFuture<Void> onTurn(TurnContext turnContext) {
+        return super.onTurn(turnContext)
+        .thenCompose(saveResult -> userState.saveChanges(turnContext));
     }
 
     @Override
-    protected CompletableFuture<Void> onTeamsMembersAdded(
-        List<TeamsChannelAccount> membersAdded,
-        TeamInfo teamInfo,
-        TurnContext turnContext
-    ) {
-        return membersAdded.stream()
-            .filter(member -> !StringUtils.equals(member.getId(), turnContext.getActivity().getRecipient().getId()))
-            .map(channel -> turnContext.sendActivity(
-                MessageFactory.text("Welcome to the team " + channel.getGivenName() + " " + channel.getSurname() + ".")))
-            .collect(CompletableFutures.toFutureList())
-            .thenApply(resourceResponses -> null);
+    protected CompletableFuture<MessagingExtensionResponse> onTeamsMessagingExtensionConfigurationQuerySettingUrl(
+        TurnContext turnContext,
+        MessagingExtensionQuery query) {
+
+        return userConfigProperty.get(turnContext, ()-> "")
+            .thenApply(userConfigSettings -> {
+                String escapedSettings = "";
+                if (userConfigSettings != null &&
+                !userConfigSettings.isEmpty()) {
+                    escapedSettings = userConfigSettings;
+                }
+
+                String test = String.format(
+                    "%s/searchSettings.html?settings=",
+                    siteUrl);
+                return new MessagingExtensionResponse() {{
+                    setComposeExtension(new MessagingExtensionResult() {{
+                        setType("config");
+                        setSuggestedActions(new MessagingExtensionSuggestedAction() {{
+                            setActions(Arrays.asList(
+                                new CardAction() {{
+                                    setType(ActionTypes.OPEN_URL);
+                                    setValue(String.format(
+                                        "%s/searchSettings.html?settings=",
+                                        siteUrl));
+                                }}
+                            ));
+                        }});
+                    }});
+                }};
+            });
     }
 
-    private CompletableFuture<Void> deleteCardActivity(TurnContext turnContext) {
-        return turnContext.deleteActivity(turnContext.getActivity().getReplyToId());
+    @Override
+    protected CompletableFuture<Void> onTeamsMessagingExtensionConfigurationSetting(
+        TurnContext turnContext,
+        Object settings) {
+
+        Map<String, String> settingsData = (Map) settings;
+        String state = settingsData.get("state");
+        return userConfigProperty.set(turnContext, state);
     }
 
-    // If you encounter permission-related errors when sending this message, see
-    // https://aka.ms/BotTrustServiceUrl
-    private CompletableFuture<Void> messageAllMembers(TurnContext turnContext) {
-        String teamsChannelId = turnContext.getActivity().teamsGetChannelId();
-        String serviceUrl = turnContext.getActivity().getServiceUrl();
-        MicrosoftAppCredentials credentials = new MicrosoftAppCredentials(appId, appPassword);
-
-        return TeamsInfo.getMembers(turnContext)
-            .thenCompose(members -> {
-                List<CompletableFuture<Void>> conversations = new ArrayList<>();
-
-                // Send a message to each member.  These will all go out
-                // at the same time.
-                for (TeamsChannelAccount member : members) {
-                    Activity proactiveMessage = MessageFactory.text(
-                        "Hello " + member.getGivenName() + " " + member.getSurname()
-                            + ". I'm a Teams conversation bot.");
-
-                    ConversationParameters conversationParameters = new ConversationParameters() {{
-                       setIsGroup(false);
-                       setBot(turnContext.getActivity().getRecipient());
-                       setMembers(Collections.singletonList(member));
-                       setTenantId(turnContext.getActivity().getConversation().getTenantId());
-                    }};
-
-                    conversations.add(
-                        ((BotFrameworkAdapter) turnContext.getAdapter()).createConversation(
-                            teamsChannelId,
-                            serviceUrl,
-                            credentials,
-                            conversationParameters,
-                            (context) -> {
-                                ConversationReference reference = context.getActivity().getConversationReference();
-                                return context.getAdapter().continueConversation(
-                                    appId,
-                                    reference,
-                                    (inner_context) -> inner_context.sendActivity(proactiveMessage)
-                                        .thenApply(resourceResponse -> null)
-                                );
+    @Override
+    protected CompletableFuture<MessagingExtensionResponse> onTeamsMessagingExtensionQuery(
+        TurnContext turnContext,
+        MessagingExtensionQuery query) {
+
+//        UserTokenProvider tokenProvider = (UserTokenProvider) turnContext.getAdapter();
+//        CompletableFuture<TokenResponse> tokenResponse = tokenProvider.getUserToken(turnContext, connectionName, "");
+//        CompletableFuture<String> signInLink = tokenProvider.getOauthSignInLink(turnContext, connectionName);
+//
+//        return signInLink
+//            .thenApply(link -> {
+//           return new MessagingExtensionResponse() {{
+//               setComposeExtension(new MessagingExtensionResult() {{
+//                   setType("config");
+//                   setSuggestedActions(new MessagingExtensionSuggestedAction() {{
+//                       setActions(Arrays.asList(
+//                           new CardAction() {{
+//                               setType(ActionTypes.OPEN_URL);
+//                               setValue(signInLink);
+//                               setTitle("Bot Service Auth");
+//                           }}
+//                       ));
+//                   }});
+//               }});
+//           }};
+//       });
+
+        CompletableFuture<String> userConfigSettings = userConfigProperty.get(turnContext);
+
+        return userConfigSettings.
+            thenCompose(settings -> {
+                if ("email".toLowerCase().equals("email")) {
+                    String magicCode = "";
+                    String state = query.getState();
+                    if (state != null && !state.isEmpty()) {
+                        magicCode = state;
+                    }
+                    UserTokenProvider tokenProvider = (UserTokenProvider) turnContext.getAdapter();
+                    CompletableFuture<TokenResponse> tokenResponse = tokenProvider.getUserToken(turnContext, connectionName, magicCode);
+                    return tokenResponse.
+                        thenApply(
+                            response -> {
+                                if (response == null ||
+                                    response.getToken() == null ||
+                                    response.getToken().isEmpty()) {
+                                    CompletableFuture<String> signInLink = tokenProvider.getOauthSignInLink(turnContext, connectionName);
+
+                                    return signInLink
+                                        .thenApply(link -> new MessagingExtensionResponse() {{
+                                           setComposeExtension(new MessagingExtensionResult() {{
+                                               setType("config");
+                                               setSuggestedActions(new MessagingExtensionSuggestedAction() {{
+                                                   setActions(Arrays.asList(
+                                                       new CardAction() {{
+                                                           setType(ActionTypes.OPEN_URL);
+                                                           setValue(signInLink);
+                                                           setTitle("Bot Service Auth");
+                                                       }}
+                                                   ));
+                                               }});
+                                           }});
+                                       }});
+                                }
+                                String search = "";
+                                if (query.getParameters() != null && !query.getParameters().isEmpty()) {
+                                    search = (String) query.getParameters().get(0).getValue();
+                                }
+
+                                return searchMail(search, response.getToken());
                             }
-                        )
-                    );
+                        );
+                }
+
+                String search = "";
+                if (query.getParameters() != null && !query.getParameters().isEmpty()) {
+                    search = (String) query.getParameters().get(0).getValue();
                 }
 
-                return CompletableFuture.allOf(conversations.toArray(new CompletableFuture[0]));
-            })
-            // After all member messages are sent, send confirmation to the user.
-            .thenApply(conversations -> turnContext.sendActivity(MessageFactory.text("All messages have been sent.")))
-            .thenApply(allSent -> null);
+                return findPackages(search)
+                    .thenApply(packages -> {
+                        List<MessagingExtensionAttachment> attachments = new ArrayList<>();
+                        for (String[] item : packages) {
+                            ThumbnailCard previewCard = new ThumbnailCard() {{
+                                setTitle(item[0]);
+                                setTap(new CardAction() {{
+                                    setType(ActionTypes.INVOKE);
+                                    setValue(new JSONObject().put("data", item).toString());
+                                }});
+                            }};
+
+                            if (!StringUtils.isEmpty(item[4])) {
+                                previewCard.setImages(Collections.singletonList(new CardImage() {{
+                                    setUrl(item[4]);
+                                    setAlt("Icon");
+                                }}));
+                            }
+
+                            MessagingExtensionAttachment attachment = new MessagingExtensionAttachment() {{
+                                setContentType(HeroCard.CONTENTTYPE);
+                                setContent(new HeroCard() {{
+                                    setTitle(item[0]);
+                                }});
+                                setPreview(previewCard.toAttachment());
+                            }};
+
+                            attachments.add(attachment);
+                        }
+
+                        return new MessagingExtensionResult() {{
+                            setType("result");
+                            setAttachmentLayout("list");
+                            setAttachments(attachments);
+                        }};
+                    });
+
+            }).thenApply(result -> new MessagingExtensionResponse((MessagingExtensionResult) result));
     }
 
-    private CompletableFuture<Void> updateCardActivity(TurnContext turnContext) {
-        Map data = (Map) turnContext.getActivity().getValue();
-        data.put("count", (int) data.get("count") + 1);
-
-        HeroCard card = new HeroCard() {{
-            setTitle("Welcome Card");
-            setText("Update count - " + data.get("count"));
-            setButtons(Arrays.asList(
-                new CardAction() {{
-                    setType(ActionTypes.MESSAGE_BACK);
-                    setTitle("Update Card");
-                    setText("UpdateCardAction");
-                    setValue(data);
-                }},
-                new CardAction() {{
-                    setType(ActionTypes.MESSAGE_BACK);
-                    setTitle("Message All Members");
-                    setText("MessageAllMembers");
-                }},
-                new CardAction() {{
-                    setType(ActionTypes.MESSAGE_BACK);
-                    setTitle("Delete card");
-                    setText("Delete");
-                }}
-            ));
+    @Override
+    protected CompletableFuture<MessagingExtensionResponse> onTeamsMessagingExtensionSelectItem(
+        TurnContext turnContext,
+        Object query) {
+
+        Map cardValue = (Map) query;
+        List<String> data = (ArrayList) cardValue.get("data");
+        ThumbnailCard card = new ThumbnailCard() {{
+            setTitle(data.get(0));
+            setSubtitle(data.get(2));
+            setButtons(Arrays.asList(new CardAction() {{
+                setType(ActionTypes.OPEN_URL);
+                setTitle("Project");
+                setValue(data.get(3));
+            }}));
+        }};
+
+        if (!StringUtils.isEmpty(data.get(4))) {
+            card.setImages(Collections.singletonList(new CardImage() {{
+                setUrl(data.get(4));
+                setAlt("Icon");
+            }}));
+        }
+
+        MessagingExtensionAttachment attachment = new MessagingExtensionAttachment() {{
+            setContentType(ThumbnailCard.CONTENTTYPE);
+            setContent(card);
         }};
 
-        Activity updatedActivity = MessageFactory.attachment(card.toAttachment());
-        updatedActivity.setId(turnContext.getActivity().getReplyToId());
+        MessagingExtensionResult composeExtension = new MessagingExtensionResult() {{
+            setType("result");
+            setAttachmentLayout("list");
+            setAttachments(Collections.singletonList(attachment));
+        }};
+
+        return CompletableFuture.completedFuture(new MessagingExtensionResponse(composeExtension));
+    }
 
-        return turnContext.updateActivity(updatedActivity)
-            .thenApply(resourceResponse -> null);
+    @Override
+    protected CompletableFuture<MessagingExtensionActionResponse> onTeamsMessagingExtensionSubmitAction(
+        TurnContext turnContext,
+        MessagingExtensionAction action) {
+
+        return CompletableFuture.completedFuture(new MessagingExtensionActionResponse());
     }
 
-    private CompletableFuture<Void> mentionActivity(TurnContext turnContext) {
-        Mention mention = new Mention();
-        mention.setMentioned(turnContext.getActivity().getFrom());
-        mention.setText("<at>" + URLEncoder.encode(turnContext.getActivity().getFrom().getName()) + "</at>");
+    @Override
+    protected CompletableFuture<MessagingExtensionActionResponse> onTeamsMessagingExtensionFetchTask(
+        TurnContext turnContext,
+        MessagingExtensionAction action) {
+
+        if (action.getCommandId().toUpperCase().equals("SIGNOUTCOMMAND")) {
+            UserTokenProvider tokenProvider = (UserTokenProvider) turnContext.getAdapter();
+            return tokenProvider.signOutUser(turnContext,
+                connectionName,
+                turnContext.getActivity().getFrom().getId())
+                .thenApply(response -> new MessagingExtensionActionResponse(){{
+                    setTask(new TaskModuleContinueResponse(){{
+                        setValue(new TaskModuleTaskInfo(){{
+                            setCard(new Attachment());
+                            setHeight(200);
+                            setWidth(400);
+                            setTitle("Adaptive Card: Inputs");
+                        }});
+                    }});
+                }});
+        }
+        return notImplemented();
+    }
+
+    private MessagingExtensionResult searchMail(
+        String text,
+        String token) {
+        SimpleGraphClient graph = new SimpleGraphClient(token);
+        List<Message> messages = graph.searchMailInbox(text);
+
+        List<MessagingExtensionAttachment> attachments = new ArrayList<>();
+        for (Message msg: messages) {
+            attachments.add(new MessagingExtensionAttachment() {{
+                setContentType(HeroCard.CONTENTTYPE);
+                setContent(new HeroCard() {{
+                    setTitle(msg.from.emailAddress.address);
+                    setSubtitle(msg.subject);
+                    setText(msg.body.content);
+                }});
+                setPreview(new ThumbnailCard() {{
+                    setTitle(msg.from.emailAddress.address);
+                    setText(String.format("%s<br />%s", msg.subject, msg.bodyPreview));
+                    setImages(Arrays.asList(new CardImage() {{
+                        setUrl("https://raw.githubusercontent.com/microsoft/botbuilder-samples/master/docs/media/OutlookLogo.jpg");
+                        setAlt("Outlook logo");
+                    }}));
+                }}.toAttachment());
+            }});
+        }
+
+        return  new MessagingExtensionResult() {{
+                setType("result");
+                setAttachmentLayout("list");
+                setAttachments(attachments);
+        }};
+    }
+
+    private CompletableFuture<List<String[]>> findPackages(
+        String text) {
+        return CompletableFuture.supplyAsync(() -> {
+            OkHttpClient client = new OkHttpClient();
+            Request request = new Request.Builder()
+                .url(String
+                    .format(
+                        "https://azuresearch-usnc.nuget.org/query?q=id:%s&prerelease=true",
+                        text
+                    ))
+                .build();
+
+            List<String[]> filteredItems = new ArrayList<String[]>();
+            try {
+                Response response = client.newCall(request).execute();
+                JSONObject obj = new JSONObject(response.body().string());
+                JSONArray dataArray = (JSONArray) obj.get("data");
 
-        Activity replyActivity = MessageFactory.text("Hello " + mention.getText() + ".'");
-        replyActivity.setMentions(Collections.singletonList(mention));
+                dataArray.forEach(i -> {
+                    JSONObject item = (JSONObject) i;
+                    filteredItems.add(new String[]{
+                        item.getString("id"),
+                        item.getString("version"),
+                        item.getString("description"),
+                        item.has("projectUrl") ? item.getString("projectUrl") : "",
+                        item.has("iconUrl") ? item.getString("iconUrl") : ""
+                    });
+                });
 
-        return turnContext.sendActivity(replyActivity)
-            .thenApply(resourceResponse -> null);
+            } catch (IOException e) {
+                LoggerFactory.getLogger(TeamsMessagingExtensionsSearchAuthConfigBot.class)
+                    .error("findPackages", e);
+                throw new CompletionException(e);
+            }
+            return filteredItems;
+        });
     }
 }
diff --git a/samples/52.teams-messaging-extensions-search-auth-config/src/main/resources/public/searchSettings.html b/samples/52.teams-messaging-extensions-search-auth-config/src/main/resources/public/searchSettings.html
new file mode 100644
index 000000000..f2251ff6e
--- /dev/null
+++ b/samples/52.teams-messaging-extensions-search-auth-config/src/main/resources/public/searchSettings.html
@@ -0,0 +1,54 @@
+<html>
+<body>
+<form>
+    <fieldset>
+        <legend>What would you like to search?</legend>
+        <input type="radio" name="includeInSearch" value="nuget">Nuget<br>
+        <input type="radio" name="includeInSearch" value="email">Email (requires AAD Authentication)<br>
+    </fieldset>
+
+    <br />
+    <input type="button" onclick="onSubmit()" value="Save"> <br />
+</form>
+
+<script src='https://statics.teams.cdn.office.net/sdk/v1.5.2/js/MicrosoftTeams.min.js'></script>
+
+<script type="text/javascript">
+
+        document.addEventListener("DOMContentLoaded", function () {
+            var urlParams = new URLSearchParams(window.location.search);
+            var settings = urlParams.get('settings');
+            if (settings) {
+                var checkboxes = document.getElementsByName("includeInSearch");
+                for (var i = 0; i < checkboxes.length; i++) {
+                    var thisCheckbox = checkboxes[i];
+                    if (settings.includes(thisCheckbox.value)) {
+                        checkboxes[i].checked = true;
+                    }
+                }
+            }
+        });
+
+    </script>
+
+<script type="text/javascript">
+
+        microsoftTeams.initialize();
+
+        function onSubmit() {
+            var newSettings = [];
+
+            var checkboxes = document.getElementsByName("includeInSearch");
+
+            for (var i = 0; i < checkboxes.length; i++) {
+                if (checkboxes[i].checked) {
+                    newSettings.push(checkboxes[i].value);
+                }
+            }
+
+            microsoftTeams.authentication.notifySuccess(JSON.stringify(newSettings));
+        }
+
+    </script>
+</body>
+</html>

From 3bd8a73262410f5d2733ebcd5a1e1b6b2ee382af Mon Sep 17 00:00:00 2001
From: Emilio Munoz <emmunozp@microsoft.com>
Date: Thu, 23 Apr 2020 21:15:18 -0700
Subject: [PATCH 2/7] Debug Search Query get Sign in Url

---
 ...essagingExtensionsSearchAuthConfigBot.java | 217 +++++++++---------
 1 file changed, 108 insertions(+), 109 deletions(-)

diff --git a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java
index 24b0e66a8..8f3250cf6 100644
--- a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java
+++ b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java
@@ -108,117 +108,116 @@ protected CompletableFuture<MessagingExtensionResponse> onTeamsMessagingExtensio
         TurnContext turnContext,
         MessagingExtensionQuery query) {
 
-//        UserTokenProvider tokenProvider = (UserTokenProvider) turnContext.getAdapter();
-//        CompletableFuture<TokenResponse> tokenResponse = tokenProvider.getUserToken(turnContext, connectionName, "");
-//        CompletableFuture<String> signInLink = tokenProvider.getOauthSignInLink(turnContext, connectionName);
-//
-//        return signInLink
-//            .thenApply(link -> {
-//           return new MessagingExtensionResponse() {{
-//               setComposeExtension(new MessagingExtensionResult() {{
-//                   setType("config");
-//                   setSuggestedActions(new MessagingExtensionSuggestedAction() {{
-//                       setActions(Arrays.asList(
-//                           new CardAction() {{
-//                               setType(ActionTypes.OPEN_URL);
-//                               setValue(signInLink);
-//                               setTitle("Bot Service Auth");
-//                           }}
-//                       ));
-//                   }});
-//               }});
-//           }};
-//       });
-
-        CompletableFuture<String> userConfigSettings = userConfigProperty.get(turnContext);
-
-        return userConfigSettings.
-            thenCompose(settings -> {
-                if ("email".toLowerCase().equals("email")) {
-                    String magicCode = "";
-                    String state = query.getState();
-                    if (state != null && !state.isEmpty()) {
-                        magicCode = state;
-                    }
-                    UserTokenProvider tokenProvider = (UserTokenProvider) turnContext.getAdapter();
-                    CompletableFuture<TokenResponse> tokenResponse = tokenProvider.getUserToken(turnContext, connectionName, magicCode);
-                    return tokenResponse.
-                        thenApply(
-                            response -> {
-                                if (response == null ||
-                                    response.getToken() == null ||
-                                    response.getToken().isEmpty()) {
-                                    CompletableFuture<String> signInLink = tokenProvider.getOauthSignInLink(turnContext, connectionName);
-
-                                    return signInLink
-                                        .thenApply(link -> new MessagingExtensionResponse() {{
-                                           setComposeExtension(new MessagingExtensionResult() {{
-                                               setType("config");
-                                               setSuggestedActions(new MessagingExtensionSuggestedAction() {{
-                                                   setActions(Arrays.asList(
-                                                       new CardAction() {{
-                                                           setType(ActionTypes.OPEN_URL);
-                                                           setValue(signInLink);
-                                                           setTitle("Bot Service Auth");
-                                                       }}
-                                                   ));
-                                               }});
-                                           }});
-                                       }});
-                                }
-                                String search = "";
-                                if (query.getParameters() != null && !query.getParameters().isEmpty()) {
-                                    search = (String) query.getParameters().get(0).getValue();
-                                }
-
-                                return searchMail(search, response.getToken());
-                            }
-                        );
-                }
-
-                String search = "";
-                if (query.getParameters() != null && !query.getParameters().isEmpty()) {
-                    search = (String) query.getParameters().get(0).getValue();
-                }
+        UserTokenProvider tokenProvider = (UserTokenProvider) turnContext.getAdapter();
 
-                return findPackages(search)
-                    .thenApply(packages -> {
-                        List<MessagingExtensionAttachment> attachments = new ArrayList<>();
-                        for (String[] item : packages) {
-                            ThumbnailCard previewCard = new ThumbnailCard() {{
-                                setTitle(item[0]);
-                                setTap(new CardAction() {{
-                                    setType(ActionTypes.INVOKE);
-                                    setValue(new JSONObject().put("data", item).toString());
-                                }});
-                            }};
-
-                            if (!StringUtils.isEmpty(item[4])) {
-                                previewCard.setImages(Collections.singletonList(new CardImage() {{
-                                    setUrl(item[4]);
-                                    setAlt("Icon");
-                                }}));
-                            }
-
-                            MessagingExtensionAttachment attachment = new MessagingExtensionAttachment() {{
-                                setContentType(HeroCard.CONTENTTYPE);
-                                setContent(new HeroCard() {{
-                                    setTitle(item[0]);
-                                }});
-                                setPreview(previewCard.toAttachment());
-                            }};
-
-                            attachments.add(attachment);
-                        }
-
-                        return new MessagingExtensionResult() {{
-                            setType("result");
-                            setAttachmentLayout("list");
-                            setAttachments(attachments);
-                        }};
-                    });
+        TokenResponse tokenResponse = tokenProvider.getUserToken(turnContext, connectionName, "0").join();
+        return tokenProvider.getOauthSignInLink(turnContext, connectionName)
+            .thenApply(signInLink -> {
+                return new MessagingExtensionResponse() {{
+                    setComposeExtension(new MessagingExtensionResult() {{
+                        setType("config");
+                        setSuggestedActions(new MessagingExtensionSuggestedAction() {{
+                            setActions(Arrays.asList(
+                                new CardAction() {{
+                                    setType(ActionTypes.OPEN_URL);
+                                    setValue(signInLink);
+                                    setTitle("Bot Service Auth");
+                                }}
+                            ));
+                        }});
+                    }});
+                }};
+            });
 
-            }).thenApply(result -> new MessagingExtensionResponse((MessagingExtensionResult) result));
+//        CompletableFuture<String> userConfigSettings = userConfigProperty.get(turnContext);
+
+//        return userConfigSettings.
+//            thenCompose(settings -> {
+//                if ("email".toLowerCase().equals("email")) {
+//                    String magicCode = "";
+//                    String state = query.getState();
+//                    if (state != null && !state.isEmpty()) {
+//                        magicCode = state;
+//                    }
+//                    UserTokenProvider tokenProvider = (UserTokenProvider) turnContext.getAdapter();
+//                    CompletableFuture<TokenResponse> tokenResponse = tokenProvider.getUserToken(turnContext, connectionName, magicCode);
+//                    return tokenResponse.
+//                        thenApply(
+//                            response -> {
+//                                if (response == null ||
+//                                    response.getToken() == null ||
+//                                    response.getToken().isEmpty()) {
+//                                    CompletableFuture<String> signInLink = tokenProvider.getOauthSignInLink(turnContext, connectionName);
+//
+//                                    return signInLink
+//                                        .thenApply(link -> new MessagingExtensionResponse() {{
+//                                           setComposeExtension(new MessagingExtensionResult() {{
+//                                               setType("config");
+//                                               setSuggestedActions(new MessagingExtensionSuggestedAction() {{
+//                                                   setActions(Arrays.asList(
+//                                                       new CardAction() {{
+//                                                           setType(ActionTypes.OPEN_URL);
+//                                                           setValue(signInLink);
+//                                                           setTitle("Bot Service Auth");
+//                                                       }}
+//                                                   ));
+//                                               }});
+//                                           }});
+//                                       }});
+//                                }
+//                                String search = "";
+//                                if (query.getParameters() != null && !query.getParameters().isEmpty()) {
+//                                    search = (String) query.getParameters().get(0).getValue();
+//                                }
+//
+//                                return searchMail(search, response.getToken());
+//                            }
+//                        );
+//                }
+//
+//                String search = "";
+//                if (query.getParameters() != null && !query.getParameters().isEmpty()) {
+//                    search = (String) query.getParameters().get(0).getValue();
+//                }
+//
+//                return findPackages(search)
+//                    .thenApply(packages -> {
+//                        List<MessagingExtensionAttachment> attachments = new ArrayList<>();
+//                        for (String[] item : packages) {
+//                            ThumbnailCard previewCard = new ThumbnailCard() {{
+//                                setTitle(item[0]);
+//                                setTap(new CardAction() {{
+//                                    setType(ActionTypes.INVOKE);
+//                                    setValue(new JSONObject().put("data", item).toString());
+//                                }});
+//                            }};
+//
+//                            if (!StringUtils.isEmpty(item[4])) {
+//                                previewCard.setImages(Collections.singletonList(new CardImage() {{
+//                                    setUrl(item[4]);
+//                                    setAlt("Icon");
+//                                }}));
+//                            }
+//
+//                            MessagingExtensionAttachment attachment = new MessagingExtensionAttachment() {{
+//                                setContentType(HeroCard.CONTENTTYPE);
+//                                setContent(new HeroCard() {{
+//                                    setTitle(item[0]);
+//                                }});
+//                                setPreview(previewCard.toAttachment());
+//                            }};
+//
+//                            attachments.add(attachment);
+//                        }
+//
+//                        return new MessagingExtensionResult() {{
+//                            setType("result");
+//                            setAttachmentLayout("list");
+//                            setAttachments(attachments);
+//                        }};
+//                    });
+//
+//            }).thenApply(result -> new MessagingExtensionResponse((MessagingExtensionResult) result));
     }
 
     @Override

From a84bb9c854a0da1fd67fc2623040ae1774392360 Mon Sep 17 00:00:00 2001
From: tracyboehrer <tracyboehrer@users.noreply.github.com>
Date: Fri, 24 Apr 2020 15:25:44 -0500
Subject: [PATCH 3/7] Teams search-auth-config fixes

---
 .../microsoft/bot/schema/Serialization.java   |  12 +
 .../microsoft/bot/schema/ThumbnailCard.java   |  11 +-
 .../teams/MessagingExtensionResult.java       |  26 +-
 .../MessagingExtensionSuggestedAction.java    |  13 +-
 .../README.md                                 |  20 +-
 .../teamssearchauth/SimpleGraphClient.java    |   2 +-
 ...essagingExtensionsSearchAuthConfigBot.java | 399 +++++++++---------
 .../src/main/resources/adaptiveCard.json      |  18 +
 8 files changed, 279 insertions(+), 222 deletions(-)
 create mode 100644 samples/52.teams-messaging-extensions-search-auth-config/src/main/resources/adaptiveCard.json

diff --git a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/Serialization.java b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/Serialization.java
index fed295d79..a9e6fea9c 100644
--- a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/Serialization.java
+++ b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/Serialization.java
@@ -8,6 +8,7 @@
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.ObjectMapper;
 
+import java.io.IOException;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
 
@@ -105,4 +106,15 @@ public static <T> T convert(Object source, Class<T> toClass) {
     public static String toString(Object source) throws JsonProcessingException {
         return objectMapper.writeValueAsString(source);
     }
+
+    /**
+     * Parses a JSON document.
+     *
+     * @param json The JSON to parse.
+     * @return A JsonNode containg the node tree.
+     * @throws IOException Error parsing json.
+     */
+    public static JsonNode jsonToTree(String json) throws IOException {
+        return objectMapper.readTree(json);
+    }
 }
diff --git a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/ThumbnailCard.java b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/ThumbnailCard.java
index db98f4371..f65aa92c6 100644
--- a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/ThumbnailCard.java
+++ b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/ThumbnailCard.java
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -112,6 +113,14 @@ public void setImages(List<CardImage> withImages) {
         this.images = withImages;
     }
 
+    /**
+     * Sets the images list with a single image.
+     * @param image The image to set as the list.
+     */
+    public void setImage(CardImage image) {
+        setImages(Collections.singletonList(image));
+    }
+
     /**
      * Get the buttons value.
      *
@@ -150,7 +159,7 @@ public void setTap(CardAction withTap) {
 
     /**
      * Creates an @{link Attachment} for this card.
-     * 
+     *
      * @return An Attachment object containing the card.
      */
     public Attachment toAttachment() {
diff --git a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/MessagingExtensionResult.java b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/MessagingExtensionResult.java
index 2337d7ce9..4e27e7889 100644
--- a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/MessagingExtensionResult.java
+++ b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/MessagingExtensionResult.java
@@ -39,7 +39,7 @@ public class MessagingExtensionResult {
     /**
      * Gets hint for how to deal with multiple attachments. Possible values include:
      * 'list', 'grid'
-     * 
+     *
      * @return The attachment layout hint.
      */
     public String getAttachmentLayout() {
@@ -49,7 +49,7 @@ public String getAttachmentLayout() {
     /**
      * Sets hint for how to deal with multiple attachments. Possible values include:
      * 'list', 'grid'
-     * 
+     *
      * @param withAttachmentLayout The attachment layout hint.
      */
     public void setAttachmentLayout(String withAttachmentLayout) {
@@ -59,7 +59,7 @@ public void setAttachmentLayout(String withAttachmentLayout) {
     /**
      * Gets the type of the result. Possible values include: 'result', 'auth',
      * 'config', 'message', 'botMessagePreview'
-     * 
+     *
      * @return The result type.
      */
     public String getType() {
@@ -69,7 +69,7 @@ public String getType() {
     /**
      * Sets the type of the result. Possible values include: 'result', 'auth',
      * 'config', 'message', 'botMessagePreview'
-     * 
+     *
      * @param withType The result type.
      */
     public void setType(String withType) {
@@ -78,7 +78,7 @@ public void setType(String withType) {
 
     /**
      * Gets (Only when type is result) Attachments.
-     * 
+     *
      * @return The result attachments.
      */
     public List<MessagingExtensionAttachment> getAttachments() {
@@ -88,7 +88,7 @@ public List<MessagingExtensionAttachment> getAttachments() {
     /**
      * Sets (Only when type is result) Attachments. This replaces all previous
      * attachments on the object.
-     * 
+     *
      * @param withAttachments The result attachments.
      */
     public void setAttachments(List<MessagingExtensionAttachment> withAttachments) {
@@ -98,7 +98,7 @@ public void setAttachments(List<MessagingExtensionAttachment> withAttachments) {
     /**
      * Sets (Only when type is result) Attachments to the specific attachment. This
      * replaces all previous attachments on the object.
-     * 
+     *
      * @param withAttachment The attachment.
      */
     public void setAttachment(MessagingExtensionAttachment withAttachment) {
@@ -107,7 +107,7 @@ public void setAttachment(MessagingExtensionAttachment withAttachment) {
 
     /**
      * Gets (Only when type is auth or config) suggested actions.
-     * 
+     *
      * @return The suggested actions.
      */
     public MessagingExtensionSuggestedAction getSuggestedActions() {
@@ -116,7 +116,7 @@ public MessagingExtensionSuggestedAction getSuggestedActions() {
 
     /**
      * Sets (Only when type is auth or config) suggested actions.
-     * 
+     *
      * @param withSuggestedActions The suggested actions.
      */
     public void setSuggestedActions(MessagingExtensionSuggestedAction withSuggestedActions) {
@@ -125,7 +125,7 @@ public void setSuggestedActions(MessagingExtensionSuggestedAction withSuggestedA
 
     /**
      * Gets (Only when type is message) Text.
-     * 
+     *
      * @return The result text.
      */
     public String getText() {
@@ -134,7 +134,7 @@ public String getText() {
 
     /**
      * Sets (Only when type is message) Text.
-     * 
+     *
      * @param withText The result text.
      */
     public void setText(String withText) {
@@ -143,7 +143,7 @@ public void setText(String withText) {
 
     /**
      * Gets (Only when type is botMessagePreview) Message activity.
-     * 
+     *
      * @return The preview Activity.
      */
     public Activity getActivityPreview() {
@@ -152,7 +152,7 @@ public Activity getActivityPreview() {
 
     /**
      * Sets (Only when type is botMessagePreview) Message activity.
-     * 
+     *
      * @param withActivityPreview The preview Activity.
      */
     public void setActivityPreview(Activity withActivityPreview) {
diff --git a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/MessagingExtensionSuggestedAction.java b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/MessagingExtensionSuggestedAction.java
index d0af928bc..d56b7f313 100644
--- a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/MessagingExtensionSuggestedAction.java
+++ b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/MessagingExtensionSuggestedAction.java
@@ -7,6 +7,7 @@
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.bot.schema.CardAction;
 
+import java.util.Collections;
 import java.util.List;
 
 /**
@@ -19,7 +20,7 @@ public class MessagingExtensionSuggestedAction {
 
     /**
      * Gets the actions.
-     * 
+     *
      * @return The list of CardActions.
      */
     public List<CardAction> getActions() {
@@ -28,10 +29,18 @@ public List<CardAction> getActions() {
 
     /**
      * Sets the actions.
-     * 
+     *
      * @param withActions The list of CardActions.
      */
     public void setActions(List<CardAction> withActions) {
         actions = withActions;
     }
+
+    /**
+     * Sets the list of actions to a single specified CardAction.
+     * @param action The CardAction
+     */
+    public void setAction(CardAction action) {
+        setActions(Collections.singletonList(action));
+    }
 }
diff --git a/samples/52.teams-messaging-extensions-search-auth-config/README.md b/samples/52.teams-messaging-extensions-search-auth-config/README.md
index 7dad1bf68..d68d599e5 100644
--- a/samples/52.teams-messaging-extensions-search-auth-config/README.md
+++ b/samples/52.teams-messaging-extensions-search-auth-config/README.md
@@ -32,8 +32,10 @@ the Teams service needs to call into the bot.
     - Use the current `https` URL you were given by running ngrok. Append with the path `/api/messages` used by this sample
     - Ensure that you've [enabled the Teams Channel](https://docs.microsoft.com/en-us/azure/bot-service/channel-connect-teams?view=azure-bot-service-4.0)
     - __*If you don't have an Azure account*__ you can use this [Bot Framework registration](https://docs.microsoft.com/en-us/microsoftteams/platform/bots/how-to/create-a-bot-for-teams#register-your-web-service-with-the-bot-framework)
+    
+1) [Add Authentication to your bot via Azure Bot Service](https://docs.microsoft.com/en-us/azure/bot-service/bot-builder-authentication?view=azure-bot-service-4.0&tabs=csharp)
 
-1) Update the `resources/application.properties` configuration for the bot to use the Microsoft App Id and App Password from the Bot Framework registration. (Note the App Password is referred to as the "client secret" in the azure portal and you can always create a new client secret anytime.)
+1) Update the `resources/application.properties` configuration for the bot to use the `MicrosoftAppId`, `MicrosfotAppPassword`, `ConnectionName`, and `SiteUrl` from the Bot Framework registration. (Note the App Password is referred to as the "client secret" in the azure portal and you can always create a new client secret anytime.)
 
 1) __*This step is specific to Teams.*__
     - **Edit** the `manifest.json` contained in the  `teamsAppManifest` folder to replace your Microsoft App Id (that was created when you registered your bot earlier) *everywhere* you see the place holder string `<<YOUR-MICROSOFT-APP-ID>>` (depending on the scenario the Microsoft App Id may occur multiple times in the `manifest.json`)
@@ -46,21 +48,9 @@ the Teams service needs to call into the bot.
     - Run it by using `java -jar .\target\bot-teams-messaging-extensions-search-auth-config-sample.jar`
 
 
-## Interacting with the bot
+## Interacting with the bot in Teams
 
-You can interact with this bot by sending it a message, or selecting a command from the command list. The bot will respond to the following strings.
-
-1. **Show Welcome**
-  - **Result:** The bot will send the welcome card for you to interact with
-  - **Valid Scopes:** personal, group chat, team chat
-2. **MentionMe**
-  - **Result:** The bot will respond to the message and mention the user
-  - **Valid Scopes:** personal, group chat, team chat
-3. **MessageAllMembers**
-  - **Result:** The bot will send a 1-on-1 message to each member in the current conversation (aka on the conversation's roster).
-  - **Valid Scopes:** personal, group chat, team chat
-
-You can select an option from the command list by typing ```@TeamsConversationBot``` into the compose message area and ```What can I do?``` text above the compose area.
+Once the Messaging Extension is installed, click the icon for **Config Auth Search** in the Compose Box's Messaging Extension menu to display the search window.  Left click to choose **Settings** and view the Config page.
 
 ### Avoiding Permission-Related Errors
 
diff --git a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java
index 2764b33f3..8bf3b4868 100644
--- a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java
+++ b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java
@@ -20,7 +20,7 @@ public SimpleGraphClient(String token) {
         this.token = token;
     }
 
-    public List<Message> searchMailInbox (String search) {
+    public List<Message> searchMailInbox(String search) {
         IGraphServiceClient client = getAuthenticatedClient();
 
         final List<Option> options = new LinkedList<Option>();
diff --git a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java
index 8f3250cf6..0f9b14d4c 100644
--- a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java
+++ b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java
@@ -8,13 +8,20 @@
 import com.microsoft.bot.builder.UserState;
 import com.microsoft.bot.builder.UserTokenProvider;
 import com.microsoft.bot.builder.teams.TeamsActivityHandler;
+import com.microsoft.bot.connector.ExecutorFactory;
 import com.microsoft.bot.integration.Configuration;
 import com.microsoft.bot.schema.*;
 import com.microsoft.bot.schema.teams.*;
 import com.microsoft.graph.models.extensions.Message;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
+import java.util.concurrent.atomic.AtomicReference;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
+import org.apache.commons.io.IOUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.json.JSONArray;
 import org.json.JSONObject;
@@ -29,13 +36,15 @@
 /**
  * This class implements the functionality of the Bot.
  *
- * <p>This is where application specific logic for interacting with the users would be
- * added.  For this sample, the {@link #onMessageActivity(TurnContext)} echos the text
- * back to the user.  The {@link #onMembersAdded(List, TurnContext)} will send a greeting
- * to new conversation participants.</p>
+ * <p>
+ * This is where application specific logic for interacting with the users would be added. For this
+ * sample, the {@link #onMessageActivity(TurnContext)} echos the text back to the user. The {@link
+ * #onMembersAdded(List, TurnContext)} will send a greeting to new conversation participants.
+ * </p>
  */
 @Component
 public class TeamsMessagingExtensionsSearchAuthConfigBot extends TeamsActivityHandler {
+
     private String appId;
     private String appPassword;
     private String siteUrl;
@@ -43,7 +52,10 @@ public class TeamsMessagingExtensionsSearchAuthConfigBot extends TeamsActivityHa
     private UserState userState;
     private StatePropertyAccessor<String> userConfigProperty;
 
-    public TeamsMessagingExtensionsSearchAuthConfigBot(Configuration configuration, UserState userState) {
+    public TeamsMessagingExtensionsSearchAuthConfigBot(
+        Configuration configuration,
+        UserState userState
+    ) {
         appId = configuration.getProperty("MicrosoftAppId");
         appPassword = configuration.getProperty("MicrosoftAppPassword");
         connectionName = configuration.getProperty("ConnectionName");
@@ -52,179 +64,167 @@ public TeamsMessagingExtensionsSearchAuthConfigBot(Configuration configuration,
         this.userState = userState;
     }
 
-
     @Override
     public CompletableFuture<Void> onTurn(TurnContext turnContext) {
         return super.onTurn(turnContext)
-        .thenCompose(saveResult -> userState.saveChanges(turnContext));
+            .thenCompose(saveResult -> userState.saveChanges(turnContext));
     }
 
     @Override
     protected CompletableFuture<MessagingExtensionResponse> onTeamsMessagingExtensionConfigurationQuerySettingUrl(
         TurnContext turnContext,
-        MessagingExtensionQuery query) {
-
-        return userConfigProperty.get(turnContext, ()-> "")
-            .thenApply(userConfigSettings -> {
-                String escapedSettings = "";
-                if (userConfigSettings != null &&
-                !userConfigSettings.isEmpty()) {
-                    escapedSettings = userConfigSettings;
+        MessagingExtensionQuery query
+    ) {
+        return userConfigProperty.get(turnContext, () -> "").thenApply(userConfigSettings -> {
+            AtomicReference<String> escapedSettings = new AtomicReference<>("");
+            if (!StringUtils.isEmpty(userConfigSettings)) {
+                try {
+                    escapedSettings.set(
+                        URLEncoder.encode(userConfigSettings, StandardCharsets.UTF_8.toString()));
+                } catch (UnsupportedEncodingException e) {
+                    escapedSettings.set(userConfigSettings);
                 }
+            }
 
-                String test = String.format(
-                    "%s/searchSettings.html?settings=",
-                    siteUrl);
-                return new MessagingExtensionResponse() {{
-                    setComposeExtension(new MessagingExtensionResult() {{
-                        setType("config");
-                        setSuggestedActions(new MessagingExtensionSuggestedAction() {{
-                            setActions(Arrays.asList(
-                                new CardAction() {{
-                                    setType(ActionTypes.OPEN_URL);
-                                    setValue(String.format(
-                                        "%s/searchSettings.html?settings=",
-                                        siteUrl));
-                                }}
-                            ));
-                        }});
+            return new MessagingExtensionResponse(new MessagingExtensionResult() {{
+                setType("config");
+                setSuggestedActions(new MessagingExtensionSuggestedAction() {{
+                    setAction(new CardAction() {{
+                        setType(ActionTypes.OPEN_URL);
+                        setValue(String.format("%s/searchSettings.html?settings=%s",
+                            siteUrl, escapedSettings.get()));
                     }});
-                }};
-            });
+                }});
+            }});
+        });
     }
 
     @Override
     protected CompletableFuture<Void> onTeamsMessagingExtensionConfigurationSetting(
         TurnContext turnContext,
-        Object settings) {
+        Object settings
+    ) {
+        if (settings != null) {
+            Map<String, String> settingsData = (Map<String, String>) settings;
+            String state = settingsData.get("state");
+            return userConfigProperty.set(turnContext, state);
+        }
 
-        Map<String, String> settingsData = (Map) settings;
-        String state = settingsData.get("state");
-        return userConfigProperty.set(turnContext, state);
+        return CompletableFuture.completedFuture(null);
     }
 
     @Override
     protected CompletableFuture<MessagingExtensionResponse> onTeamsMessagingExtensionQuery(
         TurnContext turnContext,
-        MessagingExtensionQuery query) {
+        MessagingExtensionQuery query
+    ) {
+        return userConfigProperty.get(turnContext)
+            .thenCompose(settings -> {
+                if (settings != null && settings.toLowerCase().contains("email")) {
+                    return emailExtensionQuery(turnContext, query);
+                }
 
-        UserTokenProvider tokenProvider = (UserTokenProvider) turnContext.getAdapter();
+                return packageExtensionQuery(query);
+            });
+    }
+
+    private CompletableFuture<MessagingExtensionResponse> packageExtensionQuery(
+        MessagingExtensionQuery query
+    ) {
+        String search = "";
+        if (query.getParameters() != null && !query.getParameters().isEmpty()) {
+            search = (String) query.getParameters().get(0).getValue();
+        }
 
-        TokenResponse tokenResponse = tokenProvider.getUserToken(turnContext, connectionName, "0").join();
-        return tokenProvider.getOauthSignInLink(turnContext, connectionName)
-            .thenApply(signInLink -> {
-                return new MessagingExtensionResponse() {{
-                    setComposeExtension(new MessagingExtensionResult() {{
-                        setType("config");
-                        setSuggestedActions(new MessagingExtensionSuggestedAction() {{
-                            setActions(Arrays.asList(
-                                new CardAction() {{
-                                    setType(ActionTypes.OPEN_URL);
-                                    setValue(signInLink);
-                                    setTitle("Bot Service Auth");
-                                }}
-                            ));
-                        }});
+        return findPackages(search).thenApply(packages -> {
+            List<MessagingExtensionAttachment> attachments = new ArrayList<>();
+            for (String[] item : packages) {
+                ThumbnailCard previewCard = new ThumbnailCard() {{
+                    setTitle(item[0]);
+                    setTap(new CardAction() {{
+                        setType(ActionTypes.INVOKE);
+                        setValue(new JSONObject().put("data", item).toString());
                     }});
                 }};
-            });
 
-//        CompletableFuture<String> userConfigSettings = userConfigProperty.get(turnContext);
-
-//        return userConfigSettings.
-//            thenCompose(settings -> {
-//                if ("email".toLowerCase().equals("email")) {
-//                    String magicCode = "";
-//                    String state = query.getState();
-//                    if (state != null && !state.isEmpty()) {
-//                        magicCode = state;
-//                    }
-//                    UserTokenProvider tokenProvider = (UserTokenProvider) turnContext.getAdapter();
-//                    CompletableFuture<TokenResponse> tokenResponse = tokenProvider.getUserToken(turnContext, connectionName, magicCode);
-//                    return tokenResponse.
-//                        thenApply(
-//                            response -> {
-//                                if (response == null ||
-//                                    response.getToken() == null ||
-//                                    response.getToken().isEmpty()) {
-//                                    CompletableFuture<String> signInLink = tokenProvider.getOauthSignInLink(turnContext, connectionName);
-//
-//                                    return signInLink
-//                                        .thenApply(link -> new MessagingExtensionResponse() {{
-//                                           setComposeExtension(new MessagingExtensionResult() {{
-//                                               setType("config");
-//                                               setSuggestedActions(new MessagingExtensionSuggestedAction() {{
-//                                                   setActions(Arrays.asList(
-//                                                       new CardAction() {{
-//                                                           setType(ActionTypes.OPEN_URL);
-//                                                           setValue(signInLink);
-//                                                           setTitle("Bot Service Auth");
-//                                                       }}
-//                                                   ));
-//                                               }});
-//                                           }});
-//                                       }});
-//                                }
-//                                String search = "";
-//                                if (query.getParameters() != null && !query.getParameters().isEmpty()) {
-//                                    search = (String) query.getParameters().get(0).getValue();
-//                                }
-//
-//                                return searchMail(search, response.getToken());
-//                            }
-//                        );
-//                }
-//
-//                String search = "";
-//                if (query.getParameters() != null && !query.getParameters().isEmpty()) {
-//                    search = (String) query.getParameters().get(0).getValue();
-//                }
-//
-//                return findPackages(search)
-//                    .thenApply(packages -> {
-//                        List<MessagingExtensionAttachment> attachments = new ArrayList<>();
-//                        for (String[] item : packages) {
-//                            ThumbnailCard previewCard = new ThumbnailCard() {{
-//                                setTitle(item[0]);
-//                                setTap(new CardAction() {{
-//                                    setType(ActionTypes.INVOKE);
-//                                    setValue(new JSONObject().put("data", item).toString());
-//                                }});
-//                            }};
-//
-//                            if (!StringUtils.isEmpty(item[4])) {
-//                                previewCard.setImages(Collections.singletonList(new CardImage() {{
-//                                    setUrl(item[4]);
-//                                    setAlt("Icon");
-//                                }}));
-//                            }
-//
-//                            MessagingExtensionAttachment attachment = new MessagingExtensionAttachment() {{
-//                                setContentType(HeroCard.CONTENTTYPE);
-//                                setContent(new HeroCard() {{
-//                                    setTitle(item[0]);
-//                                }});
-//                                setPreview(previewCard.toAttachment());
-//                            }};
-//
-//                            attachments.add(attachment);
-//                        }
-//
-//                        return new MessagingExtensionResult() {{
-//                            setType("result");
-//                            setAttachmentLayout("list");
-//                            setAttachments(attachments);
-//                        }};
-//                    });
-//
-//            }).thenApply(result -> new MessagingExtensionResponse((MessagingExtensionResult) result));
+                if (!StringUtils.isEmpty(item[4])) {
+                    previewCard.setImage(new CardImage() {{
+                        setUrl(item[4]);
+                        setAlt("Icon");
+                    }});
+                }
+
+                MessagingExtensionAttachment attachment = new MessagingExtensionAttachment() {{
+                    setContentType(HeroCard.CONTENTTYPE);
+                    setContent(new HeroCard() {{
+                        setTitle(item[0]);
+                    }});
+                    setPreview(previewCard.toAttachment());
+                }};
+
+                attachments.add(attachment);
+            }
+
+            return new MessagingExtensionResponse(new MessagingExtensionResult() {{
+                setType("result");
+                setAttachmentLayout("list");
+                setAttachments(attachments);
+            }});
+        });
+    }
+
+    private CompletableFuture<MessagingExtensionResponse> emailExtensionQuery(
+        TurnContext turnContext,
+        MessagingExtensionQuery query
+    ) {
+        // When the Bot Service Auth flow completes, the action.State will contain a
+        // magic code used for verification.
+        String magicCode = "";
+        String state = query.getState();
+        if (state != null && !state.isEmpty()) {
+            magicCode = state;
+        }
+
+        UserTokenProvider tokenProvider = (UserTokenProvider) turnContext.getAdapter();
+        return tokenProvider.getUserToken(turnContext, connectionName, magicCode)
+            .thenApply(response -> {
+                if (response == null || StringUtils.isEmpty(response.getToken())) {
+                    // There is no token, so the user has not signed in yet.
+                    String link = tokenProvider.getOauthSignInLink(turnContext, connectionName).join();
+                        //.thenApply(link -> {
+                            return new MessagingExtensionResponse() {{
+                                setComposeExtension(new MessagingExtensionResult() {{
+                                    setType("auth");
+                                    setSuggestedActions(
+                                        new MessagingExtensionSuggestedAction() {{
+                                            setAction(
+                                                new CardAction() {{
+                                                    setType(ActionTypes.OPEN_URL);
+                                                    setValue(link);
+                                                    setTitle("Bot Service OAuth");
+                                                }}
+                                            );
+                                        }}
+                                    );
+                                }});
+                            }};
+                        //});
+                }
+
+                String search = "";
+                if (query.getParameters() != null && !query.getParameters().isEmpty()) {
+                    search = (String) query.getParameters().get(0).getValue();
+                }
+
+                return new MessagingExtensionResponse(searchMail(search, response.getToken()));
+            });
     }
 
     @Override
     protected CompletableFuture<MessagingExtensionResponse> onTeamsMessagingExtensionSelectItem(
         TurnContext turnContext,
-        Object query) {
-
+        Object query
+    ) {
         Map cardValue = (Map) query;
         List<String> data = (ArrayList) cardValue.get("data");
         ThumbnailCard card = new ThumbnailCard() {{
@@ -238,10 +238,10 @@ protected CompletableFuture<MessagingExtensionResponse> onTeamsMessagingExtensio
         }};
 
         if (!StringUtils.isEmpty(data.get(4))) {
-            card.setImages(Collections.singletonList(new CardImage() {{
+            card.setImage(new CardImage() {{
                 setUrl(data.get(4));
                 setAlt("Icon");
-            }}));
+            }});
         }
 
         MessagingExtensionAttachment attachment = new MessagingExtensionAttachment() {{
@@ -261,43 +261,61 @@ protected CompletableFuture<MessagingExtensionResponse> onTeamsMessagingExtensio
     @Override
     protected CompletableFuture<MessagingExtensionActionResponse> onTeamsMessagingExtensionSubmitAction(
         TurnContext turnContext,
-        MessagingExtensionAction action) {
-
+        MessagingExtensionAction action
+    ) {
         return CompletableFuture.completedFuture(new MessagingExtensionActionResponse());
     }
 
     @Override
     protected CompletableFuture<MessagingExtensionActionResponse> onTeamsMessagingExtensionFetchTask(
         TurnContext turnContext,
-        MessagingExtensionAction action) {
-
+        MessagingExtensionAction action
+    ) {
         if (action.getCommandId().toUpperCase().equals("SIGNOUTCOMMAND")) {
             UserTokenProvider tokenProvider = (UserTokenProvider) turnContext.getAdapter();
-            return tokenProvider.signOutUser(turnContext,
+            return tokenProvider.signOutUser(
+                turnContext,
                 connectionName,
-                turnContext.getActivity().getFrom().getId())
-                .thenApply(response -> new MessagingExtensionActionResponse(){{
-                    setTask(new TaskModuleContinueResponse(){{
-                        setValue(new TaskModuleTaskInfo(){{
-                            setCard(new Attachment());
-                            setHeight(200);
-                            setWidth(400);
-                            setTitle("Adaptive Card: Inputs");
-                        }});
+                turnContext.getActivity().getFrom().getId()
+            ).thenApply(response -> new MessagingExtensionActionResponse() {{
+                setTask(new TaskModuleContinueResponse() {{
+                    setValue(new TaskModuleTaskInfo() {{
+                        setCard(createAdaptiveCardAttachment());
+                        setHeight(200);
+                        setWidth(400);
+                        setTitle("Adaptive Card: Inputs");
                     }});
                 }});
+            }});
         }
+
         return notImplemented();
     }
 
-    private MessagingExtensionResult searchMail(
-        String text,
-        String token) {
+    private Attachment createAdaptiveCardAttachment() {
+        try (
+            InputStream input = Thread.currentThread().getContextClassLoader()
+                .getResourceAsStream("adaptiveCard.json")
+        ) {
+            String adaptiveCardJson = IOUtils.toString(input, StandardCharsets.UTF_8.toString());
+
+            return new Attachment() {{
+                setContentType("application/vnd.microsoft.card.adaptive");
+                setContent(Serialization.jsonToTree(adaptiveCardJson));
+            }};
+        } catch (IOException e) {
+            (LoggerFactory.getLogger(TeamsMessagingExtensionsSearchAuthConfigBot.class))
+                .error("Unable to createAdaptiveCardAttachment", e);
+            return new Attachment();
+        }
+    }
+
+    private MessagingExtensionResult searchMail(String text, String token) {
         SimpleGraphClient graph = new SimpleGraphClient(token);
         List<Message> messages = graph.searchMailInbox(text);
 
         List<MessagingExtensionAttachment> attachments = new ArrayList<>();
-        for (Message msg: messages) {
+        for (Message msg : messages) {
             attachments.add(new MessagingExtensionAttachment() {{
                 setContentType(HeroCard.CONTENTTYPE);
                 setContent(new HeroCard() {{
@@ -308,32 +326,32 @@ private MessagingExtensionResult searchMail(
                 setPreview(new ThumbnailCard() {{
                     setTitle(msg.from.emailAddress.address);
                     setText(String.format("%s<br />%s", msg.subject, msg.bodyPreview));
-                    setImages(Arrays.asList(new CardImage() {{
-                        setUrl("https://raw.githubusercontent.com/microsoft/botbuilder-samples/master/docs/media/OutlookLogo.jpg");
+                    setImage(new CardImage() {{
+                        setUrl(
+                            "https://raw.githubusercontent.com/microsoft/botbuilder-samples/master/docs/media/OutlookLogo.jpg"
+                        );
                         setAlt("Outlook logo");
-                    }}));
+                    }});
                 }}.toAttachment());
             }});
         }
 
-        return  new MessagingExtensionResult() {{
-                setType("result");
-                setAttachmentLayout("list");
-                setAttachments(attachments);
+        return new MessagingExtensionResult() {{
+            setType("result");
+            setAttachmentLayout("list");
+            setAttachments(attachments);
         }};
     }
 
-    private CompletableFuture<List<String[]>> findPackages(
-        String text) {
+    private CompletableFuture<List<String[]>> findPackages(String text) {
         return CompletableFuture.supplyAsync(() -> {
             OkHttpClient client = new OkHttpClient();
-            Request request = new Request.Builder()
-                .url(String
-                    .format(
-                        "https://azuresearch-usnc.nuget.org/query?q=id:%s&prerelease=true",
-                        text
-                    ))
-                .build();
+            Request request = new Request.Builder().url(
+                String.format(
+                    "https://azuresearch-usnc.nuget.org/query?q=id:%s&prerelease=true",
+                    text
+                )
+            ).build();
 
             List<String[]> filteredItems = new ArrayList<String[]>();
             try {
@@ -343,13 +361,14 @@ private CompletableFuture<List<String[]>> findPackages(
 
                 dataArray.forEach(i -> {
                     JSONObject item = (JSONObject) i;
-                    filteredItems.add(new String[]{
-                        item.getString("id"),
-                        item.getString("version"),
-                        item.getString("description"),
-                        item.has("projectUrl") ? item.getString("projectUrl") : "",
-                        item.has("iconUrl") ? item.getString("iconUrl") : ""
-                    });
+                    filteredItems.add(
+                        new String[]{
+                            item.getString("id"), item.getString("version"),
+                            item.getString("description"),
+                            item.has("projectUrl") ? item.getString("projectUrl") : "",
+                            item.has("iconUrl") ? item.getString("iconUrl") : ""
+                        }
+                    );
                 });
 
             } catch (IOException e) {
@@ -358,6 +377,6 @@ private CompletableFuture<List<String[]>> findPackages(
                 throw new CompletionException(e);
             }
             return filteredItems;
-        });
+        }, ExecutorFactory.getExecutor());
     }
 }
diff --git a/samples/52.teams-messaging-extensions-search-auth-config/src/main/resources/adaptiveCard.json b/samples/52.teams-messaging-extensions-search-auth-config/src/main/resources/adaptiveCard.json
new file mode 100644
index 000000000..8509e41f1
--- /dev/null
+++ b/samples/52.teams-messaging-extensions-search-auth-config/src/main/resources/adaptiveCard.json
@@ -0,0 +1,18 @@
+{
+  "$schema": "http://adaptivecards.io/schemas/adaptive-card.json",
+  "version": "1.0",
+  "type": "AdaptiveCard",
+  "body": [
+    {
+      "type": "TextBlock",
+      "text": "You have been signed out.",
+      "isSubtle": false
+    }
+  ],
+  "actions": [
+    {
+      "type": "Action.Submit",
+      "title": "Close"
+    }
+  ]
+}

From 0ca0f8bda649d606b39ad014e53ac853aed31656 Mon Sep 17 00:00:00 2001
From: tracyboehrer <tracyboehrer@users.noreply.github.com>
Date: Mon, 27 Apr 2020 09:18:15 -0500
Subject: [PATCH 4/7] Caching OAuthClient

---
 .../bot/builder/BotFrameworkAdapter.java      | 39 ++++++++++++-------
 .../teamssearchauth/SimpleAuthProvider.java   | 22 -----------
 .../teamssearchauth/SimpleGraphClient.java    | 14 ++++---
 3 files changed, 33 insertions(+), 42 deletions(-)
 delete mode 100644 samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleAuthProvider.java

diff --git a/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java b/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java
index 0346026cb..a150fa6f8 100644
--- a/libraries/bot-builder/src/main/java/com/microsoft/bot/builder/BotFrameworkAdapter.java
+++ b/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);
     }
 
     /**
diff --git a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleAuthProvider.java b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleAuthProvider.java
deleted file mode 100644
index b2439758d..000000000
--- a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleAuthProvider.java
+++ /dev/null
@@ -1,22 +0,0 @@
-package com.microsoft.bot.sample.teamssearchauth;
-
-import com.microsoft.graph.authentication.IAuthenticationProvider;
-import com.microsoft.graph.http.IHttpRequest;
-
-/**
- * SimpleAuthProvider
- */
-public class SimpleAuthProvider implements IAuthenticationProvider {
-
-    private String accessToken;
-
-    public SimpleAuthProvider(String accessToken) {
-        this.accessToken = accessToken;
-    }
-
-    @Override
-    public void authenticateRequest(IHttpRequest request) {
-        // Add the access token in the Authorization header
-        request.addHeader("Authorization", "Bearer " + accessToken);
-    }
-}
diff --git a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java
index 8bf3b4868..8e1b2b80a 100644
--- a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java
+++ b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.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();
     }
-
 }

From ae22bba227538115167ea367cc442b318161d776 Mon Sep 17 00:00:00 2001
From: Eric Dahlvang <v-eridah@microsoft.com>
Date: Tue, 28 Apr 2020 12:51:43 -0700
Subject: [PATCH 5/7] remove offending line from SimpleGraphClient.java

---
 .../microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java | 1 -
 .../src/main/resources/application.properties                   | 2 ++
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java
index 8e1b2b80a..f1bcfcaef 100644
--- a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java
+++ b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/SimpleGraphClient.java
@@ -30,7 +30,6 @@ public List<Message> searchMailInbox(String search) {
 
         IMessageCollectionPage message = client.me().messages()
             .buildRequest(options)
-            .select("internetMessageHeaders")
             .get();
 
         return message.getCurrentPage().subList(0, 10);
diff --git a/samples/52.teams-messaging-extensions-search-auth-config/src/main/resources/application.properties b/samples/52.teams-messaging-extensions-search-auth-config/src/main/resources/application.properties
index a695b3bf0..ba3da1e1f 100644
--- a/samples/52.teams-messaging-extensions-search-auth-config/src/main/resources/application.properties
+++ b/samples/52.teams-messaging-extensions-search-auth-config/src/main/resources/application.properties
@@ -1,2 +1,4 @@
 MicrosoftAppId=
 MicrosoftAppPassword=
+ConnectionName=
+SiteUrl=

From c04068b520c6f777001b7a19c4abb1bca491006a Mon Sep 17 00:00:00 2001
From: Eric Dahlvang <v-eridah@microsoft.com>
Date: Tue, 28 Apr 2020 14:11:00 -0700
Subject: [PATCH 6/7] set type in constructor for TaskModuleContinueResponse
 and TaskModuleMessageResponse

---
 .../bot/schema/teams/TaskModuleContinueResponse.java  | 11 +++++++++--
 .../bot/schema/teams/TaskModuleMessageResponse.java   | 11 +++++++++--
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/TaskModuleContinueResponse.java b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/TaskModuleContinueResponse.java
index a62645aca..394cf3ab3 100644
--- a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/TaskModuleContinueResponse.java
+++ b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/TaskModuleContinueResponse.java
@@ -12,9 +12,16 @@ public class TaskModuleContinueResponse extends TaskModuleResponseBase {
     @JsonProperty(value = "value")
     private TaskModuleTaskInfo value;
 
+    /**
+     * Initializes a new instance.
+     */
+    public TaskModuleContinueResponse() {
+        setType("continue");
+    }
+
     /**
      * Gets the Adaptive card to appear in the task module.
-     * 
+     *
      * @return The value info.
      */
     public TaskModuleTaskInfo getValue() {
@@ -23,7 +30,7 @@ public TaskModuleTaskInfo getValue() {
 
     /**
      * Sets the Adaptive card to appear in the task module.
-     * 
+     *
      * @param withValue The value info.
      */
     public void setValue(TaskModuleTaskInfo withValue) {
diff --git a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/TaskModuleMessageResponse.java b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/TaskModuleMessageResponse.java
index 17fde56d1..7abf81473 100644
--- a/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/TaskModuleMessageResponse.java
+++ b/libraries/bot-schema/src/main/java/com/microsoft/bot/schema/teams/TaskModuleMessageResponse.java
@@ -12,9 +12,16 @@ public class TaskModuleMessageResponse extends TaskModuleResponseBase {
     @JsonProperty(value = "value")
     private String value;
 
+    /**
+     * Initializes a new instance.
+     */
+    public TaskModuleMessageResponse() {
+        setType("message");
+    }
+
     /**
      * Gets info teams will display the value of value in a popup message box.
-     * 
+     *
      * @return The popup info.
      */
     public String getValue() {
@@ -23,7 +30,7 @@ public String getValue() {
 
     /**
      * Sets info teams will display the value of value in a popup message box.
-     * 
+     *
      * @param withValue The popup info.
      */
     public void setValue(String withValue) {

From c4ec5ae5ea911b2852e5e14bae815f63245b5834 Mon Sep 17 00:00:00 2001
From: Emilio Munoz <emmunozp@microsoft.com>
Date: Tue, 28 Apr 2020 19:57:57 -0400
Subject: [PATCH 7/7] Removing .join from CompletableFuture call

---
 ...essagingExtensionsSearchAuthConfigBot.java | 54 +++++++++----------
 1 file changed, 24 insertions(+), 30 deletions(-)

diff --git a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java
index 0f9b14d4c..13db8ab3e 100644
--- a/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java
+++ b/samples/52.teams-messaging-extensions-search-auth-config/src/main/java/com/microsoft/bot/sample/teamssearchauth/TeamsMessagingExtensionsSearchAuthConfigBot.java
@@ -13,11 +13,6 @@
 import com.microsoft.bot.schema.*;
 import com.microsoft.bot.schema.teams.*;
 import com.microsoft.graph.models.extensions.Message;
-import java.io.InputStream;
-import java.io.UnsupportedEncodingException;
-import java.net.URLEncoder;
-import java.nio.charset.StandardCharsets;
-import java.util.concurrent.atomic.AtomicReference;
 import okhttp3.OkHttpClient;
 import okhttp3.Request;
 import okhttp3.Response;
@@ -29,9 +24,14 @@
 import org.springframework.stereotype.Component;
 
 import java.io.IOException;
+import java.io.InputStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLEncoder;
+import java.nio.charset.StandardCharsets;
 import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.CompletionException;
+import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * This class implements the functionality of the Bot.
@@ -45,8 +45,6 @@
 @Component
 public class TeamsMessagingExtensionsSearchAuthConfigBot extends TeamsActivityHandler {
 
-    private String appId;
-    private String appPassword;
     private String siteUrl;
     private String connectionName;
     private UserState userState;
@@ -56,8 +54,6 @@ public TeamsMessagingExtensionsSearchAuthConfigBot(
         Configuration configuration,
         UserState userState
     ) {
-        appId = configuration.getProperty("MicrosoftAppId");
-        appPassword = configuration.getProperty("MicrosoftAppPassword");
         connectionName = configuration.getProperty("ConnectionName");
         siteUrl = configuration.getProperty("SiteUrl");
         userConfigProperty = userState.createProperty("UserConfiguration");
@@ -187,28 +183,26 @@ private CompletableFuture<MessagingExtensionResponse> emailExtensionQuery(
 
         UserTokenProvider tokenProvider = (UserTokenProvider) turnContext.getAdapter();
         return tokenProvider.getUserToken(turnContext, connectionName, magicCode)
-            .thenApply(response -> {
+            .thenCompose(response -> {
                 if (response == null || StringUtils.isEmpty(response.getToken())) {
                     // There is no token, so the user has not signed in yet.
-                    String link = tokenProvider.getOauthSignInLink(turnContext, connectionName).join();
-                        //.thenApply(link -> {
-                            return new MessagingExtensionResponse() {{
-                                setComposeExtension(new MessagingExtensionResult() {{
-                                    setType("auth");
-                                    setSuggestedActions(
-                                        new MessagingExtensionSuggestedAction() {{
-                                            setAction(
-                                                new CardAction() {{
-                                                    setType(ActionTypes.OPEN_URL);
-                                                    setValue(link);
-                                                    setTitle("Bot Service OAuth");
-                                                }}
-                                            );
-                                        }}
-                                    );
-                                }});
-                            }};
-                        //});
+                    return tokenProvider.getOauthSignInLink(turnContext, connectionName)
+                        .thenApply(link -> new MessagingExtensionResponse() {{
+                            setComposeExtension(new MessagingExtensionResult() {{
+                                setType("auth");
+                                setSuggestedActions(
+                                    new MessagingExtensionSuggestedAction() {{
+                                        setAction(
+                                            new CardAction() {{
+                                                setType(ActionTypes.OPEN_URL);
+                                                setValue(link);
+                                                setTitle("Bot Service OAuth");
+                                            }}
+                                        );
+                                    }}
+                                );
+                            }});
+                        }});
                 }
 
                 String search = "";
@@ -216,7 +210,7 @@ private CompletableFuture<MessagingExtensionResponse> emailExtensionQuery(
                     search = (String) query.getParameters().get(0).getValue();
                 }
 
-                return new MessagingExtensionResponse(searchMail(search, response.getToken()));
+                return CompletableFuture.completedFuture(new MessagingExtensionResponse(searchMail(search, response.getToken())));
             });
     }