@microsoft/teamsfx 1.2.1-alpha.cecbda807.0 → 1.2.1-rc.1

package/dist/index.node.cjs.js

@@ -563,7 +563,10 @@ class AppCredential {
      */
     loadAndValidateConfig(config) {
         internalLogger.verbose("Validate authentication configuration");
-        if (config.clientId && (config.clientSecret || config.certificateContent) && config.tenantId) {
+        if (config.clientId &&
+            (config.clientSecret || config.certificateContent) &&
+            config.tenantId &&
+            config.authorityHost) {
             return config;
         }
         const missingValues = [];
@@ -576,6 +579,9 @@ class AppCredential {
         if (!config.tenantId) {
             missingValues.push("tenantId");
         }
+        if (!config.authorityHost) {
+            missingValues.push("authorityHost");
+        }
         const errorMsg = formatString(ErrorMessage.InvalidConfiguration, missingValues.join(", "), "undefined");
         internalLogger.error(errorMsg);
         throw new ErrorWithCode(errorMsg, exports.ErrorCode.InvalidConfiguration);
@@ -1294,9 +1300,6 @@ class TeamsBotSsoPrompt extends botbuilderDialogs.Dialog {
         if (!this.teamsfx.hasConfig("tenantId")) {
             missingConfigurations.push("tenantId");
         }
-        if (!this.teamsfx.hasConfig("applicationIdUri")) {
-            missingConfigurations.push("applicationIdUri");
-        }
         if (missingConfigurations.length != 0) {
             const errorMsg = formatString(ErrorMessage.InvalidConfiguration, missingConfigurations.join(", "), "undefined");
             internalLogger.error(errorMsg);
@@ -1349,9 +1352,7 @@ class TeamsBotSsoPrompt extends botbuilderDialogs.Dialog {
         internalLogger.verbose("Sign in link: " + signInLink);
         const tokenExchangeResource = {
             id: uuid.v4(),
-            uri: this.teamsfx.getConfig("applicationIdUri").replace(/\/$/, "") + "/access_as_user",
         };
-        internalLogger.verbose("Token exchange resource uri: " + tokenExchangeResource.uri);
         return {
             signInLink: signInLink,
             tokenExchangeResource: tokenExchangeResource,
@@ -2440,8 +2441,17 @@ function getTargetType(conversationReference) {
  * @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;
+    var _a, _b, _c;
+    const teamId = (_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;
+    if (teamId) {
+        return teamId;
+    }
+    // Fallback to use conversation id.
+    // the conversation id is equal to team id only when the bot app is installed into the General channel.
+    if (context.activity.conversation.name === undefined) {
+        return context.activity.conversation.id;
+    }
+    return undefined;
 }
 
 // Copyright (c) Microsoft Corporation.
@@ -2675,20 +2685,24 @@ class ConversationReferenceStore {
  *
  * @param target - the notification target.
  * @param text - the plain text message.
+ * @param onError - an optional error handler that can catch exceptions during message sending.
+ * If not defined, error will be handled by `BotAdapter.onTurnError`.
  * @returns the response of sending message.
  */
-function sendMessage(target, text) {
-    return target.sendMessage(text);
+function sendMessage(target, text, onError) {
+    return target.sendMessage(text, onError);
 }
 /**
  * Send an adaptive card message to a notification target.
  *
  * @param target - the notification target.
  * @param card - the adaptive card raw JSON.
+ * @param onError - an optional error handler that can catch exceptions during adaptive card sending.
+ * If not defined, error will be handled by `BotAdapter.onTurnError`.
  * @returns the response of sending adaptive card message.
  */
-function sendAdaptiveCard(target, card) {
-    return target.sendAdaptiveCard(card);
+function sendAdaptiveCard(target, card, onError) {
+    return target.sendAdaptiveCard(card, onError);
 }
 /**
  * A {@link NotificationTarget} that represents a team channel.
@@ -2718,16 +2732,28 @@ class Channel {
      * Send a plain text message.
      *
      * @param text - the plain text message.
+     * @param onError - an optional error handler that can catch exceptions during message sending.
+     * If not defined, error will be handled by `BotAdapter.onTurnError`.
      * @returns the response of sending message.
      */
-    sendMessage(text) {
+    sendMessage(text, onError) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const response = {};
             yield this.parent.adapter.continueConversation(this.parent.conversationReference, (context) => tslib.__awaiter(this, void 0, void 0, function* () {
                 const conversation = yield this.newConversation(context);
                 yield this.parent.adapter.continueConversation(conversation, (ctx) => tslib.__awaiter(this, void 0, void 0, function* () {
-                    const res = yield ctx.sendActivity(text);
-                    response.id = res === null || res === void 0 ? void 0 : res.id;
+                    try {
+                        const res = yield ctx.sendActivity(text);
+                        response.id = res === null || res === void 0 ? void 0 : res.id;
+                    }
+                    catch (error) {
+                        if (onError) {
+                            yield onError(ctx, error);
+                        }
+                        else {
+                            throw error;
+                        }
+                    }
                 }));
             }));
             return response;
@@ -2737,18 +2763,30 @@ class Channel {
      * Send an adaptive card message.
      *
      * @param card - the adaptive card raw JSON.
+     * @param onError - an optional error handler that can catch exceptions during adaptive card sending.
+     * If not defined, error will be handled by `BotAdapter.onTurnError`.
      * @returns the response of sending adaptive card message.
      */
-    sendAdaptiveCard(card) {
+    sendAdaptiveCard(card, onError) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const response = {};
             yield this.parent.adapter.continueConversation(this.parent.conversationReference, (context) => tslib.__awaiter(this, void 0, void 0, function* () {
                 const conversation = yield this.newConversation(context);
                 yield this.parent.adapter.continueConversation(conversation, (ctx) => tslib.__awaiter(this, void 0, void 0, function* () {
-                    const res = yield ctx.sendActivity({
-                        attachments: [botbuilder.CardFactory.adaptiveCard(card)],
-                    });
-                    response.id = res === null || res === void 0 ? void 0 : res.id;
+                    try {
+                        const res = yield ctx.sendActivity({
+                            attachments: [botbuilder.CardFactory.adaptiveCard(card)],
+                        });
+                        response.id = res === null || res === void 0 ? void 0 : res.id;
+                    }
+                    catch (error) {
+                        if (onError) {
+                            yield onError(ctx, error);
+                        }
+                        else {
+                            throw error;
+                        }
+                    }
                 }));
             }));
             return response;
@@ -2794,16 +2832,28 @@ class Member {
      * Send a plain text message.
      *
      * @param text - the plain text message.
+     * @param onError - an optional error handler that can catch exceptions during message sending.
+     * If not defined, error will be handled by `BotAdapter.onTurnError`.
      * @returns the response of sending message.
      */
-    sendMessage(text) {
+    sendMessage(text, onError) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const response = {};
             yield this.parent.adapter.continueConversation(this.parent.conversationReference, (context) => tslib.__awaiter(this, void 0, void 0, function* () {
                 const conversation = yield this.newConversation(context);
                 yield this.parent.adapter.continueConversation(conversation, (ctx) => tslib.__awaiter(this, void 0, void 0, function* () {
-                    const res = yield ctx.sendActivity(text);
-                    response.id = res === null || res === void 0 ? void 0 : res.id;
+                    try {
+                        const res = yield ctx.sendActivity(text);
+                        response.id = res === null || res === void 0 ? void 0 : res.id;
+                    }
+                    catch (error) {
+                        if (onError) {
+                            yield onError(ctx, error);
+                        }
+                        else {
+                            throw error;
+                        }
+                    }
                 }));
             }));
             return response;
@@ -2813,18 +2863,30 @@ class Member {
      * Send an adaptive card message.
      *
      * @param card - the adaptive card raw JSON.
+     * @param onError - an optional error handler that can catch exceptions during adaptive card sending.
+     * If not defined, error will be handled by `BotAdapter.onTurnError`.
      * @returns the response of sending adaptive card message.
      */
-    sendAdaptiveCard(card) {
+    sendAdaptiveCard(card, onError) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const response = {};
             yield this.parent.adapter.continueConversation(this.parent.conversationReference, (context) => tslib.__awaiter(this, void 0, void 0, function* () {
                 const conversation = yield this.newConversation(context);
                 yield this.parent.adapter.continueConversation(conversation, (ctx) => tslib.__awaiter(this, void 0, void 0, function* () {
-                    const res = yield ctx.sendActivity({
-                        attachments: [botbuilder.CardFactory.adaptiveCard(card)],
-                    });
-                    response.id = res === null || res === void 0 ? void 0 : res.id;
+                    try {
+                        const res = yield ctx.sendActivity({
+                            attachments: [botbuilder.CardFactory.adaptiveCard(card)],
+                        });
+                        response.id = res === null || res === void 0 ? void 0 : res.id;
+                    }
+                    catch (error) {
+                        if (onError) {
+                            yield onError(ctx, error);
+                        }
+                        else {
+                            throw error;
+                        }
+                    }
                 }));
             }));
             return response;
@@ -2878,14 +2940,26 @@ class TeamsBotInstallation {
      * Send a plain text message.
      *
      * @param text - the plain text message.
+     * @param onError - an optional error handler that can catch exceptions during message sending.
+     * If not defined, error will be handled by `BotAdapter.onTurnError`.
      * @returns the response of sending message.
      */
-    sendMessage(text) {
+    sendMessage(text, onError) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const response = {};
             yield this.adapter.continueConversation(this.conversationReference, (context) => tslib.__awaiter(this, void 0, void 0, function* () {
-                const res = yield context.sendActivity(text);
-                response.id = res === null || res === void 0 ? void 0 : res.id;
+                try {
+                    const res = yield context.sendActivity(text);
+                    response.id = res === null || res === void 0 ? void 0 : res.id;
+                }
+                catch (error) {
+                    if (onError) {
+                        yield onError(context, error);
+                    }
+                    else {
+                        throw error;
+                    }
+                }
             }));
             return response;
         });
@@ -2894,16 +2968,28 @@ class TeamsBotInstallation {
      * Send an adaptive card message.
      *
      * @param card - the adaptive card raw JSON.
+     * @param onError - an optional error handler that can catch exceptions during adaptive card sending.
+     * If not defined, error will be handled by `BotAdapter.onTurnError`.
      * @returns the response of sending adaptive card message.
      */
-    sendAdaptiveCard(card) {
+    sendAdaptiveCard(card, onError) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             const response = {};
             yield this.adapter.continueConversation(this.conversationReference, (context) => tslib.__awaiter(this, void 0, void 0, function* () {
-                const res = yield context.sendActivity({
-                    attachments: [botbuilder.CardFactory.adaptiveCard(card)],
-                });
-                response.id = res === null || res === void 0 ? void 0 : res.id;
+                try {
+                    const res = yield context.sendActivity({
+                        attachments: [botbuilder.CardFactory.adaptiveCard(card)],
+                    });
+                    response.id = res === null || res === void 0 ? void 0 : res.id;
+                }
+                catch (error) {
+                    if (onError) {
+                        yield onError(context, error);
+                    }
+                    else {
+                        throw error;
+                    }
+                }
             }));
             return response;
         });
@@ -3060,6 +3146,7 @@ class NotificationBot {
     }
     /**
      * Returns the first {@link Channel} where predicate is true, and undefined otherwise.
+     * (Ensure the bot app is installed into the `General` channel, otherwise undefined will be returned.)
      *
      * @param predicate find calls predicate once for each channel of the installation,
      * until it finds one where predicate returns true. If such a channel is found, find
@@ -3106,6 +3193,7 @@ class NotificationBot {
     }
     /**
      * Returns all {@link Channel} where predicate is true, and empty array otherwise.
+     * (Ensure the bot app is installed into the `General` channel, otherwise empty array will be returned.)
      *
      * @param predicate find calls predicate for each channel of the installation.
      * @returns an array of {@link Channel} where predicate is true, and empty array otherwise.