Merge pull request microsoft#1286 from microsoft/ccastro/sso-teams-cherry-pick

tracyboehrer · web-flow · commit f7eb120fab30 · 2020-07-27T14:36:40.000-05:00
SSO + Teams cherry pick from 4.9
diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/oauth_prompt.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/prompts/oauth_prompt.py
@@ -362,7 +362,9 @@ async def _send_oauth_card(
                 ):
                     if context.activity.channel_id == Channels.emulator:
                         card_action_type = ActionTypes.open_url
-                else:
+                elif not OAuthPrompt._channel_requires_sign_in_link(
+                    context.activity.channel_id
+                ):
                     link = None
 
                 json_token_ex_resource = (
@@ -546,7 +548,7 @@ async def _recognize_token(
                 if not token_exchange_response or not token_exchange_response.token:
                     await context.send_activity(
                         self._get_token_exchange_invoke_response(
-                            int(HTTPStatus.CONFLICT),
+                            int(HTTPStatus.PRECONDITION_FAILED),
                             "The bot is unable to exchange token. Proceed with regular login.",
                         )
                     )
@@ -609,7 +611,6 @@ def _is_teams_verification_invoke(context: TurnContext) -> bool:
     @staticmethod
     def _channel_suppports_oauth_card(channel_id: str) -> bool:
         if channel_id in [
-            Channels.ms_teams,
             Channels.cortana,
             Channels.skype,
             Channels.skype_for_business,
@@ -618,6 +619,13 @@ def _channel_suppports_oauth_card(channel_id: str) -> bool:
 
         return True
 
+    @staticmethod
+    def _channel_requires_sign_in_link(channel_id: str) -> bool:
+        if channel_id in [Channels.ms_teams]:
+            return True
+
+        return False
+
     @staticmethod
     def _is_token_exchange_request_invoke(context: TurnContext) -> bool:
         activity = context.activity
