Add support for channelData field in conversation references

libraries/botbuilder/src/botFrameworkAdapter.ts

@@ -227,6 +227,17 @@ export class BotFrameworkAdapter extends BotAdapter implements IUserTokenProvide
         // Create conversation
         const parameters: ConversationParameters = { bot: reference.bot, members: [reference.user] } as ConversationParameters;
         const client: ConnectorClient = this.createConnectorClient(reference.serviceUrl);
+
+        // Mix in the tenant ID if specified. This is required for MS Teams.
+        if (reference.conversation && reference.conversation.tenantId) {
+            // Putting tenantId in channelData is a temporary solution while we wait for the Teams API to be updated
+            parameters.channelData = { tenant: { id: reference.conversation.tenantId } };
+
+            // Permanent solution is to put tenantId in parameters.tenantId
+            parameters.tenantId = reference.conversation.tenantId;
+
+        }
+
         const response = await client.conversations.createConversation(parameters);
 
         // Initialize request and copy over new conversation ID and updated serviceUrl.

libraries/botframework-schema/src/index.ts

@@ -115,6 +115,10 @@ export interface ConversationAccount {
    * Indicates the type of the conversation in channels that distinguish between conversation types
    */
   conversationType: string;
+  /**
+   * This conversation's tenant ID
+   */
+  tenantId: string;
   /**
    * Channel id for the user or bot on this channel (Example: joe@smith.com, or @joesmith or
    * 123456)
@@ -499,6 +503,10 @@ export interface ConversationParameters {
    * (Optional) Topic of the conversation (if supported by the channel)
    */
   topicName?: string;
+  /**
+   * (Optional) The tenant ID in which the conversation should be created
+   */
+  tenantId?: string;
   /**
    * (Optional) When creating a new conversation, use this activity as the initial message to the
    * conversation