Teams tenantId correction (microsoft#959)

tracyboehrer · web-flow · commit 9fed14f74434 · 2020-04-16T08:29:27.000-07:00
diff --git a/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py b/libraries/botbuilder-core/botbuilder/core/bot_framework_adapter.py
@@ -351,7 +351,7 @@ async def create_conversation(
             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": {"id": reference.conversation.tenant_id}
+                    "tenant": {"tenantId": reference.conversation.tenant_id}
                 }
 
                 # Permanent solution is to put tenant_id in parameters.tenant_id
diff --git a/libraries/botbuilder-core/tests/test_bot_framework_adapter.py b/libraries/botbuilder-core/tests/test_bot_framework_adapter.py
@@ -303,7 +303,7 @@ async def aux_func_assert_valid_conversation(context):
                 "request has invalid tenant_id on conversation",
             )
             self.assertEqual(
-                context.activity.channel_data["tenant"]["id"],
+                context.activity.channel_data["tenant"]["tenantId"],
                 tenant_id,
                 "request has invalid tenant_id in channel_data",
             )

Original file line number	Diff line number	Diff line change
`@@ -351,7 +351,7 @@ async def create_conversation(`
`351`	`351`	`if reference.conversation and reference.conversation.tenant_id:`
`352`	`352`	`# Putting tenant_id in channel_data is a temporary while we wait for the Teams API to be updated`
`353`	`353`	`parameters.channel_data = {`
`354`		`- "tenant": {"id": reference.conversation.tenant_id}`
	`354`	`+ "tenant": {"tenantId": reference.conversation.tenant_id}`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`# Permanent solution is to put tenant_id in parameters.tenant_id`
Original file line number	Diff line number	Diff line change
`@@ -303,7 +303,7 @@ async def aux_func_assert_valid_conversation(context):`
`303`	`303`	`"request has invalid tenant_id on conversation",`
`304`	`304`	`)`
`305`	`305`	`self.assertEqual(`
`306`		`- context.activity.channel_data["tenant"]["id"],`
	`306`	`+ context.activity.channel_data["tenant"]["tenantId"],`
`307`	`307`	`tenant_id,`
`308`	`308`	`"request has invalid tenant_id in channel_data",`
`309`	`309`	`)`