Fix get_skill_conversation_reference in skill_handler (microsoft#1728)

santgr11 · web-flow · commit 167da30f9ff6 · 2021-06-22T10:42:08.000-05:00
* Add check for instance of SkillConversationReference

* Apply black styling
diff --git a/libraries/botbuilder-core/botbuilder/core/skills/skill_handler.py b/libraries/botbuilder-core/botbuilder/core/skills/skill_handler.py
@@ -200,14 +200,18 @@ async def _get_skill_conversation_reference(
                 conversation_id
             )
 
-            skill_conversation_reference: SkillConversationReference = SkillConversationReference(
-                conversation_reference=conversation_reference,
-                oauth_scope=(
-                    GovernmentConstants.TO_CHANNEL_FROM_BOT_OAUTH_SCOPE
-                    if self._channel_provider and self._channel_provider.is_government()
-                    else AuthenticationConstants.TO_CHANNEL_FROM_BOT_OAUTH_SCOPE
-                ),
-            )
+            if isinstance(conversation_reference, SkillConversationReference):
+                skill_conversation_reference: SkillConversationReference = conversation_reference
+            else:
+                skill_conversation_reference: SkillConversationReference = SkillConversationReference(
+                    conversation_reference=conversation_reference,
+                    oauth_scope=(
+                        GovernmentConstants.TO_CHANNEL_FROM_BOT_OAUTH_SCOPE
+                        if self._channel_provider
+                        and self._channel_provider.is_government()
+                        else AuthenticationConstants.TO_CHANNEL_FROM_BOT_OAUTH_SCOPE
+                    ),
+                )
 
         if not skill_conversation_reference:
             raise KeyError("SkillConversationReference not found")
