@microsoft/teamsfx-core 3.1.0 → 3.1.1

package/build/client/teamsDevPortalClient.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.teamsDevPortalClient = exports.TeamsDevPortalClient = exports.RetryHandler = void 0;
+exports.teamsDevPortalClient = exports.TeamsDevPortalClient = void 0;
 const tslib_1 = require("tslib");
 const hooks_1 = require("@feathersjs/hooks");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
@@ -10,46 +10,23 @@ const axios_1 = tslib_1.__importDefault(require("axios"));
 const constants_1 = require("../common/constants");
 const globalVars_1 = require("../common/globalVars");
 const localizeUtils_1 = require("../common/localizeUtils");
-const telemetry_1 = require("../common/telemetry");
+const retryHandler_1 = require("../common/retryHandler");
+const telemetry = tslib_1.__importStar(require("../common/telemetry"));
 const wrappedAxiosClient_1 = require("../common/wrappedAxiosClient");
 const commonConstant_1 = require("../component/constant/commonConstant");
-const constants_2 = require("../component/driver/teamsApp/constants");
+const signInAudienceNotAllowedError_1 = require("../component/driver/aad/error/signInAudienceNotAllowedError");
+const signInAudience_1 = require("../component/driver/aad/interface/signInAudience");
+const constants_2 = require("../component/driver/aad/utility/constants");
+const constants_3 = require("../component/driver/teamsApp/constants");
 const errors_1 = require("../component/driver/teamsApp/errors");
 const ManifestUtils_1 = require("../component/driver/teamsApp/utils/ManifestUtils");
 const IBotRegistration_1 = require("../component/resource/botService/appStudio/interfaces/IBotRegistration");
 const common_1 = require("../component/resource/botService/common");
-const constants_3 = require("../component/resource/botService/constants");
+const constants_4 = require("../component/resource/botService/constants");
 const errors_2 = require("../component/resource/botService/errors");
 const messages_1 = require("../component/resource/botService/messages");
 const strings_1 = require("../component/resource/botService/strings");
 const teamsApp_1 = require("../error/teamsApp");
