Fixex #1937 - change method for locating adapter inside bot

howdyai · Mar 18, 2020 · ec98586 · ec98586
1 parent 62ab6d4
commit ec98586
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 7 deletions.
diff --git a/packages/botbuilder-adapter-slack/src/botworker.ts b/packages/botbuilder-adapter-slack/src/botworker.ts
@@ -268,7 +268,7 @@ export class SlackBotWorker extends BotWorker {
                 msg.conversation.thread_ts = src.incoming_message.channelData.thread_ts;
             }
 
-            msg = this.getConfig('context').adapter.activityToSlack(msg);
+            msg = this.getConfig('adapter').activityToSlack(msg);
 
             const requestOptions = {
                 uri: src.incoming_message.channelData.response_url,
@@ -336,7 +336,7 @@ export class SlackBotWorker extends BotWorker {
      * @param update An object in the form `{id: <id of message to update>, conversation: { id: <channel> }, text: <new text>, card: <array of card objects>}`
      */
     public async updateMessage(update: Partial<BotkitMessage>): Promise<any> {
-        return this.getConfig('context').adapter.updateActivity(
+        return this.getConfig('adapter').updateActivity(
             this.getConfig('context'),
             update
         );
@@ -356,7 +356,7 @@ export class SlackBotWorker extends BotWorker {
      * @param update An object in the form of `{id: <id of message to delete>, conversation: { id: <channel of message> }}`
      */
     public async deleteMessage(update: Partial<BotkitMessage>): Promise<any> {
-        return this.getConfig('context').adapter.deleteActivity(
+        return this.getConfig('adapter').deleteActivity(
             this.getConfig('context'),
             {
                 activityId: update.id,

diff --git a/packages/botkit/src/botworker.ts b/packages/botkit/src/botworker.ts
@@ -259,7 +259,7 @@ export class BotWorker {
         );
 
         // create a turn context
-        const turnContext = new TurnContext(this.getConfig('context').adapter, activity as Activity);
+        const turnContext = new TurnContext(this.getConfig('adapter'), activity as Activity);
 
         // create a new dialogContext so beginDialog works.
         const dialogContext = await this._controller.dialogSet.createContext(turnContext);
@@ -278,7 +278,7 @@ export class BotWorker {
 
         // Create conversation
         const parameters: ConversationParameters = { bot: reference.bot, members: [reference.user], isGroup: false, activity: null, channelData: null };
-        const client = this.getConfig('context').adapter.createConnectorClient(reference.serviceUrl);
+        const client = this.getConfig('adapter').createConnectorClient(reference.serviceUrl);
 
         // Mix in the tenant ID if specified. This is required for MS Teams.
         if (reference.conversation && reference.conversation.tenantId) {
@@ -312,7 +312,7 @@ export class BotWorker {
         if (response.serviceUrl) { request.serviceUrl = response.serviceUrl; }
 
         // Create context and run middleware
-        const turnContext: TurnContext = this.getConfig('context').adapter.createContext(request);
+        const turnContext: TurnContext = this.getConfig('adapter').createContext(request);
 
         // create a new dialogContext so beginDialog works.
         const dialogContext = await this._controller.dialogSet.createContext(turnContext);

diff --git a/packages/botkit/src/core.ts b/packages/botkit/src/core.ts
@@ -1077,14 +1077,18 @@ export class Botkit {
         }
 
         let worker: BotWorker = null;
-        const adapter = custom_adapter || config.context.adapter || this.adapter;
+        const adapter = custom_adapter || (config.context && config.context.adapter) ? config.context.adapter : this.adapter;
+
         if (adapter.botkit_worker) {
             const CustomBotWorker = adapter.botkit_worker;
             worker = new CustomBotWorker(this, config);
         } else {
             worker = new BotWorker(this, config);
         }
 
+        // make sure the adapter is available in a standard location.
+        worker.getConfig().adapter = adapter;
+
         return new Promise((resolve, reject) => {
             this.middleware.spawn.run(worker, (err, worker) => {
                 if (err) {