fix for howdyai#1936 - remove dependency on request

bobisai · Aug 21, 2020 · 3f79353 · 3f79353
1 parent 9df4e42
commit 3f79353
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 23 deletions.
diff --git a/packages/botkit/package.json b/packages/botkit/package.json
@@ -40,7 +40,6 @@
     "express": "^4.17.1",
     "mustache": "^4.0.1",
     "path": "^0.12.7",
-    "request": "^2.88.0",
     "ware": "^1.3.0"
   },
   "devDependencies": { 

diff --git a/packages/botkit/src/adapter.ts b/packages/botkit/src/adapter.ts
@@ -5,10 +5,9 @@
  * Copyright (c) Microsoft Corporation. All rights reserved.
  * Licensed under the MIT License.
  */
-import { BotFrameworkAdapter, TurnContext } from 'botbuilder';
+import { BotFrameworkAdapter, TurnContext, TeamsInfo, ChannelInfo } from 'botbuilder';
 import { ConnectorClient, TokenApiClient } from 'botframework-connector';
 import { TeamsBotWorker } from './teamsHelpers';
-import * as request from 'request';
 import * as os from 'os';
 
 const pjson: any = require('../package.json'); // eslint-disable-line @typescript-eslint/no-var-requires
@@ -59,27 +58,10 @@ export class BotkitBotFrameworkAdapter extends BotFrameworkAdapter {
      * @param context A TurnContext object representing a message or event from a user in Teams
      * @returns an array of channels in the format [{name: string, id: string}]
      */
-    public async getChannels(context: TurnContext): Promise<{id: string; name: string}[]> {
+    public async getChannels(context: TurnContext): Promise<ChannelInfo[]> {
         if (context.activity.channelData && context.activity.channelData.team) {
-            const token = await this.credentials.getToken(true);
-
-            const uri = context.activity.serviceUrl + 'v3/teams/' + context.activity.channelData.team.id + '/conversations/';
-            return new Promise((resolve, reject) => {
-                request({
-                    method: 'GET',
-                    headers: {
-                        Authorization: 'Bearer ' + token
-                    },
-                    json: true,
-                    uri: uri
-                }, async function(err, res, json) {
-                    if (err) {
-                        reject(err);
-                    } else {
-                        resolve(json.conversations ? json.conversations.map((c) => { if (!c.name) { c.name = 'General'; } return c; }) : []);
-                    }
-                });
-            });
+            const channels = await TeamsInfo.getTeamChannels(context);
+            return channels ? channels.map((c) => { if (!c.name) { c.name = 'General'; } return c; }) : [];
         } else {
             console.error('getChannels cannot be called from unknown team');
             return [];

diff --git a/packages/testbot/features/teams_features.js b/packages/testbot/features/teams_features.js
@@ -58,6 +58,14 @@ module.exports = function(controller) {
           }
         });
 
+        controller.hears('getTeamChannels', 'message', async(bot, message) => {
+          try {
+            await bot.reply(message, JSON.stringify(await bot.teams.getTeamChannels(bot.getConfig('context'))));
+          } catch(err) {
+            await bot.reply(message, err.message);
+          }
+        });
+
 
         controller.hears('getMember', 'message', async(bot, message) => {
           try {