-const signInAudience_1 = require("../component/driver/aad/interface/signInAudience");
-const constants_4 = require("../component/driver/aad/utility/constants");
-const signInAudienceNotAllowedError_1 = require("../component/driver/aad/error/signInAudienceNotAllowedError");
-class RetryHandler {
-    static RETRIES = 6;
-    static async Retry(fn) {
-        let retries = this.RETRIES;
-        let response;
-        while (retries > 0) {
-            retries = retries - 1;
-            try {
-                response = await fn();
-                return response;
-            }
-            catch (e) {
-                // Directly throw 404 error, keep trying for other status code e.g. 503 400
-                if (retries <= 0 || e.response?.status == 404 || e.response?.status == 409) {
-                    throw e;
-                }
-                else {
-                    await new Promise((resolve) => setTimeout(resolve, 5000));
-                }
-            }
-        }
-    }
-}
-exports.RetryHandler = RetryHandler;
 class TeamsDevPortalClient {
     regionEndpoint;
     setRegionEndpoint(regionEndpoint) {
@@ -65,7 +42,7 @@ class TeamsDevPortalClient {
         });
         requester.defaults.headers.common["Authorization"] = `Bearer ${authSvcToken}`;
         requester.defaults.headers.common["Client-Source"] = "teamstoolkit";
-        const response = await RetryHandler.Retry(() => requester.post("/v1.0/users/region"));
+        const response = await retryHandler_1.RetryHandler.Retry(() => requester.post("/v1.0/users/region"));
         this.regionEndpoint = response?.data?.regionGtms?.teamsDevPortal;
     }
     getEndpoint() {
@@ -95,7 +72,7 @@ class TeamsDevPortalClient {
         try {
             const requester = this.createRequesterWithToken(token);
             globalVars_1.TOOLS.logProvider.debug(`Sent API Request: ${this.getEndpoint()}/api/appdefinitions/v2/import`);
-            const response = await RetryHandler.Retry(() => requester.post(`/api/appdefinitions/v2/import`, file, {
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.post(`/api/appdefinitions/v2/import`, file, {
                 headers: { "Content-Type": "application/zip" },
                 params: {
                     overwriteIfAppAlreadyExists: overwrite,
@@ -107,18 +84,18 @@ class TeamsDevPortalClient {
                 return app;
             }
             else {
-                throw this.wrapException(new Error("cannot create teams app"), constants_2.APP_STUDIO_API_NAMES.CREATE_APP);
+                throw this.wrapException(new Error("cannot create teams app"), constants_3.APP_STUDIO_API_NAMES.CREATE_APP);
             }
         }
         catch (e) {
             if (e.response?.status === 409) {
-                throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.CREATE_APP, errors_1.AppStudioError.TeamsAppCreateConflictError.name, errors_1.AppStudioError.TeamsAppCreateConflictError.message()[0], errors_1.AppStudioError.TeamsAppCreateConflictError.message()[1], true, constants_1.HelpLinks.SwitchTenant);
+                throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.CREATE_APP, errors_1.AppStudioError.TeamsAppCreateConflictError.name, errors_1.AppStudioError.TeamsAppCreateConflictError.message()[0], errors_1.AppStudioError.TeamsAppCreateConflictError.message()[1], true, constants_1.HelpLinks.SwitchTenant);
             }
             // Corner case: The provided app ID conflict with an existing published app
             // See Developer Portal PR: 507264
             if (e.response?.status == 422 &&
                 e.response?.data.includes("App already exists and published")) {
-                throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.CREATE_APP, errors_1.AppStudioError.TeamsAppCreateConflictWithPublishedAppError.name, errors_1.AppStudioError.TeamsAppCreateConflictWithPublishedAppError.message()[0], errors_1.AppStudioError.TeamsAppCreateConflictWithPublishedAppError.message()[1], true);
+                throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.CREATE_APP, errors_1.AppStudioError.TeamsAppCreateConflictWithPublishedAppError.name, errors_1.AppStudioError.TeamsAppCreateConflictWithPublishedAppError.message()[0], errors_1.AppStudioError.TeamsAppCreateConflictWithPublishedAppError.message()[1], true);
             }
             // Corner case: App Id must be a GUID
             if (e.response?.status === commonConstant_1.HttpStatusCode.BAD_REQUEST &&
@@ -129,10 +106,10 @@ class TeamsDevPortalClient {
                 }
                 else {
                     const teamsAppId = manifest.value.id;
-                    throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.CREATE_APP, errors_1.AppStudioError.InvalidTeamsAppIdError.name, errors_1.AppStudioError.InvalidTeamsAppIdError.message(teamsAppId)[0], errors_1.AppStudioError.InvalidTeamsAppIdError.message(teamsAppId)[1], true);
+                    throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.CREATE_APP, errors_1.AppStudioError.InvalidTeamsAppIdError.name, errors_1.AppStudioError.InvalidTeamsAppIdError.message(teamsAppId)[0], errors_1.AppStudioError.InvalidTeamsAppIdError.message(teamsAppId)[1], true);
                 }
             }
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.CREATE_APP);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.CREATE_APP);
         }
     }
     async listApps(token) {
@@ -142,7 +119,7 @@ class TeamsDevPortalClient {
         try {
             requester = this.createRequesterWithToken(token);
             globalVars_1.TOOLS.logProvider.debug(`Sent API Request: GET ${this.regionEndpoint}/api/appdefinitions`);
-            const response = await RetryHandler.Retry(() => requester.get(`/api/appdefinitions`));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.get(`/api/appdefinitions`));
             const apps = response?.data;
             if (apps) {
                 return apps;
@@ -152,9 +129,9 @@ class TeamsDevPortalClient {
             }
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.LIST_APPS);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.LIST_APPS);
         }
-        throw this.wrapException(new Error("cannot get the app definitions"), constants_2.APP_STUDIO_API_NAMES.LIST_APPS);
+        throw this.wrapException(new Error("cannot get the app definitions"), constants_3.APP_STUDIO_API_NAMES.LIST_APPS);
     }
     async deleteApp(appStudioToken, teamsAppId) {
         if (!this.regionEndpoint)
@@ -163,7 +140,7 @@ class TeamsDevPortalClient {
         try {
             requester = this.createRequesterWithToken(appStudioToken);
             globalVars_1.TOOLS.logProvider.debug(`Sent API Request: DELETE ${this.getEndpoint()}/api/appdefinitions/${teamsAppId}`);
-            const response = await RetryHandler.Retry(() => requester.delete(`/api/appdefinitions/${teamsAppId}`));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.delete(`/api/appdefinitions/${teamsAppId}`));
             if (response && response.data) {
                 const success = response.data;
                 if (success) {
@@ -175,16 +152,16 @@ class TeamsDevPortalClient {
             }
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.DELETE_APP);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.DELETE_APP);
         }
-        throw this.wrapException(new Error("cannot delete the app: " + teamsAppId), constants_2.APP_STUDIO_API_NAMES.DELETE_APP);
+        throw this.wrapException(new Error("cannot delete the app: " + teamsAppId), constants_3.APP_STUDIO_API_NAMES.DELETE_APP);
     }
     async getApp(token, teamsAppId) {
         let requester;
         try {
             requester = this.createRequesterWithToken(token);
             globalVars_1.TOOLS.logProvider.debug(`Sent API Request: GET ${this.getEndpoint()}/api/appdefinitions/${teamsAppId}`);
-            const response = await RetryHandler.Retry(() => requester.get(`/api/appdefinitions/${teamsAppId}`));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.get(`/api/appdefinitions/${teamsAppId}`));
             if (response && response.data) {
                 const app = response.data;
                 if (app && app.teamsAppId && app.teamsAppId === teamsAppId) {
@@ -196,9 +173,9 @@ class TeamsDevPortalClient {
             }
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.GET_APP);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.GET_APP);
         }
