@microsoft/teamsfx 2.2.3-alpha.0237b70e3.0 → 2.2.3-alpha.13d1e618d.0

package/dist/index.node.cjs.js

@@ -854,7 +854,7 @@ class MsGraphAuthProvider {
  * };
  * const prompt = new TeamsBotSsoPrompt(dialogId, {
  *    config: config
- *    scopes: '["User.Read"],
+ *    scopes: ["User.Read"],
  * });
  * this.addDialog(prompt);
  *
@@ -1584,19 +1584,17 @@ class BasicAuthProvider {
      * @throws {@link ErrorCode|RuntimeNotSupported} when runtime is browser.
      */
     AddAuthenticationInfo(config) {
-        return tslib.__awaiter(this, void 0, void 0, function* () {
-            if (config.headers && config.headers["Authorization"]) {
-                throw new ErrorWithCode(ErrorMessage.AuthorizationHeaderAlreadyExists, exports.ErrorCode.AuthorizationInfoAlreadyExists);
-            }
-            if (config.auth) {
-                throw new ErrorWithCode(ErrorMessage.BasicCredentialAlreadyExists, exports.ErrorCode.AuthorizationInfoAlreadyExists);
-            }
-            config.auth = {
-                username: this.userName,
-                password: this.password,
-            };
-            return config;
-        });
+        if (config.headers && config.headers["Authorization"]) {
+            return Promise.reject(new ErrorWithCode(ErrorMessage.AuthorizationHeaderAlreadyExists, exports.ErrorCode.AuthorizationInfoAlreadyExists));
+        }
+        if (config.auth) {
+            return Promise.reject(new ErrorWithCode(ErrorMessage.BasicCredentialAlreadyExists, exports.ErrorCode.AuthorizationInfoAlreadyExists));
+        }
+        config.auth = {
+            username: this.userName,
+            password: this.password,
+        };
+        return Promise.resolve(config);
     }
 }
 
