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

package/dist/index.node.cjs.js

@@ -1968,6 +1968,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
@@ -1999,8 +2034,7 @@ class NotificationMiddleware {
                     break;
                 }
                 case ActivityType.CurrentBotMessaged: {
-                    const reference = botbuilder.TurnContext.getConversationReference(context.activity);
-                    yield this.tryAddMessagedReference(reference);
+                    yield this.tryAddMessagedReference(context);
                     break;
                 }
                 case ActivityType.CurrentBotUninstalled:
@@ -2039,15 +2073,26 @@ class NotificationMiddleware {
         }
         return ActivityType.Unknown;
     }
-    tryAddMessagedReference(reference) {
-        var _a;
+    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);
+                    }
+                }
+            }
         });
     }
 }
@@ -2302,41 +2347,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.
@@ -2669,12 +2679,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);
@@ -2689,7 +2699,7 @@ class NotificationBot {
                     targets.push(new TeamsBotInstallation(this.adapter, reference));
                 }
                 else {
-                    this.conversationReferenceStore.delete(reference);
+                    yield this.conversationReferenceStore.delete(reference);
                 }
             }
             return targets;