Axsuarez/cherrypick 4.5 (#270)

* Changes for token validation fix

* breaking lines due to pylint

Author: axelsrz

libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py

@@ -3,6 +3,7 @@
 
 import asyncio
 import base64
+import json
 from typing import List, Callable, Awaitable, Union, Dict
 from msrest.serialization import Model
 from botbuilder.schema import (
@@ -90,7 +91,9 @@ def __init__(self, settings: BotFrameworkAdapterSettings):
         )
         self._is_emulating_oauth_cards = False
 
-    async def continue_conversation(self, bot_id: str, reference: ConversationReference, callback: Callable):
+    async def continue_conversation(
+        self, bot_id: str, reference: ConversationReference, callback: Callable
+    ):
         """
         Continues a conversation with a user. This is often referred to as the bots "Proactive Messaging"
         flow as its lets the bot proactively send messages to a conversation or user that its already
@@ -290,8 +293,7 @@ async def delete_activity(
         try:
             client = self.create_connector_client(reference.service_url)
             await client.conversations.delete_activity(
-                reference.conversation.id,
-                reference.activity_id,
+                reference.conversation.id, reference.activity_id
             )
         except Exception as error:
             raise error
@@ -488,15 +490,13 @@ async def get_oauth_sign_in_link(
         state = TokenExchangeState(
             connection_name=connection_name,
             conversation=conversation,
-            ms_app_id=client.config.credentials.app_id,
+            ms_app_id=client.config.credentials.microsoft_app_id,
         )
 
-        # TODO check proper encoding error handling
         final_state = base64.b64encode(
-            state.serialize().encode(encoding="UTF-8", errors="strict")
+            json.dumps(state.serialize()).encode(encoding="UTF-8", errors="strict")
         ).decode()
 
-        # TODO check form of response
         return client.bot_sign_in.get_sign_in_url(final_state)
 
     async def get_token_status(

libraries/botbuilder-core/botbuilder/core/bot_telemetry_client.py

@@ -93,8 +93,10 @@ def track_metric(
         :param value: The value of the metric that was captured.
         :param tel_type: The type of the metric. (defaults to: TelemetryDataPointType.aggregation`)
         :param count: the number of metrics that were aggregated into this data point. (defaults to: None)
-        :param min_val: the minimum of all metrics collected that were aggregated into this data point. (defaults to: None)
-        :param max_val: the maximum of all metrics collected that were aggregated into this data point. (defaults to: None)
+        :param min_val: the minimum of all metrics collected that were aggregated into this data point.
+         (defaults to: None)
+        :param max_val: the maximum of all metrics collected that were aggregated into this data point.
+         (defaults to: None)
         :param std_dev: the standard deviation of all metrics collected that were aggregated into this data point. \
         :param properties: the set of custom properties the client wants attached to this data item. (defaults to: None)
         """

libraries/botbuilder-core/botbuilder/core/null_telemetry_client.py

@@ -80,8 +80,10 @@ def track_metric(
         :param value: The value of the metric that was captured.
         :param tel_type: The type of the metric. (defaults to: TelemetryDataPointType.aggregation`)
         :param count: the number of metrics that were aggregated into this data point. (defaults to: None
-        :param min_val: the minimum of all metrics collected that were aggregated into this data point. (defaults to: None)
-        :param max_val: the maximum of all metrics collected that were aggregated into this data point. (defaults to: None)
+        :param min_val: the minimum of all metrics collected that were aggregated into this data point.
+         (defaults to: None)
+        :param max_val: the maximum of all metrics collected that were aggregated into this data point.
+         (defaults to: None)
         :param std_dev: the standard deviation of all metrics collected that were aggregated into this data point. \
         (defaults to: None)
         :param properties: the set of custom properties the client wants attached to this data item. (defaults to: None)

libraries/botframework-connector/botframework/connector/auth/channel_validation.py

@@ -80,8 +80,8 @@ async def authenticate_channel_token(
         """
         metadata_endpoint = (
             ChannelValidation.open_id_metadata_endpoint
-            if ChannelValidation
-            else Constants.TO_BOT_FROM_EMULATOR_OPEN_ID_METADATA_URL
+            if ChannelValidation.open_id_metadata_endpoint
+            else Constants.TO_BOT_FROM_CHANNEL_OPEN_ID_METADATA_URL
         )
 
         token_extractor = JwtTokenExtractor(

libraries/botframework-connector/botframework/connector/auth/jwt_token_extractor.py

@@ -53,8 +53,8 @@ async def get_identity(
 
         try:
             return await self._validate_token(parameter, channel_id)
-        except:
-            raise
+        except Exception as error:
+            raise error
 
     def _has_allowed_issuer(self, jwt_token: str) -> bool:
         decoded = jwt.decode(jwt_token, verify=False)

libraries/botframework-connector/botframework/connector/auth/jwt_token_validation.py

@@ -70,19 +70,15 @@ async def validate_auth_header(
                 auth_header, credentials, channel_service, channel_id
             )
 
-        if not channel_service:
-            if service_url.strip():
-                return
+        # Right now public Azure is the only supported scenario (Gov and Enterprise pending)
+        if service_url:
+            return await ChannelValidation.authenticate_channel_token_with_service_url(
+                auth_header, credentials, service_url, channel_id
+            )
 
-        else:
-            if service_url:
-                return await ChannelValidation.authenticate_channel_token_with_service_url(
-                    auth_header, credentials, service_url, channel_id
-                )
-            else:
-                return await ChannelValidation.authenticate_channel_token(
-                    auth_header, credentials, channel_id
-                )
+        return await ChannelValidation.authenticate_channel_token(
+            auth_header, credentials, channel_id
+        )
 
     @staticmethod
     def is_government(channel_service: str) -> bool:

libraries/botframework-connector/botframework/connector/token_api/operations/_bot_sign_in_operations.py

@@ -105,7 +105,7 @@ def get_sign_in_url(
 
         deserialized = None
         if response.status_code == 200:
-            deserialized = self._deserialize("str", response)
+            deserialized = response.content.decode("utf-8")
 
         if raw:
             client_raw_response = ClientRawResponse(deserialized, response)