@@ -1637,34 +1635,32 @@ class ApiKeyProvider {
      * @throws {@link ErrorCode|RuntimeNotSupported} when runtime is browser.
      */
     AddAuthenticationInfo(config) {
-        return tslib.__awaiter(this, void 0, void 0, function* () {
-            switch (this.keyLocation) {
-                case exports.ApiKeyLocation.Header:
-                    if (!config.headers) {
-                        config.headers = {};
-                    }
-                    if (config.headers[this.keyName]) {
-                        throw new ErrorWithCode(formatString(ErrorMessage.DuplicateApiKeyInHeader, this.keyName), exports.ErrorCode.AuthorizationInfoAlreadyExists);
-                    }
-                    config.headers[this.keyName] = this.keyValue;
-                    break;
-                case exports.ApiKeyLocation.QueryParams:
-                    if (!config.params) {
-                        config.params = {};
-                    }
-                    let urlHasDefinedApiKey = false;
-                    if (config.url) {
-                        const url = new URL(config.url, config.baseURL);
-                        urlHasDefinedApiKey = url.searchParams.has(this.keyName);
-                    }
-                    if (config.params[this.keyName] || urlHasDefinedApiKey) {
-                        throw new ErrorWithCode(formatString(ErrorMessage.DuplicateApiKeyInQueryParam, this.keyName), exports.ErrorCode.AuthorizationInfoAlreadyExists);
-                    }
-                    config.params[this.keyName] = this.keyValue;
-                    break;
-            }
-            return config;
-        });
+        switch (this.keyLocation) {
+            case exports.ApiKeyLocation.Header:
+                if (!config.headers) {
+                    config.headers = {};
+                }
+                if (config.headers[this.keyName]) {
+                    return Promise.reject(new ErrorWithCode(formatString(ErrorMessage.DuplicateApiKeyInHeader, this.keyName), exports.ErrorCode.AuthorizationInfoAlreadyExists));
+                }
+                config.headers[this.keyName] = this.keyValue;
+                break;
+            case exports.ApiKeyLocation.QueryParams:
+                if (!config.params) {
+                    config.params = {};
+                }
+                let urlHasDefinedApiKey = false;
+                if (config.url) {
+                    const url = new URL(config.url, config.baseURL);
+                    urlHasDefinedApiKey = url.searchParams.has(this.keyName);
+                }
+                if (config.params[this.keyName] || urlHasDefinedApiKey) {
+                    return Promise.reject(new ErrorWithCode(formatString(ErrorMessage.DuplicateApiKeyInQueryParam, this.keyName), exports.ErrorCode.AuthorizationInfoAlreadyExists));
+                }
+                config.params[this.keyName] = this.keyValue;
+                break;
+        }
+        return Promise.resolve(config);
     }
 }
 /**
@@ -1712,21 +1708,19 @@ class CertificateAuthProvider {
      * @throws {@link ErrorCode|InvalidParameter} - when custom httpsAgent in the request has duplicate properties with certOption provided in constructor.
      */
     AddAuthenticationInfo(config) {
-        return tslib.__awaiter(this, void 0, void 0, function* () {
-            if (!config.httpsAgent) {
-                config.httpsAgent = new https.Agent(this.certOption);
-            }
-            else {
-                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), exports.ErrorCode.InvalidParameter);
-                    }
+        if (!config.httpsAgent) {
+            config.httpsAgent = new https.Agent(this.certOption);
+        }
+        else {
+            const existingProperties = new Set(Object.keys(config.httpsAgent.options));
+            for (const property of Object.keys(this.certOption)) {
+                if (existingProperties.has(property)) {
+                    return Promise.reject(new ErrorWithCode(formatString(ErrorMessage.DuplicateHttpsOptionProperty, property), exports.ErrorCode.InvalidParameter));
                 }
-                Object.assign(config.httpsAgent.options, this.certOption);
             }
-            return config;
-        });
+            Object.assign(config.httpsAgent.options, this.certOption);
+        }
+        return Promise.resolve(config);
     }
 }
 /**
@@ -2813,7 +2807,7 @@ class Channel$1 {
         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);
+                const conversation = this.newConversation(context);
                 yield this.parent.adapter.continueConversation(conversation, (ctx) => tslib.__awaiter(this, void 0, void 0, function* () {
                     try {
                         const res = yield ctx.sendActivity(text);
@@ -2844,7 +2838,7 @@ class Channel$1 {
         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);
+                const conversation = this.newConversation(context);
                 yield this.parent.adapter.continueConversation(conversation, (ctx) => tslib.__awaiter(this, void 0, void 0, function* () {
                     try {
                         const res = yield ctx.sendActivity({
@@ -2869,12 +2863,10 @@ class Channel$1 {
      * @internal
      */
     newConversation(context) {
-        return tslib.__awaiter(this, void 0, void 0, function* () {
-            const reference = botbuilder.TurnContext.getConversationReference(context.activity);
-            const channelConversation = cloneConversation(reference);
-            channelConversation.conversation.id = this.info.id || "";
-            return channelConversation;
-        });
+        const reference = botbuilder.TurnContext.getConversationReference(context.activity);
+        const channelConversation = cloneConversation(reference);
+        channelConversation.conversation.id = this.info.id || "";
+        return channelConversation;
     }
 }
 /**
@@ -4736,6 +4728,29 @@ 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.
+     */
+    validateInstallation(conversationReference) {
+        return tslib.__awaiter(this, void 0, void 0, function* () {
+            let isValid = true;
+            yield this.adapter.continueConversationAsync(this.botAppId, conversationReference, (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);
+                }
+                catch (error) {
+                    if (error.code === "BotNotInConversationRoster") {
+                        isValid = false;
+                    }
+                }
+            }));
+            return isValid;
+        });
+    }
     /**
      * Gets a pagined list of targets where the bot is installed.
      *
@@ -4747,7 +4762,7 @@ class NotificationBot {
      *
      * @returns An array of {@link TeamsBotInstallation} with paged data and continuation token.
      */
-    getPagedInstallations(pageSize, continuationToken) {
+    getPagedInstallations(pageSize, continuationToken, validationEnabled = true) {
         return tslib.__awaiter(this, void 0, void 0, function* () {
             if (this.conversationReferenceStore === undefined || this.adapter === undefined) {
                 throw new Error("NotificationBot has not been initialized.");
@@ -4756,19 +4771,12 @@ class NotificationBot {
             const targets = [];
             for (const reference of references.data) {
                 // validate connection
-                let valid = true;
-                yield this.adapter.continueConversationAsync(this.botAppId, 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);
-                    }
-                    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 = yield this.validateInstallation(reference);
+                }
+                if (!validationEnabled || (validationEnabled && valid)) {
                     targets.push(new TeamsBotInstallation(this.adapter, reference, this.botAppId));
                 }
                 else {