From 318d4a909983526614d6bcc4de3b663ef4f03d77 Mon Sep 17 00:00:00 2001 From: justinas-b <12399634+justinas-b@users.noreply.github.com> Date: Fri, 10 Jan 2020 16:18:52 +0200 Subject: [PATCH 1/3] ISSUE-2760 Resolving compatibility issues with Microsoft Bot Framework Emulator --- rasa/core/channels/botframework.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/rasa/core/channels/botframework.py b/rasa/core/channels/botframework.py index 931d9e1d8ca4..ad60f490563f 100644 --- a/rasa/core/channels/botframework.py +++ b/rasa/core/channels/botframework.py @@ -36,6 +36,10 @@ def __init__( service_url: Text, ) -> None: + service_url = ( + f"{service_url}/" if not service_url.endswith("/") else service_url + ) + self.app_id = app_id self.app_password = app_password self.conversation = conversation From 8ede46496cb5f4a47709602ec714507357fee0db Mon Sep 17 00:00:00 2001 From: justinas-b <12399634+justinas-b@users.noreply.github.com> Date: Wed, 15 Jan 2020 08:39:28 +0200 Subject: [PATCH 2/3] ISSUE-2760 Updating CHANGELOG --- changelog/5057.bugfix.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 changelog/5057.bugfix.rst diff --git a/changelog/5057.bugfix.rst b/changelog/5057.bugfix.rst new file mode 100644 index 000000000000..0ec69e90bfa4 --- /dev/null +++ b/changelog/5057.bugfix.rst @@ -0,0 +1 @@ +Addressing ISSUE-2760 to resolve compatibility issues with Microsoft Bot Framework Emulator. \ No newline at end of file From 07abd84cf6195804881cd38e681006413e57928f Mon Sep 17 00:00:00 2001 From: Justinas <12399634+justinas-b@users.noreply.github.com> Date: Wed, 15 Jan 2020 12:18:43 +0200 Subject: [PATCH 3/3] Update changelog/5057.bugfix.rst Co-Authored-By: Ella Rohm-Ensing --- changelog/5057.bugfix.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/changelog/5057.bugfix.rst b/changelog/5057.bugfix.rst index 0ec69e90bfa4..fa7114a296fe 100644 --- a/changelog/5057.bugfix.rst +++ b/changelog/5057.bugfix.rst @@ -1 +1 @@ -Addressing ISSUE-2760 to resolve compatibility issues with Microsoft Bot Framework Emulator. \ No newline at end of file +Fixed compatibility issue with Microsoft Bot Framework Emulator if ``service_url`` lacked a trailing ``/``.