Skip to content

Fixed issue with channel_data being overwritten in create_conversation #1749

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 28, 2021
Merged

Fixed issue with channel_data being overwritten in create_conversation #1749

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
172dc3c
Fixed issue with channel_data being overwritten in create_conversation
tracyboehrer Jun 24, 2021
0b98ef8
Merge branch 'main' into tracyboehrer/tenantId
axelsrz Jun 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -340,6 +340,7 @@ async def create_conversation(
If the conversation is established with the specified users, the ID of the activity
will contain the ID of the new conversation.
"""

try:
if not service_url:
service_url = reference.service_url
Expand All @@ -366,8 +367,10 @@ async def create_conversation(
# Mix in the tenant ID if specified. This is required for MS Teams.
if reference.conversation and reference.conversation.tenant_id:
# Putting tenant_id in channel_data is a temporary while we wait for the Teams API to be updated
parameters.channel_data = {
"tenant": {"tenantId": reference.conversation.tenant_id}
if parameters.channel_data is None:
parameters.channel_data = {}
parameters.channel_data["tenant"] = {
"tenantId": reference.conversation.tenant_id
}

# Permanent solution is to put tenant_id in parameters.tenant_id
Expand Down