-        throw this.wrapException(new Error(`cannot get the app definition with app ID ${teamsAppId}`), constants_2.APP_STUDIO_API_NAMES.GET_APP);
+        throw this.wrapException(new Error(`cannot get the app definition with app ID ${teamsAppId}`), constants_3.APP_STUDIO_API_NAMES.GET_APP);
     }
     async getBotId(token, teamsAppId) {
         const app = await this.getApp(token, teamsAppId);
@@ -212,17 +189,17 @@ class TeamsDevPortalClient {
         globalVars_1.TOOLS.logProvider?.info("Downloading app package for app " + teamsAppId);
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.get(`/api/appdefinitions/${teamsAppId}/manifest`));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.get(`/api/appdefinitions/${teamsAppId}/manifest`));
             if (response && response.data) {
                 globalVars_1.TOOLS.logProvider?.info("Download app package successfully");
                 return response.data;
             }
             else {
-                throw this.wrapException(new Error((0, localizeUtils_1.getLocalizedString)("plugins.appstudio.emptyAppPackage", teamsAppId)), constants_2.APP_STUDIO_API_NAMES.GET_APP_PACKAGE);
+                throw this.wrapException(new Error((0, localizeUtils_1.getLocalizedString)("plugins.appstudio.emptyAppPackage", teamsAppId)), constants_3.APP_STUDIO_API_NAMES.GET_APP_PACKAGE);
             }
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.GET_APP_PACKAGE);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.GET_APP_PACKAGE);
         }
     }
     /**
@@ -235,7 +212,7 @@ class TeamsDevPortalClient {
     async checkExistsInTenant(token, teamsAppId) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.get(`/api/appdefinitions/manifest/${teamsAppId}`));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.get(`/api/appdefinitions/manifest/${teamsAppId}`));
             if (response && response.data) {
                 return response.data;
             }
@@ -253,7 +230,7 @@ class TeamsDevPortalClient {
     async publishTeamsApp(token, teamsAppId, file) {
         try {
             const requester = this.createRequesterWithToken(token);
-            const response = await RetryHandler.Retry(() => requester.post("/api/publishing", file, {
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.post("/api/publishing", file, {
                 headers: { "Content-Type": "application/zip" },
             }));
             if (response && response.data) {
@@ -276,21 +253,21 @@ class TeamsDevPortalClient {
                         }
                         catch (e) {
                             if (e instanceof teamsApp_1.DeveloperPortalAPIFailedSystemError) {
-                                throw this.wrapException(this.wrapResponse(undefined, response), constants_2.APP_STUDIO_API_NAMES.PUBLISH_APP, errors_1.AppStudioError.TeamsAppPublishConflictError.name, errors_1.AppStudioError.TeamsAppPublishConflictError.message(teamsAppId)[0], errors_1.AppStudioError.TeamsAppPublishConflictError.message(teamsAppId)[1]);
+                                throw this.wrapException(this.wrapResponse(undefined, response), constants_3.APP_STUDIO_API_NAMES.PUBLISH_APP, errors_1.AppStudioError.TeamsAppPublishConflictError.name, errors_1.AppStudioError.TeamsAppPublishConflictError.message(teamsAppId)[0], errors_1.AppStudioError.TeamsAppPublishConflictError.message(teamsAppId)[1]);
                             }
                             else {
                                 throw e;
                             }
                         }
                     }
-                    throw this.wrapException(this.wrapResponse(undefined, response), constants_2.APP_STUDIO_API_NAMES.PUBLISH_APP);
+                    throw this.wrapException(this.wrapResponse(undefined, response), constants_3.APP_STUDIO_API_NAMES.PUBLISH_APP);
                 }
                 else {
                     return response.data.id;
                 }
             }
             else {
-                throw this.wrapException(this.wrapResponse(new Error("empty response"), response), constants_2.APP_STUDIO_API_NAMES.PUBLISH_APP, errors_1.AppStudioError.TeamsAppPublishFailedError.name, errors_1.AppStudioError.TeamsAppPublishFailedError.message(teamsAppId, "POST /api/publishing")[0], errors_1.AppStudioError.TeamsAppPublishFailedError.message(teamsAppId, "POST /api/publishing")[1]);
+                throw this.wrapException(this.wrapResponse(new Error("empty response"), response), constants_3.APP_STUDIO_API_NAMES.PUBLISH_APP, errors_1.AppStudioError.TeamsAppPublishFailedError.name, errors_1.AppStudioError.TeamsAppPublishFailedError.message(teamsAppId, "POST /api/publishing")[0], errors_1.AppStudioError.TeamsAppPublishFailedError.message(teamsAppId, "POST /api/publishing")[1]);
             }
         }
         catch (e) {
@@ -298,7 +275,7 @@ class TeamsDevPortalClient {
                 throw e;
             }
             else {
-                throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.PUBLISH_APP);
+                throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.PUBLISH_APP);
             }
         }
     }
@@ -317,24 +294,24 @@ class TeamsDevPortalClient {
             let response = null;
             if (appDefinition) {
                 // update the existing app
-                response = await RetryHandler.Retry(() => requester.post(`/api/publishing/${appDefinition.teamsAppId}/appdefinitions`, file, {
+                response = await retryHandler_1.RetryHandler.Retry(() => requester.post(`/api/publishing/${appDefinition.teamsAppId}/appdefinitions`, file, {
                     headers: { "Content-Type": "application/zip" },
                 }));
             }
             else {
-                throw this.wrapException(new Error("API failed"), constants_2.APP_STUDIO_API_NAMES.GET_PUBLISHED_APP, errors_1.AppStudioError.TeamsAppPublishFailedError.name, errors_1.AppStudioError.TeamsAppPublishFailedError.message(teamsAppId, `GET /api/publishing/${teamsAppId}`)[0], errors_1.AppStudioError.TeamsAppPublishFailedError.message(teamsAppId, `GET /api/publishing/${teamsAppId}`)[1]);
+                throw this.wrapException(new Error("API failed"), constants_3.APP_STUDIO_API_NAMES.GET_PUBLISHED_APP, errors_1.AppStudioError.TeamsAppPublishFailedError.name, errors_1.AppStudioError.TeamsAppPublishFailedError.message(teamsAppId, `GET /api/publishing/${teamsAppId}`)[0], errors_1.AppStudioError.TeamsAppPublishFailedError.message(teamsAppId, `GET /api/publishing/${teamsAppId}`)[1]);
             }
             const requestPath = `${response?.request?.method} ${response?.request?.path}`;
             if (response && response.data) {
                 if (response.data.error || response.data.errorMessage) {
-                    throw this.wrapException(this.wrapResponse(undefined, response), constants_2.APP_STUDIO_API_NAMES.UPDATE_PUBLISHED_APP);
+                    throw this.wrapException(this.wrapResponse(undefined, response), constants_3.APP_STUDIO_API_NAMES.UPDATE_PUBLISHED_APP);
                 }
                 else {
                     return response.data.teamsAppId;
                 }
             }
             else {
-                throw this.wrapException(new Error("empty response"), constants_2.APP_STUDIO_API_NAMES.UPDATE_PUBLISHED_APP, errors_1.AppStudioError.TeamsAppPublishFailedError.name, errors_1.AppStudioError.TeamsAppPublishFailedError.message(teamsAppId, requestPath)[0], errors_1.AppStudioError.TeamsAppPublishFailedError.message(teamsAppId, requestPath)[1]);
+                throw this.wrapException(new Error("empty response"), constants_3.APP_STUDIO_API_NAMES.UPDATE_PUBLISHED_APP, errors_1.AppStudioError.TeamsAppPublishFailedError.name, errors_1.AppStudioError.TeamsAppPublishFailedError.message(teamsAppId, requestPath)[0], errors_1.AppStudioError.TeamsAppPublishFailedError.message(teamsAppId, requestPath)[1]);
             }
         }
         catch (error) {
@@ -342,7 +319,7 @@ class TeamsDevPortalClient {
                 throw error;
             }
             else {
-                throw this.wrapException(error, constants_2.APP_STUDIO_API_NAMES.UPDATE_PUBLISHED_APP);
+                throw this.wrapException(error, constants_3.APP_STUDIO_API_NAMES.UPDATE_PUBLISHED_APP);
             }
         }
     }
@@ -355,7 +332,7 @@ class TeamsDevPortalClient {
     async getStaggedApp(token, teamsAppId) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.get(`/api/publishing/${teamsAppId}`));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.get(`/api/publishing/${teamsAppId}`));
             if (response && response.data && response.data.value && response.data.value.length > 0) {
                 const appdefinitions = response.data.value[0].appDefinitions.map((item) => {
                     return {
@@ -387,17 +364,17 @@ class TeamsDevPortalClient {
             userList = await this.getUserList(token, teamsAppId);
         }
         catch (error) {
-            return constants_2.Constants.PERMISSIONS.noPermission;
+            return constants_3.Constants.PERMISSIONS.noPermission;
         }
         const findUser = userList?.find((user) => user.aadId === userObjectId);
         if (!findUser) {
-            return constants_2.Constants.PERMISSIONS.noPermission;
+            return constants_3.Constants.PERMISSIONS.noPermission;
         }
         if (findUser.isAdministrator) {
-            return constants_2.Constants.PERMISSIONS.admin;
+            return constants_3.Constants.PERMISSIONS.admin;
         }
         else {
-            return constants_2.Constants.PERMISSIONS.operative;
+            return constants_3.Constants.PERMISSIONS.operative;
         }
     }
     async removePermission(token, teamsAppId, userToRemove) {
@@ -410,7 +387,7 @@ class TeamsDevPortalClient {
         try {
             globalVars_1.TOOLS.logProvider.debug((0, localizeUtils_1.getLocalizedString)("core.common.SendingApiRequest", `${this.getEndpoint()}/api/appdefinitions/{teamsAppId}/owner`, JSON.stringify(app)));
             requester = this.createRequesterWithToken(token);
-            const response = await RetryHandler.Retry(() => requester.post(`/api/appdefinitions/${teamsAppId}/owner`, app));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.post(`/api/appdefinitions/${teamsAppId}/owner`, app));
             globalVars_1.TOOLS.logProvider.debug((0, localizeUtils_1.getLocalizedString)("core.common.ReceiveApiResponse", JSON.stringify(response?.data)));
             if (!response ||
                 !response.data ||
@@ -419,7 +396,7 @@ class TeamsDevPortalClient {
             }
         }
         catch (err) {
-            throw this.wrapException(err, constants_2.APP_STUDIO_API_NAMES.UPDATE_OWNER);
+            throw this.wrapException(err, constants_3.APP_STUDIO_API_NAMES.UPDATE_OWNER);
         }
     }
     async grantPermission(token, teamsAppId, newUser) {
@@ -432,14 +409,14 @@ class TeamsDevPortalClient {
         try {
             globalVars_1.TOOLS.logProvider.debug((0, localizeUtils_1.getLocalizedString)("core.common.SendingApiRequest", `${this.getEndpoint()}/api/appdefinitions/{teamsAppId}/owner`, JSON.stringify(app)));
             requester = this.createRequesterWithToken(token);
-            const response = await RetryHandler.Retry(() => requester.post(`/api/appdefinitions/${teamsAppId}/owner`, app));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.post(`/api/appdefinitions/${teamsAppId}/owner`, app));
             globalVars_1.TOOLS.logProvider.debug((0, localizeUtils_1.getLocalizedString)("core.common.ReceiveApiResponse", JSON.stringify(response?.data)));
             if (!response || !response.data || !this.checkUser(response.data, newUser)) {
-                throw new Error(constants_2.ErrorMessages.GrantPermissionFailed);
+                throw new Error(constants_3.ErrorMessages.GrantPermissionFailed);
             }
         }
         catch (err) {
-            throw this.wrapException(err, constants_2.APP_STUDIO_API_NAMES.UPDATE_OWNER);
+            throw this.wrapException(err, constants_3.APP_STUDIO_API_NAMES.UPDATE_OWNER);
         }
     }
     /**
@@ -451,13 +428,13 @@ class TeamsDevPortalClient {
     async partnerCenterAppPackageValidation(token, file) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.post("/api/appdefinitions/partnerCenterAppPackageValidation", file, {
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.post("/api/appdefinitions/partnerCenterAppPackageValidation", file, {
                 headers: { "Content-Type": "application/zip" },
             }));
             return response?.data;
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.VALIDATE_APP_PACKAGE);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.VALIDATE_APP_PACKAGE);
         }
     }
     checkUser(app, newUser) {
@@ -479,14 +456,14 @@ class TeamsDevPortalClient {
     async submitAppValidationRequest(token, teamsAppId) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.post(`/api/v1.0/appvalidations/appdefinition/validate`, {
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.post(`/api/v1.0/appvalidations/appdefinition/validate`, {
                 AppEnvironmentId: null,
                 appDefinitionId: teamsAppId,
             }));
             return response?.data;
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.SUBMIT_APP_VALIDATION);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.SUBMIT_APP_VALIDATION);
         }
     }
     /**
@@ -495,11 +472,11 @@ class TeamsDevPortalClient {
     async getAppValidationRequestList(token, teamsAppId) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.get(`/api/v1.0/appvalidations/appdefinitions/${teamsAppId}`));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.get(`/api/v1.0/appvalidations/appdefinitions/${teamsAppId}`));
             return response?.data;
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.GET_APP_VALIDATION_REQUESTS);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.GET_APP_VALIDATION_REQUESTS);
         }
     }
     /**
@@ -512,11 +489,11 @@ class TeamsDevPortalClient {
     async getAppValidationById(token, appValidationId) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.get(`/api/v1.0/appvalidations/${appValidationId}`));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.get(`/api/v1.0/appvalidations/${appValidationId}`));
             return response?.data;
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.GET_APP_VALIDATION_RESULT);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.GET_APP_VALIDATION_RESULT);
         }
     }
     async getSideloadingStatus(token) {
@@ -525,7 +502,7 @@ class TeamsDevPortalClient {
         const requester = this.createRequesterWithToken(token);
         let response = undefined;
         try {
-            response = (await RetryHandler.Retry(() => requester.get(apiPath)));
+            response = (await retryHandler_1.RetryHandler.Retry(() => requester.get(apiPath)));
             let result;
             if (response.status >= 400) {
                 result = undefined;
@@ -534,24 +511,24 @@ class TeamsDevPortalClient {
                 result = response.data?.value?.isSideloadingAllowed;
             }
             if (result !== undefined) {
-                (0, telemetry_1.sendTelemetryEvent)("TeamsDevPortalClient", telemetry_1.TelemetryEvent.CheckSideloading, {
-                    [telemetry_1.TelemetryProperty.IsSideloadingAllowed]: result.toString() + "",
+                telemetry.sendTelemetryEvent("TeamsDevPortalClient", telemetry.TelemetryEvent.CheckSideloading, {
+                    [telemetry.TelemetryProperty.IsSideloadingAllowed]: result.toString() + "",
                 });
             }
             else {
-                (0, telemetry_1.sendTelemetryErrorEvent)("TeamsDevPortalClient", telemetry_1.TelemetryEvent.CheckSideloading, new teamsfx_api_1.SystemError("M365Account", "UnknownValue", `AppStudio response code: ${response.status}, body: ${response.data}`), {
-                    [telemetry_1.TelemetryProperty.CheckSideloadingStatusCode]: `${response.status}`,
-                    [telemetry_1.TelemetryProperty.CheckSideloadingMethod]: "get",
-                    [telemetry_1.TelemetryProperty.CheckSideloadingUrl]: apiName,
+                telemetry.sendTelemetryErrorEvent("TeamsDevPortalClient", telemetry.TelemetryEvent.CheckSideloading, new teamsfx_api_1.SystemError("M365Account", "UnknownValue", `AppStudio response code: ${response.status}, body: ${response.data}`), {
+                    [telemetry.TelemetryProperty.CheckSideloadingStatusCode]: `${response.status}`,
+                    [telemetry.TelemetryProperty.CheckSideloadingMethod]: "get",
+                    [telemetry.TelemetryProperty.CheckSideloadingUrl]: apiName,
                 });
             }
             return result;
         }
         catch (error) {
-            (0, telemetry_1.sendTelemetryErrorEvent)("TeamsDevPortalClient", telemetry_1.TelemetryEvent.CheckSideloading, new teamsApp_1.CheckSideloadingPermissionFailedError(error, error.response?.headers?.[constants_2.Constants.CORRELATION_ID] ?? "", apiName, (0, localizeUtils_1.getDefaultString)("error.appstudio.apiFailed.reason.common", error.response?.data ? `data: ${JSON.stringify(error.response.data)}` : "")), {
-                [telemetry_1.TelemetryProperty.CheckSideloadingStatusCode]: `${error?.response?.status}`,
-                [telemetry_1.TelemetryProperty.CheckSideloadingMethod]: "get",
-                [telemetry_1.TelemetryProperty.CheckSideloadingUrl]: apiName,
+            telemetry.sendTelemetryErrorEvent("TeamsDevPortalClient", telemetry.TelemetryEvent.CheckSideloading, new teamsApp_1.CheckSideloadingPermissionFailedError(error, error.response?.headers?.[constants_3.Constants.CORRELATION_ID] ?? "", apiName, (0, localizeUtils_1.getDefaultString)("error.appstudio.apiFailed.reason.common", error.response?.data ? `data: ${JSON.stringify(error.response.data)}` : "")), {
+                [telemetry.TelemetryProperty.CheckSideloadingStatusCode]: `${error?.response?.status}`,
+                [telemetry.TelemetryProperty.CheckSideloadingMethod]: "get",
+                [telemetry.TelemetryProperty.CheckSideloadingUrl]: apiName,
             });
         }
         return undefined;
@@ -564,11 +541,11 @@ class TeamsDevPortalClient {
     async createApiKeyRegistration(token, apiKeyRegistration) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.post("/api/v1.0/apiSecretRegistrations", apiKeyRegistration));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.post("/api/v1.0/apiSecretRegistrations", apiKeyRegistration));
             return response?.data;
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.CREATE_API_KEY);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.CREATE_API_KEY);
         }
     }
     /**
@@ -579,92 +556,92 @@ class TeamsDevPortalClient {
     async getApiKeyRegistrationById(token, apiSecretRegistrationId) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.get(`/api/v1.0/apiSecretRegistrations/${apiSecretRegistrationId}`));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.get(`/api/v1.0/apiSecretRegistrations/${apiSecretRegistrationId}`));
             return response?.data;
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.GET_API_KEY);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.GET_API_KEY);
         }
     }
     async updateApiKeyRegistration(token, apiKeyRegistration, apiKeyRegistrationId) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.patch(`/api/v1.0/apiSecretRegistrations/${apiKeyRegistrationId}`, apiKeyRegistration));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.patch(`/api/v1.0/apiSecretRegistrations/${apiKeyRegistrationId}`, apiKeyRegistration));
             return response?.data;
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.UPDATE_API_KEY);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.UPDATE_API_KEY);
         }
     }
     async getOauthRegistrationById(token, oauthRegistrationId) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.get(`/api/v1.0/oAuthConfigurations/${oauthRegistrationId}`));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.get(`/api/v1.0/oAuthConfigurations/${oauthRegistrationId}`));
             return response?.data;
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.GET_OAUTH);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.GET_OAUTH);
         }
     }
     async createOauthRegistration(token, oauthRegistration) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.post("/api/v1.0/oAuthConfigurations", oauthRegistration));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.post("/api/v1.0/oAuthConfigurations", oauthRegistration));
             return response?.data;
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.CREATE_OAUTH);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.CREATE_OAUTH);
         }
     }
     async updateOauthRegistration(token, oauthRegistration, oauthRegistrationId) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.patch(`/api/v1.0/oAuthConfigurations/${oauthRegistrationId}`, oauthRegistration));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.patch(`/api/v1.0/oAuthConfigurations/${oauthRegistrationId}`, oauthRegistration));
             return response?.data;
         }
         catch (e) {
-            throw this.wrapException(e, constants_2.APP_STUDIO_API_NAMES.UPDATE_OAUTH);
+            throw this.wrapException(e, constants_3.APP_STUDIO_API_NAMES.UPDATE_OAUTH);
         }
     }
     async getBotRegistration(token, botId) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.get(`/api/botframework/${botId}`));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.get(`/api/botframework/${botId}`));
             if ((0, common_1.isHappyResponse)(response)) {
                 return response.data; // response cannot be undefined as it's checked in isHappyResponse.
             }
             else {
                 // Defensive code and it should never reach here.
-                throw this.wrapException(this.wrapResponse(undefined, response), constants_2.APP_STUDIO_API_NAMES.GET_BOT, (0, localizeUtils_1.getDefaultString)("error.appstudio.apiFailed.name.common"), "Failed to get data");
+                throw this.wrapException(this.wrapResponse(undefined, response), constants_3.APP_STUDIO_API_NAMES.GET_BOT, (0, localizeUtils_1.getDefaultString)("error.appstudio.apiFailed.name.common"), "Failed to get data");
             }
         }
         catch (e) {
-            this.handleBotFrameworkError(e, constants_2.APP_STUDIO_API_NAMES.GET_BOT);
+            this.handleBotFrameworkError(e, constants_3.APP_STUDIO_API_NAMES.GET_BOT);
         }
     }
     async listBots(token) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.get("/api/botframework"));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.get("/api/botframework"));
             if ((0, common_1.isHappyResponse)(response)) {
                 return response.data; // response cannot be undefined as it's checked in isHappyResponse.
             }
             else {
                 // Defensive code and it should never reach here.
-                throw this.wrapException(this.wrapResponse(undefined, response), constants_2.APP_STUDIO_API_NAMES.LIST_BOT, (0, localizeUtils_1.getDefaultString)("error.appstudio.apiFailed.name.common"), "Failed to get data");
+                throw this.wrapException(this.wrapResponse(undefined, response), constants_3.APP_STUDIO_API_NAMES.LIST_BOT, (0, localizeUtils_1.getDefaultString)("error.appstudio.apiFailed.name.common"), "Failed to get data");
             }
         }
         catch (e) {
-            this.handleBotFrameworkError(e, constants_2.APP_STUDIO_API_NAMES.LIST_BOT);
+            this.handleBotFrameworkError(e, constants_3.APP_STUDIO_API_NAMES.LIST_BOT);
         }
     }
     async deleteBot(token, botId) {
         const requester = this.createRequesterWithToken(token);
         try {
-            await RetryHandler.Retry(() => requester.delete(`/api/botframework/${botId}`));
+            await retryHandler_1.RetryHandler.Retry(() => requester.delete(`/api/botframework/${botId}`));
         }
         catch (e) {
-            this.handleBotFrameworkError(e, constants_2.APP_STUDIO_API_NAMES.DELETE_BOT);
+            this.handleBotFrameworkError(e, constants_3.APP_STUDIO_API_NAMES.DELETE_BOT);
         }
     }
     async createBotRegistration(token, registration, checkExistence = true) {
@@ -677,13 +654,13 @@ class TeamsDevPortalClient {
         }
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.post(`/api/botframework`, registration));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.post(`/api/botframework`, registration));
             if (!(0, common_1.isHappyResponse)(response)) {
                 throw new errors_2.ProvisionError(strings_1.CommonStrings.APP_STUDIO_BOT_REGISTRATION);
             }
         }
         catch (e) {
-            this.handleBotFrameworkError(e, constants_2.APP_STUDIO_API_NAMES.CREATE_BOT);
+            this.handleBotFrameworkError(e, constants_3.APP_STUDIO_API_NAMES.CREATE_BOT);
         }
     }
     async updateMessageEndpoint(token, botId, endpoint) {
@@ -700,13 +677,13 @@ class TeamsDevPortalClient {
     async updateBotRegistration(token, botReg) {
         const requester = this.createRequesterWithToken(token);
         try {
-            const response = await RetryHandler.Retry(() => requester.post(`/api/botframework/${botReg.botId}`, botReg));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.post(`/api/botframework/${botReg.botId}`, botReg));
             if (!(0, common_1.isHappyResponse)(response)) {
                 throw new errors_2.ConfigUpdatingError(strings_1.ConfigNames.MESSAGE_ENDPOINT);
             }
         }
         catch (e) {
-            this.handleBotFrameworkError(e, constants_2.APP_STUDIO_API_NAMES.UPDATE_BOT);
+            this.handleBotFrameworkError(e, constants_3.APP_STUDIO_API_NAMES.UPDATE_BOT);
         }
     }
     async createAADApp(token, displayName, signInAudience = signInAudience_1.SignInAudience.AzureADMyOrg, serviceManagementReference, isMicrosoftUser = false) {
@@ -717,20 +694,20 @@ class TeamsDevPortalClient {
             serviceManagementReference: serviceManagementReference,
         }; // Create a Microsoft Entra app and optionally set service tree id
         try {
-            const response = await RetryHandler.Retry(() => requester.post(`/api/aadapp/v2`, requestBody));
+            const response = await retryHandler_1.RetryHandler.Retry(() => requester.post(`/api/aadapp/v2`, requestBody));
             if (response && response.data) {
                 return response.data;
             }
         }
         catch (err) {
             if (axios_1.default.isAxiosError(err) && err.response) {
-                if (err.response.data?.error?.code === constants_4.aadErrorCode.signInAudienceNotAllowedAsPerAppPolicy) {
+                if (err.response.data?.error?.code === constants_2.aadErrorCode.signInAudienceNotAllowedAsPerAppPolicy) {
                     throw new signInAudienceNotAllowedError_1.SignInAudienceNotAllowedError("TeamsDevPortalClient", err.response.data.error?.message, isMicrosoftUser);
                 }
             }
-            throw this.wrapException(err, constants_2.APP_STUDIO_API_NAMES.CREATE_AAD_APP);
+            throw this.wrapException(err, constants_3.APP_STUDIO_API_NAMES.CREATE_AAD_APP);
         }
-        throw this.wrapException(new Error(`Failed to create AAD app: ${displayName}`), constants_2.APP_STUDIO_API_NAMES.CREATE_AAD_APP);
+        throw this.wrapException(new Error(`Failed to create AAD app: ${displayName}`), constants_3.APP_STUDIO_API_NAMES.CREATE_AAD_APP);
     }
     handleBotFrameworkError(e, apiName) {
         if (e.response?.status === commonConstant_1.HttpStatusCode.NOTFOUND) {
@@ -746,7 +723,7 @@ class TeamsDevPortalClient {
             throw new errors_2.BotFrameworkConflictResultError();
         }
         else {
-            e.teamsfxUrlName = constants_3.TeamsFxUrlNames[apiName];
+            e.teamsfxUrlName = constants_4.TeamsFxUrlNames[apiName];
             throw this.wrapException(e, apiName);
         }
     }
@@ -758,7 +735,7 @@ class TeamsDevPortalClient {
     }
     wrapException(e, apiName, name = (0, localizeUtils_1.getDefaultString)("error.appstudio.apiFailed.name.common"), potentialReason = (0, localizeUtils_1.getDefaultString)("error.appstudio.apiFailed.reason.common"), disPlayMessage, isUserError = false, helpLink) {
         e.name = name;
-        const correlationId = e.response?.headers?.[constants_2.Constants.CORRELATION_ID];
+        const correlationId = e.response?.headers?.[constants_3.Constants.CORRELATION_ID];
         let extraData = `${potentialReason} ${e.response?.data ? `data: ${JSON.stringify(e.response.data)}` : ""}`;
         // add status code in extra data if the message does not have it.
         if (!e.message?.toLowerCase().includes("status code") && e.response?.status) {