@microsoft/teamsfx 0.7.1-beta.94bfabf9b.0 → 0.7.1-beta.dc88fcdc0.0

package/dist/index.esm2017.mjs

@@ -1902,6 +1902,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
@@ -1932,8 +1967,7 @@ class NotificationMiddleware {
                 break;
             }
             case ActivityType.CurrentBotMessaged: {
-                const reference = TurnContext.getConversationReference(context.activity);
-                await this.tryAddMessagedReference(reference);
+                await this.tryAddMessagedReference(context);
                 break;
             }
             case ActivityType.CurrentBotUninstalled:
@@ -1971,14 +2005,25 @@ class NotificationMiddleware {
         }
         return ActivityType.Unknown;
     }
-    async tryAddMessagedReference(reference) {
-        var _a;
+    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 {
@@ -2218,41 +2263,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.
@@ -2572,12 +2582,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);
@@ -2592,7 +2602,7 @@ class NotificationBot {
                 targets.push(new TeamsBotInstallation(this.adapter, reference));
             }
             else {
-                this.conversationReferenceStore.delete(reference);
+                await this.conversationReferenceStore.delete(reference);
             }
         }
         return targets;