@microsoft/teamsfx 0.7.1-beta.adb483893.0 → 1.0.0-alpha.074ce579f.0

package/dist/index.esm2017.mjs

@@ -10,6 +10,7 @@ import axios from 'axios';
 import { Agent } from 'https';
 import * as path from 'path';
 import * as fs from 'fs';
+import { AdaptiveCards } from '@microsoft/adaptivecards-tools';
 
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
@@ -1579,8 +1580,12 @@ class ApiKeyProvider {
                 if (!config.params) {
                     config.params = {};
                 }
-                const url = new URL(config.url, config.baseURL);
-                if (config.params[this.keyName] || url.searchParams.has(this.keyName)) {
+                let urlHasDefinedApiKey = false;
+                if (config.url) {
+                    const url = new URL(config.url, config.baseURL);
+                    urlHasDefinedApiKey = url.searchParams.has(this.keyName);
+                }
+                if (config.params[this.keyName] || urlHasDefinedApiKey) {
                     throw new ErrorWithCode(formatString(ErrorMessage.DuplicateApiKeyInQueryParam, this.keyName), ErrorCode.AuthorizationInfoAlreadyExists);
                 }
                 config.params[this.keyName] = this.keyValue;
@@ -1902,6 +1907,41 @@ class TeamsFx {
     }
 }
 
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+/**
+ * @internal
+ */
+function cloneConversation(conversation) {
+    return JSON.parse(JSON.stringify(conversation));
+}
+/**
+ * @internal
+ */
+function getTargetType(conversationReference) {
+    var _a;
+    const conversationType = (_a = conversationReference.conversation) === null || _a === void 0 ? void 0 : _a.conversationType;
+    if (conversationType === "personal") {
+        return "Person";
+    }
+    else if (conversationType === "groupChat") {
+        return "Group";
+    }
+    else if (conversationType === "channel") {
+        return "Channel";
+    }
+    else {
+        return undefined;
+    }
+}
+/**
+ * @internal
+ */
+function getTeamsBotInstallationId(context) {
+    var _a, _b, _c, _d;
+    return (_d = (_c = (_b = (_a = context.activity) === null || _a === void 0 ? void 0 : _a.channelData) === null || _b === void 0 ? void 0 : _b.team) === null || _c === void 0 ? void 0 : _c.id) !== null && _d !== void 0 ? _d : context.activity.conversation.id;
+}
+
 // Copyright (c) Microsoft Corporation.
 /**
  * @internal
@@ -1931,6 +1971,10 @@ class NotificationMiddleware {
                 await this.conversationReferenceStore.set(reference);
                 break;
             }
+            case ActivityType.CurrentBotMessaged: {
+                await this.tryAddMessagedReference(context);
+                break;
+            }
             case ActivityType.CurrentBotUninstalled:
             case ActivityType.TeamDeleted: {
                 const reference = TurnContext.getConversationReference(context.activity);
@@ -1961,8 +2005,31 @@ class NotificationMiddleware {
                 return ActivityType.TeamRestored;
             }
         }
+        else if (activityType === "message") {
+            return ActivityType.CurrentBotMessaged;
+        }
         return ActivityType.Unknown;
     }
+    async tryAddMessagedReference(context) {
+        var _a, _b, _c, _d;
+        const reference = TurnContext.getConversationReference(context.activity);
+        const conversationType = (_a = reference === null || reference === void 0 ? void 0 : reference.conversation) === null || _a === void 0 ? void 0 : _a.conversationType;
+        if (conversationType === "personal" || conversationType === "groupChat") {
+            if (!(await this.conversationReferenceStore.check(reference))) {
+                await this.conversationReferenceStore.set(reference);
+            }
+        }
+        else if (conversationType === "channel") {
+            const teamId = (_d = (_c = (_b = context.activity) === null || _b === void 0 ? void 0 : _b.channelData) === null || _c === void 0 ? void 0 : _c.team) === null || _d === void 0 ? void 0 : _d.id;
+            if (teamId !== undefined) {
+                const teamReference = cloneConversation(reference);
+                teamReference.conversation.id = teamId;
+                if (!(await this.conversationReferenceStore.check(teamReference))) {
+                    await this.conversationReferenceStore.set(teamReference);
+                }
+            }
+        }
+    }
 }
 class CommandResponseMiddleware {
     constructor(handlers) {
@@ -1972,35 +2039,33 @@ class CommandResponseMiddleware {
         }
     }
     async onTurn(context, next) {
-        const type = this.classifyActivity(context.activity);
-        switch (type) {
-            case ActivityType.CurrentBotMessaged:
-                // Invoke corresponding command handler for the command response
-                const commandText = this.getActivityText(context.activity);
-                const message = {
-                    text: commandText,
-                };
-                for (const handler of this.commandHandlers) {
-                    const matchResult = this.shouldTrigger(handler.triggerPatterns, commandText);
-                    // It is important to note that the command bot will stop processing handlers
-                    // when the first command handler is matched.
-                    if (!!matchResult) {
-                        message.matches = Array.isArray(matchResult) ? matchResult : void 0;
-                        const response = await handler.handleCommandReceived(context, message);
+        if (context.activity.type === ActivityTypes.Message) {
+            // Invoke corresponding command handler for the command response
+            const commandText = this.getActivityText(context.activity);
+            const message = {
+                text: commandText,
+            };
+            for (const handler of this.commandHandlers) {
+                const matchResult = this.shouldTrigger(handler.triggerPatterns, commandText);
+                // It is important to note that the command bot will stop processing handlers
+                // when the first command handler is matched.
+                if (!!matchResult) {
+                    message.matches = Array.isArray(matchResult) ? matchResult : void 0;
+                    const response = await handler.handleCommandReceived(context, message);
+                    if (typeof response === "string") {
                         await context.sendActivity(response);
-                        break;
+                    }
+                    else {
+                        const replyActivity = response;
+                        if (replyActivity) {
+                            await context.sendActivity(replyActivity);
+                        }
                     }
                 }
-                break;
+            }
         }
         await next();
     }
-    classifyActivity(activity) {
-        if (activity.type === ActivityTypes.Message) {
-            return ActivityType.CurrentBotMessaged;
-        }
-        return ActivityType.Unknown;
-    }
     matchPattern(pattern, text) {
         if (text) {
             if (typeof pattern === "string") {
@@ -2203,41 +2268,6 @@ class ConversationReferenceStore {
     }
 }
 
-// Copyright (c) Microsoft Corporation.
-// Licensed under the MIT license.
-/**
- * @internal
- */
-function cloneConversation(conversation) {
-    return Object.assign({}, conversation);
-}
-/**
- * @internal
- */
-function getTargetType(conversationReference) {
-    var _a;
-    const conversationType = (_a = conversationReference.conversation) === null || _a === void 0 ? void 0 : _a.conversationType;
-    if (conversationType === "personal") {
-        return "Person";
-    }
-    else if (conversationType === "groupChat") {
-        return "Group";
-    }
-    else if (conversationType === "channel") {
-        return "Channel";
-    }
-    else {
-        return undefined;
-    }
-}
-/**
- * @internal
- */
-function getTeamsBotInstallationId(context) {
-    var _a, _b, _c, _d;
-    return (_d = (_c = (_b = (_a = context.activity) === null || _a === void 0 ? void 0 : _a.channelData) === null || _b === void 0 ? void 0 : _b.team) === null || _c === void 0 ? void 0 : _c.id) !== null && _d !== void 0 ? _d : context.activity.conversation.id;
-}
-
 // Copyright (c) Microsoft Corporation.
 /**
  * Send a plain text message to a notification target.
@@ -2273,7 +2303,7 @@ function sendAdaptiveCard(target, card) {
  */
 class Channel {
     /**
-     * Constuctor.
+     * Constructor.
      *
      * @remarks
      * It's recommended to get channels from {@link TeamsBotInstallation.channels()}, instead of using this constructor.
@@ -2347,7 +2377,7 @@ class Channel {
  */
 class Member {
     /**
-     * Constuctor.
+     * Constructor.
      *
      * @remarks
      * It's recommended to get members from {@link TeamsBotInstallation.members()}, instead of using this constructor.
@@ -2557,12 +2587,12 @@ class NotificationBot {
         if (this.conversationReferenceStore === undefined || this.adapter === undefined) {
             throw new Error("NotificationBot has not been initialized.");
         }
-        const references = (await this.conversationReferenceStore.getAll()).values();
+        const references = await this.conversationReferenceStore.getAll();
         const targets = [];
         for (const reference of references) {
             // validate connection
             let valid = true;
-            this.adapter.continueConversation(reference, async (context) => {
+            await this.adapter.continueConversation(reference, async (context) => {
                 try {
                     // try get member to see if the installation is still valid
                     await TeamsInfo.getPagedMembers(context, 1);
@@ -2577,7 +2607,7 @@ class NotificationBot {
                 targets.push(new TeamsBotInstallation(this.adapter, reference));
             }
             else {
-                this.conversationReferenceStore.delete(reference);
+                await this.conversationReferenceStore.delete(reference);
             }
         }
         return targets;
@@ -2716,7 +2746,6 @@ class ConversationBot {
 }
 
 // Copyright (c) Microsoft Corporation.
-const { AdaptiveCards } = require("@microsoft/adaptivecards-tools");
 /**
  * Provides utility method to build bot message with cards that supported in Teams.
  */