@microsoft/teamsfx 2.2.3-alpha.9b38c38b5.0 → 2.2.3-alpha.dea6b9e8a.0

package/dist/index.esm2017.mjs

@@ -396,6 +396,7 @@ function getAuthority(authorityHost, tenantId) {
     return normalizedAuthorityHost + "/" + tenantId;
 }
 
+// Copyright (c) Microsoft Corporation.
 /**
  * @internal
  */
@@ -713,16 +714,16 @@ class TeamsUserCredential {
      * @remarks
      * Can only be used within Teams.
      */
-    async login(scopes, resources) {
-        throw new ErrorWithCode(formatString(ErrorMessage.NodejsRuntimeNotSupported, "TeamsUserCredential"), ErrorCode.RuntimeNotSupported);
+    login(scopes, resources) {
+        return Promise.reject(new ErrorWithCode(formatString(ErrorMessage.NodejsRuntimeNotSupported, "TeamsUserCredential"), ErrorCode.RuntimeNotSupported));
     }
     /**
      * Get access token from credential.
      * @remarks
      * Can only be used within Teams.
      */
-    async getToken(scopes, options) {
-        throw new ErrorWithCode(formatString(ErrorMessage.NodejsRuntimeNotSupported, "TeamsUserCredential"), ErrorCode.RuntimeNotSupported);
+    getToken(scopes, options) {
+        return Promise.reject(new ErrorWithCode(formatString(ErrorMessage.NodejsRuntimeNotSupported, "TeamsUserCredential"), ErrorCode.RuntimeNotSupported));
     }
     /**
      * Get basic user info from SSO token
@@ -733,7 +734,7 @@ class TeamsUserCredential {
      * Can only be used within Teams.
      */
     getUserInfo(resources) {
-        throw new ErrorWithCode(formatString(ErrorMessage.NodejsRuntimeNotSupported, "TeamsUserCredential"), ErrorCode.RuntimeNotSupported);
+        return Promise.reject(new ErrorWithCode(formatString(ErrorMessage.NodejsRuntimeNotSupported, "TeamsUserCredential"), ErrorCode.RuntimeNotSupported));
     }
 }
 
@@ -769,7 +770,7 @@ class MsGraphAuthProvider {
      *
      */
     async getAccessToken() {
-        internalLogger.info(`Get Graph Access token with scopes: '${this.scopes}'`);
+        internalLogger.info(`Get Graph Access token with scopes: '${this.scopes.toString()}'`);
         let accessToken;
         if (this.credentialOrTeamsFx.getCredential) {
             accessToken = await this.credentialOrTeamsFx
@@ -1007,7 +1008,7 @@ function isMsiAuthentication(teamsfx) {
 function generateDefaultConfig(teamsfx, databaseName) {
     internalLogger.verbose(`SQL server ${teamsfx.getConfig("sqlServerEndpoint")}
     , user name ${teamsfx.getConfig("sqlUsername")}
-    , database name ${databaseName}`);
+    , database name ${databaseName ? databaseName : ""}`);
     const config = {
         server: teamsfx.getConfig("sqlServerEndpoint"),
         authentication: {
@@ -1060,7 +1061,7 @@ async function generateTokenConfig(teamsfx, databaseName) {
         };
         internalLogger.verbose(`Generate token configuration success
       , server endpoint is ${teamsfx.getConfig("sqlServerEndpoint")}
-      , database name is ${databaseName}`);
+      , database name is ${databaseName ? databaseName : ""}`);
         return config;
     }
     internalLogger.error(`Generate token configuration
@@ -1328,7 +1329,8 @@ class TeamsBotSsoPrompt extends Dialog {
     async sendOAuthCardAsync(context) {
         internalLogger.verbose("Send OAuth card to get SSO token");
         const account = await TeamsInfo.getMember(context, context.activity.from.id);
-        internalLogger.verbose("Get Teams member account user principal name: " + account.userPrincipalName);
+        internalLogger.verbose("Get Teams member account user principal name: " +
+            (account.userPrincipalName ? account.userPrincipalName : ""));
         const loginHint = account.userPrincipalName ? account.userPrincipalName : "";
         const signInResource = this.getSignInResource(loginHint);
         const card = CardFactory.oauthCard("", "Teams SSO Sign In", "Sign In", signInResource.signInLink, signInResource.tokenExchangeResource);
@@ -1528,18 +1530,18 @@ class BasicAuthProvider {
      * @throws {@link ErrorCode|AuthorizationInfoAlreadyExists} - when Authorization header or auth property already exists in request configuration.
      * @throws {@link ErrorCode|RuntimeNotSupported} when runtime is browser.
      */
-    async AddAuthenticationInfo(config) {
+    AddAuthenticationInfo(config) {
         if (config.headers && config.headers["Authorization"]) {
-            throw new ErrorWithCode(ErrorMessage.AuthorizationHeaderAlreadyExists, ErrorCode.AuthorizationInfoAlreadyExists);
+            return Promise.reject(new ErrorWithCode(ErrorMessage.AuthorizationHeaderAlreadyExists, ErrorCode.AuthorizationInfoAlreadyExists));
         }
         if (config.auth) {
-            throw new ErrorWithCode(ErrorMessage.BasicCredentialAlreadyExists, ErrorCode.AuthorizationInfoAlreadyExists);
+            return Promise.reject(new ErrorWithCode(ErrorMessage.BasicCredentialAlreadyExists, ErrorCode.AuthorizationInfoAlreadyExists));
         }
         config.auth = {
             username: this.userName,
             password: this.password,
         };
-        return config;
+        return Promise.resolve(config);
     }
 }
 
@@ -1579,14 +1581,14 @@ class ApiKeyProvider {
      * @throws {@link ErrorCode|AuthorizationInfoAlreadyExists} - when API key already exists in request header or url query parameter.
      * @throws {@link ErrorCode|RuntimeNotSupported} when runtime is browser.
      */
-    async AddAuthenticationInfo(config) {
+    AddAuthenticationInfo(config) {
         switch (this.keyLocation) {
             case ApiKeyLocation.Header:
                 if (!config.headers) {
                     config.headers = {};
                 }
                 if (config.headers[this.keyName]) {
-                    throw new ErrorWithCode(formatString(ErrorMessage.DuplicateApiKeyInHeader, this.keyName), ErrorCode.AuthorizationInfoAlreadyExists);
+                    return Promise.reject(new ErrorWithCode(formatString(ErrorMessage.DuplicateApiKeyInHeader, this.keyName), ErrorCode.AuthorizationInfoAlreadyExists));
                 }
                 config.headers[this.keyName] = this.keyValue;
                 break;
@@ -1600,12 +1602,12 @@ class ApiKeyProvider {
                     urlHasDefinedApiKey = url.searchParams.has(this.keyName);
                 }
                 if (config.params[this.keyName] || urlHasDefinedApiKey) {
-                    throw new ErrorWithCode(formatString(ErrorMessage.DuplicateApiKeyInQueryParam, this.keyName), ErrorCode.AuthorizationInfoAlreadyExists);
+                    return Promise.reject(new ErrorWithCode(formatString(ErrorMessage.DuplicateApiKeyInQueryParam, this.keyName), ErrorCode.AuthorizationInfoAlreadyExists));
                 }
                 config.params[this.keyName] = this.keyValue;
                 break;
         }
-        return config;
+        return Promise.resolve(config);
     }
 }
 /**
@@ -1652,7 +1654,7 @@ class CertificateAuthProvider {
      *
      * @throws {@link ErrorCode|InvalidParameter} - when custom httpsAgent in the request has duplicate properties with certOption provided in constructor.
      */
-    async AddAuthenticationInfo(config) {
+    AddAuthenticationInfo(config) {
         if (!config.httpsAgent) {
             config.httpsAgent = new Agent(this.certOption);
         }
@@ -1660,12 +1662,12 @@ class CertificateAuthProvider {
             const existingProperties = new Set(Object.keys(config.httpsAgent.options));
             for (const property of Object.keys(this.certOption)) {
                 if (existingProperties.has(property)) {
-                    throw new ErrorWithCode(formatString(ErrorMessage.DuplicateHttpsOptionProperty, property), ErrorCode.InvalidParameter);
+                    return Promise.reject(new ErrorWithCode(formatString(ErrorMessage.DuplicateHttpsOptionProperty, property), ErrorCode.InvalidParameter));
                 }
             }
             Object.assign(config.httpsAgent.options, this.certOption);
         }
-        return config;
+        return Promise.resolve(config);
     }
 }
 /**
@@ -2719,7 +2721,7 @@ class Channel$1 {
     async sendMessage(text, onError) {
         const response = {};
         await this.parent.adapter.continueConversation(this.parent.conversationReference, async (context) => {
-            const conversation = await this.newConversation(context);
+            const conversation = this.newConversation(context);
             await this.parent.adapter.continueConversation(conversation, async (ctx) => {
                 try {
                     const res = await ctx.sendActivity(text);
@@ -2748,7 +2750,7 @@ class Channel$1 {
     async sendAdaptiveCard(card, onError) {
         const response = {};
         await this.parent.adapter.continueConversation(this.parent.conversationReference, async (context) => {
-            const conversation = await this.newConversation(context);
+            const conversation = this.newConversation(context);
             await this.parent.adapter.continueConversation(conversation, async (ctx) => {
                 try {
                     const res = await ctx.sendActivity({
@@ -2771,7 +2773,7 @@ class Channel$1 {
     /**
      * @internal
      */
-    async newConversation(context) {
+    newConversation(context) {
         const reference = TurnContext.getConversationReference(context.activity);
         const channelConversation = cloneConversation(reference);
         channelConversation.conversation.id = this.info.id || "";
@@ -4245,11 +4247,11 @@ class Channel {
     /**
      * @internal
      */
-    async newConversation(context) {
+    newConversation(context) {
         const reference = TurnContext.getConversationReference(context.activity);
         const channelConversation = cloneConversation(reference);
         channelConversation.conversation.id = this.info.id || "";
-        return channelConversation;
+        return Promise.resolve(channelConversation);
     }
 }
 /**
@@ -4556,6 +4558,27 @@ class NotificationBot {
         }
         return new TeamsBotInstallation(this.adapter, conversationReference, this.botAppId);
     }
+    /**
+     * Validate the installation by getting paged memebers.
+     *
+     * @param conversationReference The bound `ConversationReference`.
+     * @returns Returns false if recieves `BotNotInConversationRoster` error, otherwise returns true.
+     */
+    async validateInstallation(conversationReference) {
+        let isValid = true;
+        await this.adapter.continueConversationAsync(this.botAppId, conversationReference, async (context) => {
+            try {
+                // try get member to see if the installation is still valid
+                await TeamsInfo.getPagedMembers(context, 1);
+            }
+            catch (error) {
+                if (error.code === "BotNotInConversationRoster") {
+                    isValid = false;
+                }
+            }
+        });
+        return isValid;
+    }
     /**
      * Gets a pagined list of targets where the bot is installed.
      *
@@ -4567,7 +4590,7 @@ class NotificationBot {
      *
      * @returns An array of {@link TeamsBotInstallation} with paged data and continuation token.
      */
-    async getPagedInstallations(pageSize, continuationToken) {
+    async getPagedInstallations(pageSize, continuationToken, validationEnabled = true) {
         if (this.conversationReferenceStore === undefined || this.adapter === undefined) {
             throw new Error("NotificationBot has not been initialized.");
         }
@@ -4575,19 +4598,12 @@ class NotificationBot {
         const targets = [];
         for (const reference of references.data) {
             // validate connection
-            let valid = true;
-            await this.adapter.continueConversationAsync(this.botAppId, reference, async (context) => {
-                try {
-                    // try get member to see if the installation is still valid
-                    await TeamsInfo.getPagedMembers(context, 1);
-                }
-                catch (error) {
-                    if (error.code === "BotNotInConversationRoster") {
-                        valid = false;
-                    }
-                }
-            });
-            if (valid) {
+            let valid;
+            if (validationEnabled) {
+                // try get member to see if the installation is still valid
+                valid = await this.validateInstallation(reference);
+            }
+            if (!validationEnabled || (validationEnabled && valid)) {
                 targets.push(new TeamsBotInstallation(this.adapter, reference, this.botAppId));
             }
             else {
@@ -4849,9 +4865,9 @@ class ConversationBot {
         // the default error handler
         adapter.onTurnError = async (context, error) => {
             // This check writes out errors to console.
-            console.error(`[onTurnError] unhandled error: ${error}`);
+            console.error(`[onTurnError] unhandled error`, error);
             // Send a trace activity, which will be displayed in Bot Framework Emulator
-            await context.sendTraceActivity("OnTurnError Trace", `${error}`, "https://www.botframework.com/schemas/error", "TurnError");
+            await context.sendTraceActivity("OnTurnError Trace", error instanceof Error ? error.message : error, "https://www.botframework.com/schemas/error", "TurnError");
             // Send a message to the user
             await context.sendActivity(`The bot encountered unhandled error: ${error.message}`);
             await context.sendActivity("To continue to run this bot, please fix the bot source code.");