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

package/dist/index.node.cjs.js

@@ -15,6 +15,7 @@ var axios = require('axios');
 var https = require('https');
 var path = require('path');
 var fs = require('fs');
+var adaptivecardsTools = require('@microsoft/adaptivecards-tools');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -1638,8 +1639,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), exports.ErrorCode.AuthorizationInfoAlreadyExists);
                     }
                     config.params[this.keyName] = this.keyValue;
@@ -1968,6 +1973,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
@@ -1998,6 +2038,10 @@ class NotificationMiddleware {
                     yield this.conversationReferenceStore.set(reference);
                     break;
                 }
+                case ActivityType.CurrentBotMessaged: {
+                    yield this.tryAddMessagedReference(context);
+                    break;
+                }
                 case ActivityType.CurrentBotUninstalled:
                 case ActivityType.TeamDeleted: {
                     const reference = botbuilder.TurnContext.getConversationReference(context.activity);
@@ -2029,8 +2073,33 @@ class NotificationMiddleware {
                 return ActivityType.TeamRestored;
             }
         }
+        else if (activityType === "message") {
+            return ActivityType.CurrentBotMessaged;
+        }
         return ActivityType.Unknown;
     }
+    tryAddMessagedReference(context) {
+        var _a, _b, _c, _d;
+        return tslib.__awaiter(this, void 0, void 0, function* () {
+            const reference = botbuilder.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 (!(yield this.conversationReferenceStore.check(reference))) {
+                    yield 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 (!(yield this.conversationReferenceStore.check(teamReference))) {
+                        yield this.conversationReferenceStore.set(teamReference);
+                    }
+                }
+            }
+        });
+    }
 }
 class CommandResponseMiddleware {
     constructor(handlers) {
@@ -2041,36 +2110,34 @@ class CommandResponseMiddleware {
     }
     onTurn(context, next) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
-            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 = yield handler.handleCommandReceived(context, message);
+            if (context.activity.type === botbuilder.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 = yield handler.handleCommandReceived(context, message);
+                        if (typeof response === "string") {
                             yield context.sendActivity(response);
-                            break;
+                        }
+                        else {
+                            const replyActivity = response;
+                            if (replyActivity) {
+                                yield context.sendActivity(replyActivity);
+                            }
                         }
                     }
-                    break;
+                }
             }
             yield next();
         });
     }
-    classifyActivity(activity) {
-        if (activity.type === botbuilder.ActivityTypes.Message) {
-            return ActivityType.CurrentBotMessaged;
-        }
-        return ActivityType.Unknown;
-    }
     matchPattern(pattern, text) {
         if (text) {
             if (typeof pattern === "string") {
@@ -2285,41 +2352,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.
@@ -2355,7 +2387,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.
@@ -2433,7 +2465,7 @@ class Channel {
  */
 class Member {
     /**
-     * Constuctor.
+     * Constructor.
      *
      * @remarks
      * It's recommended to get members from {@link TeamsBotInstallation.members()}, instead of using this constructor.
@@ -2652,12 +2684,12 @@ class NotificationBot {
             if (this.conversationReferenceStore === undefined || this.adapter === undefined) {
                 throw new Error("NotificationBot has not been initialized.");
             }
-            const references = (yield this.conversationReferenceStore.getAll()).values();
+            const references = yield this.conversationReferenceStore.getAll();
             const targets = [];
             for (const reference of references) {
                 // validate connection
                 let valid = true;
-                this.adapter.continueConversation(reference, (context) => tslib.__awaiter(this, void 0, void 0, function* () {
+                yield this.adapter.continueConversation(reference, (context) => tslib.__awaiter(this, void 0, void 0, function* () {
                     try {
                         // try get member to see if the installation is still valid
                         yield botbuilder.TeamsInfo.getPagedMembers(context, 1);
@@ -2672,7 +2704,7 @@ class NotificationBot {
                     targets.push(new TeamsBotInstallation(this.adapter, reference));
                 }
                 else {
-                    this.conversationReferenceStore.delete(reference);
+                    yield this.conversationReferenceStore.delete(reference);
                 }
             }
             return targets;
@@ -2814,7 +2846,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.
  */
@@ -2859,7 +2890,7 @@ class MessageBuilder {
      */
     static attachAdaptiveCard(cardTemplate, data) {
         return {
-            attachments: [botbuilder.CardFactory.adaptiveCard(AdaptiveCards.declare(cardTemplate).render(data))],
+            attachments: [botbuilder.CardFactory.adaptiveCard(adaptivecardsTools.AdaptiveCards.declare(cardTemplate).render(data))],
         };
     }
     /**
@@ -2872,7 +2903,7 @@ class MessageBuilder {
      */
     static attachAdaptiveCardWithoutData(card) {
         return {
-            attachments: [botbuilder.CardFactory.adaptiveCard(AdaptiveCards.declareWithoutData(card).render())],
+            attachments: [botbuilder.CardFactory.adaptiveCard(adaptivecardsTools.AdaptiveCards.declareWithoutData(card).render())],
         };
     }
     /**