@microsoft/teamsfx 1.2.1-alpha.c4c9ce53a.0 → 1.2.1-rc.0

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,
@@ -2675,20 +2676,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 +2723,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 +2754,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 +2823,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 +2854,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 +2931,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 +2959,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;
         });