Skills: Cancel dialogs only if EOC is coming from parent. (microsoft#860)

tracyboehrer · axelsrz · web-flow · commit 7e2fbadc920a · 2020-03-12T09:43:11.000-07:00
* Skills: Cancel dialogs only if EOC is coming from parent.

* Updating __is_eoc_coming_from_parent condition

* modify activity.caller_id in bfhttpclient

Co-authored-by: Axel Suárez &lt;axsuarez@microsoft.com&gt;
diff --git a/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_extensions.py b/libraries/botbuilder-dialogs/botbuilder/dialogs/dialog_extensions.py
@@ -30,7 +30,13 @@ async def run_dialog(
             if (
                 turn_context.activity.type == ActivityTypes.end_of_conversation
                 and dialog_context.stack
+                and DialogExtensions.__is_eoc_coming_from_parent(turn_context)
             ):
+                remote_cancel_text = "Skill was canceled through an EndOfConversation activity from the parent."
+                await turn_context.send_trace_activity(
+                    f"Extension {Dialog.__name__}.run_dialog", label=remote_cancel_text,
+                )
+
                 await dialog_context.cancel_all_dialogs()
             else:
                 # Process a reprompt event sent from the parent.
@@ -75,3 +81,9 @@ async def run_dialog(
             results = await dialog_context.continue_dialog()
             if results.status == DialogTurnStatus.Empty:
                 await dialog_context.begin_dialog(dialog.id)
+
+    @staticmethod
+    def __is_eoc_coming_from_parent(turn_context: TurnContext) -> bool:
+        # To determine the direction we check callerId property which is set to the parent bot
+        # by the BotFrameworkHttpClient on outgoing requests.
+        return bool(turn_context.activity.caller_id)
diff --git a/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/bot_framework_http_client.py b/libraries/botbuilder-integration-aiohttp/botbuilder/integration/aiohttp/bot_framework_http_client.py
@@ -97,7 +97,7 @@ async def post_activity(
             )
             activity.conversation.id = conversation_id
             activity.service_url = service_url
-            activity.caller_id = from_bot_id
+            activity.caller_id = f"urn:botframework:aadappid:{from_bot_id}"
 
             headers_dict = {
                 "Content-type": "application/json; charset=utf-8",

Original file line number	Diff line number	Diff line change
`@@ -97,7 +97,7 @@ async def post_activity(`
`97`	`97`	`)`
`98`	`98`	`activity.conversation.id = conversation_id`
`99`	`99`	`activity.service_url = service_url`
`100`		`- activity.caller_id = from_bot_id`
	`100`	`+ activity.caller_id = f"urn:botframework:aadappid:{from_bot_id}"`
`101`	`101`
`102`	`102`	`headers_dict = {`
`103`	`103`	`"Content-type": "application/json; charset=utf-8",`