@microsoft/teamsfx-core 2.0.8 → 2.0.9-alpha.20d61baa8.0

package/build/common/azureUtils.d.ts

@@ -0,0 +1,3 @@
+import { AzureAccountProvider, FxError, Result, SubscriptionInfo, UserInteraction } from "@microsoft/teamsfx-api";
+export declare function askSubscription(azureAccountProvider: AzureAccountProvider, ui: UserInteraction, activeSubscriptionId?: string): Promise<Result<SubscriptionInfo, FxError>>;
+//# sourceMappingURL=azureUtils.d.ts.map

package/build/common/azureUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"azureUtils.d.ts","sourceRoot":"","sources":["../../src/common/azureUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,oBAAoB,EACpB,OAAO,EAEP,MAAM,EACN,gBAAgB,EAGhB,eAAe,EAGhB,MAAM,wBAAwB,CAAC;AAGhC,wBAAsB,eAAe,CACnC,oBAAoB,EAAE,oBAAoB,EAC1C,EAAE,EAAE,eAAe,EACnB,oBAAoB,CAAC,EAAE,MAAM,GAC5B,OAAO,CAAC,MAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAC,CAqD5C"}

package/build/common/azureUtils.js

@@ -0,0 +1,50 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.askSubscription = void 0;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const localizeUtils_1 = require("./localizeUtils");
+async function askSubscription(azureAccountProvider, ui, activeSubscriptionId) {
+    const subscriptions = await azureAccountProvider.listSubscriptions();
+    if (subscriptions.length === 0) {
+        return teamsfx_api_1.err(new teamsfx_api_1.UserError("Core", "NoSubscriptionFound", localizeUtils_1.getDefaultString("error.NoSubscriptionFound"), localizeUtils_1.getLocalizedString("error.NoSubscriptionFound")));
+    }
+    let resultSub = subscriptions.find((sub) => sub.subscriptionId === activeSubscriptionId);
+    if (activeSubscriptionId === undefined || resultSub === undefined) {
+        let selectedSub = undefined;
+        if (subscriptions.length === 1) {
+            selectedSub = subscriptions[0];
+        }
+        else {
+            const options = subscriptions.map((sub) => {
+                return {
+                    id: sub.subscriptionId,
+                    label: sub.subscriptionName,
+                    data: sub.tenantId,
+                };
+            });
+            const askRes = await ui.selectOption({
+                name: "subscription",
+                title: "Select a subscription",
+                options: options,
+                returnObject: true,
+            });
+            if (askRes.isErr())
+                return teamsfx_api_1.err(askRes.error);
+            const subItem = askRes.value.result;
+            selectedSub = {
+                subscriptionId: subItem.id,
+                subscriptionName: subItem.label,
+                tenantId: subItem.data,
+            };
+        }
+        if (selectedSub === undefined) {
+            return teamsfx_api_1.err(new teamsfx_api_1.SystemError("Core", "NoSubscriptionFound", localizeUtils_1.getDefaultString("error.NoSubscriptionFound"), localizeUtils_1.getLocalizedString("error.NoSubscriptionFound")));
+        }
+        resultSub = selectedSub;
+    }
+    return teamsfx_api_1.ok(resultSub);
+}
+exports.askSubscription = askSubscription;
+//# sourceMappingURL=azureUtils.js.map

package/build/common/azureUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"azureUtils.js","sourceRoot":"","sources":["../../src/common/azureUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,wDAWgC;AAChC,mDAAuE;AAEhE,KAAK,UAAU,eAAe,CACnC,oBAA0C,EAC1C,EAAmB,EACnB,oBAA6B;IAE7B,MAAM,aAAa,GAAuB,MAAM,oBAAoB,CAAC,iBAAiB,EAAE,CAAC;IAEzF,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9B,OAAO,iBAAG,CACR,IAAI,uBAAS,CACX,MAAM,EACN,qBAAqB,EACrB,gCAAgB,CAAC,2BAA2B,CAAC,EAC7C,kCAAkB,CAAC,2BAA2B,CAAC,CAChD,CACF,CAAC;KACH;IACD,IAAI,SAAS,GAAG,aAAa,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,cAAc,KAAK,oBAAoB,CAAC,CAAC;IACzF,IAAI,oBAAoB,KAAK,SAAS,IAAI,SAAS,KAAK,SAAS,EAAE;QACjE,IAAI,WAAW,GAAiC,SAAS,CAAC;QAC1D,IAAI,aAAa,CAAC,MAAM,KAAK,CAAC,EAAE;YAC9B,WAAW,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;SAChC;aAAM;YACL,MAAM,OAAO,GAAiB,aAAa,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE;gBACtD,OAAO;oBACL,EAAE,EAAE,GAAG,CAAC,cAAc;oBACtB,KAAK,EAAE,GAAG,CAAC,gBAAgB;oBAC3B,IAAI,EAAE,GAAG,CAAC,QAAQ;iBACL,CAAC;YAClB,CAAC,CAAC,CAAC;YACH,MAAM,MAAM,GAAG,MAAM,EAAE,CAAC,YAAY,CAAC;gBACnC,IAAI,EAAE,cAAc;gBACpB,KAAK,EAAE,uBAAuB;gBAC9B,OAAO,EAAE,OAAO;gBAChB,YAAY,EAAE,IAAI;aACnB,CAAC,CAAC;YACH,IAAI,MAAM,CAAC,KAAK,EAAE;gBAAE,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;YAC7C,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,MAAoB,CAAC;YAClD,WAAW,GAAG;gBACZ,cAAc,EAAE,OAAO,CAAC,EAAE;gBAC1B,gBAAgB,EAAE,OAAO,CAAC,KAAK;gBAC/B,QAAQ,EAAE,OAAO,CAAC,IAAc;aACjC,CAAC;SACH;QACD,IAAI,WAAW,KAAK,SAAS,EAAE;YAC7B,OAAO,iBAAG,CACR,IAAI,yBAAW,CACb,MAAM,EACN,qBAAqB,EACrB,gCAAgB,CAAC,2BAA2B,CAAC,EAC7C,kCAAkB,CAAC,2BAA2B,CAAC,CAChD,CACF,CAAC;SACH;QACD,SAAS,GAAG,WAAW,CAAC;KACzB;IACD,OAAO,gBAAE,CAAC,SAAS,CAAC,CAAC;AACvB,CAAC;AAzDD,0CAyDC"}

package/build/common/constants.d.ts

@@ -28,6 +28,7 @@ export declare class OutlookClientId {
     static readonly Desktop = "d3590ed6-52b3-4102-aeff-aad2292ab01c";
     static readonly Web1 = "00000002-0000-0ff1-ce00-000000000000";
     static readonly Web2 = "bc59ab01-8403-45c6-8796-ac3ef710b3e3";
+    static readonly Mobile = "27922004-5251-4030-b22d-91ecd9a37ea4";
 }
 export declare class FeatureFlagName {
     static readonly CLIDotNet = "TEAMSFX_CLI_DOTNET";
@@ -46,4 +47,11 @@ export declare class FeatureFlagName {
     static readonly CopilotAuth = "API_COPILOT_PLUGIN_AUTH";
     static readonly CustomizeGpt = "TEAMSFX_DECLARATIVE_COPILOT";
 }
+export declare function getAllowedAppMaps(): Record<string, string>;
+export declare function getResourceGroupInPortal(subscriptionId?: string, tenantId?: string, resourceGroupName?: string): string | undefined;
+export declare const AuthSvcScopes: string[];
+export declare const GraphScopes: string[];
+export declare const GraphReadUserScopes: string[];
+export declare const SPFxScopes: (tenant: string) => string[];
+export declare const AzureScopes: string[];
 //# sourceMappingURL=constants.d.ts.map

package/build/common/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAGA,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,YAAY,WAAW;IACvC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,qCAAqC;IAC3E,MAAM,CAAC,QAAQ,CAAC,kBAAkB,wBAAwB;IAC1D,MAAM,CAAC,QAAQ,CAAC,UAAU,eAAe;CAC1C;AAED,qBAAa,SAAS;IACpB,MAAM,CAAC,QAAQ,CAAC,gBAAgB,6CAA6C;IAC7E,MAAM,CAAC,QAAQ,CAAC,WAAW,qCAAqC;IAChE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,gEAAgE;IAClG,MAAM,CAAC,QAAQ,CAAC,YAAY,0CAA0C;CACvE;AAED,qBAAa,sBAAsB;IACjC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,4CAA4C;IAC7E,MAAM,CAAC,QAAQ,CAAC,UAAU,qCAAqC;IAC/D,MAAM,CAAC,QAAQ,CAAC,UAAU,8DAA8D;CACzF;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,aAAa,0CAA0C;IACvE,MAAM,CAAC,QAAQ,CAAC,GAAG,0CAA0C;CAC9D;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,OAAO,0CAA0C;IACjE,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;IAC9D,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;CAC/D;AAED,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,OAAO,0CAA0C;IACjE,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;IAC9D,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;CAC/D;AACD,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,SAAS,wBAAwB;IACjD,MAAM,CAAC,QAAQ,CAAC,WAAW,0BAA0B;IACrD,MAAM,CAAC,QAAQ,CAAC,aAAa,4BAA4B;IACzD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,wBAAwB;IACxD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,kCAAkC;IACpE,MAAM,CAAC,QAAQ,CAAC,QAAQ,uBAAuB;IAC/C,MAAM,CAAC,QAAQ,CAAC,UAAU,0BAA0B;IACpD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,wBAAwB;IACzD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,mCAAmC;IACrE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,kCAAkC;IACpE,MAAM,CAAC,QAAQ,CAAC,cAAc,8BAA8B;IAC5D,MAAM,CAAC,QAAQ,CAAC,eAAe,8BAA8B;IAC7D,MAAM,CAAC,QAAQ,CAAC,YAAY,2BAA2B;IACvD,MAAM,CAAC,QAAQ,CAAC,WAAW,6BAA6B;IACxD,MAAM,CAAC,QAAQ,CAAC,YAAY,iCAAiC;CAC9D"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"AAKA,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,YAAY,WAAW;IACvC,MAAM,CAAC,QAAQ,CAAC,sBAAsB,qCAAqC;IAC3E,MAAM,CAAC,QAAQ,CAAC,kBAAkB,wBAAwB;IAC1D,MAAM,CAAC,QAAQ,CAAC,UAAU,eAAe;CAC1C;AAED,qBAAa,SAAS;IACpB,MAAM,CAAC,QAAQ,CAAC,gBAAgB,6CAA6C;IAC7E,MAAM,CAAC,QAAQ,CAAC,WAAW,qCAAqC;IAChE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,gEAAgE;IAClG,MAAM,CAAC,QAAQ,CAAC,YAAY,0CAA0C;CACvE;AAED,qBAAa,sBAAsB;IACjC,MAAM,CAAC,QAAQ,CAAC,iBAAiB,4CAA4C;IAC7E,MAAM,CAAC,QAAQ,CAAC,UAAU,qCAAqC;IAC/D,MAAM,CAAC,QAAQ,CAAC,UAAU,8DAA8D;CACzF;AAED,qBAAa,aAAa;IACxB,MAAM,CAAC,QAAQ,CAAC,aAAa,0CAA0C;IACvE,MAAM,CAAC,QAAQ,CAAC,GAAG,0CAA0C;CAC9D;AAED,qBAAa,cAAc;IACzB,MAAM,CAAC,QAAQ,CAAC,OAAO,0CAA0C;IACjE,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;IAC9D,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;CAC/D;AAED,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,OAAO,0CAA0C;IACjE,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;IAC9D,MAAM,CAAC,QAAQ,CAAC,IAAI,0CAA0C;IAC9D,MAAM,CAAC,QAAQ,CAAC,MAAM,0CAA0C;CACjE;AACD,qBAAa,eAAe;IAC1B,MAAM,CAAC,QAAQ,CAAC,SAAS,wBAAwB;IACjD,MAAM,CAAC,QAAQ,CAAC,WAAW,0BAA0B;IACrD,MAAM,CAAC,QAAQ,CAAC,aAAa,4BAA4B;IACzD,MAAM,CAAC,QAAQ,CAAC,gBAAgB,wBAAwB;IACxD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,kCAAkC;IACpE,MAAM,CAAC,QAAQ,CAAC,QAAQ,uBAAuB;IAC/C,MAAM,CAAC,QAAQ,CAAC,UAAU,0BAA0B;IACpD,MAAM,CAAC,QAAQ,CAAC,iBAAiB,wBAAwB;IACzD,MAAM,CAAC,QAAQ,CAAC,kBAAkB,mCAAmC;IACrE,MAAM,CAAC,QAAQ,CAAC,kBAAkB,kCAAkC;IACpE,MAAM,CAAC,QAAQ,CAAC,cAAc,8BAA8B;IAC5D,MAAM,CAAC,QAAQ,CAAC,eAAe,8BAA8B;IAC7D,MAAM,CAAC,QAAQ,CAAC,YAAY,2BAA2B;IACvD,MAAM,CAAC,QAAQ,CAAC,WAAW,6BAA6B;IACxD,MAAM,CAAC,QAAQ,CAAC,YAAY,iCAAiC;CAC9D;AAED,wBAAgB,iBAAiB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAW1D;AAGD,wBAAgB,wBAAwB,CACtC,cAAc,CAAC,EAAE,MAAM,EACvB,QAAQ,CAAC,EAAE,MAAM,EACjB,iBAAiB,CAAC,EAAE,MAAM,GACzB,MAAM,GAAG,SAAS,CAMpB;AAED,eAAO,MAAM,aAAa,UAAoD,CAAC;AAC/E,eAAO,MAAM,WAAW,UAAoE,CAAC;AAC7F,eAAO,MAAM,mBAAmB,UAAqD,CAAC;AACtF,eAAO,MAAM,UAAU,WAAY,MAAM,aAAwC,CAAC;AAClF,eAAO,MAAM,WAAW,UAA6D,CAAC"}

package/build/common/constants.js

@@ -2,7 +2,8 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.FeatureFlagName = exports.OutlookClientId = exports.OfficeClientId = exports.TeamsClientId = exports.VSCodeExtensionCommand = exports.HelpLinks = exports.ConstantString = void 0;
+exports.AzureScopes = exports.SPFxScopes = exports.GraphReadUserScopes = exports.GraphScopes = exports.AuthSvcScopes = exports.getResourceGroupInPortal = exports.getAllowedAppMaps = exports.FeatureFlagName = exports.OutlookClientId = exports.OfficeClientId = exports.TeamsClientId = exports.VSCodeExtensionCommand = exports.HelpLinks = exports.ConstantString = void 0;
+const localizeUtils_1 = require("./localizeUtils");
 class ConstantString {
 }
 exports.ConstantString = ConstantString;
@@ -40,6 +41,7 @@ exports.OutlookClientId = OutlookClientId;
 OutlookClientId.Desktop = "d3590ed6-52b3-4102-aeff-aad2292ab01c";
 OutlookClientId.Web1 = "00000002-0000-0ff1-ce00-000000000000";
 OutlookClientId.Web2 = "bc59ab01-8403-45c6-8796-ac3ef710b3e3";
+OutlookClientId.Mobile = "27922004-5251-4030-b22d-91ecd9a37ea4";
 class FeatureFlagName {
 }
 exports.FeatureFlagName = FeatureFlagName;
@@ -58,4 +60,33 @@ FeatureFlagName.ChatParticipant = "TEAMSFX_CHAT_PARTICIPANT";
 FeatureFlagName.NewGenerator = "TEAMSFX_NEW_GENERATOR";
 FeatureFlagName.CopilotAuth = "API_COPILOT_PLUGIN_AUTH";
 FeatureFlagName.CustomizeGpt = "TEAMSFX_DECLARATIVE_COPILOT";
+function getAllowedAppMaps() {
+    return {
+        [TeamsClientId.MobileDesktop]: localizeUtils_1.getLocalizedString("core.common.TeamsMobileDesktopClientName"),
+        [TeamsClientId.Web]: localizeUtils_1.getLocalizedString("core.common.TeamsWebClientName"),
+        [OfficeClientId.Desktop]: localizeUtils_1.getLocalizedString("core.common.OfficeDesktopClientName"),
+        [OfficeClientId.Web1]: localizeUtils_1.getLocalizedString("core.common.OfficeWebClientName1"),
+        [OfficeClientId.Web2]: localizeUtils_1.getLocalizedString("core.common.OfficeWebClientName2"),
+        [OutlookClientId.Desktop]: localizeUtils_1.getLocalizedString("core.common.OutlookDesktopClientName"),
+        [OutlookClientId.Web1]: localizeUtils_1.getLocalizedString("core.common.OutlookWebClientName1"),
+        [OutlookClientId.Web2]: localizeUtils_1.getLocalizedString("core.common.OutlookWebClientName2"),
+    };
+}
+exports.getAllowedAppMaps = getAllowedAppMaps;
+const AzurePortalUrl = "https://portal.azure.com";
+function getResourceGroupInPortal(subscriptionId, tenantId, resourceGroupName) {
+    if (subscriptionId && tenantId && resourceGroupName) {
+        return `${AzurePortalUrl}/#@${tenantId}/resource/subscriptions/${subscriptionId}/resourceGroups/${resourceGroupName}`;
+    }
+    else {
+        return undefined;
+    }
+}
+exports.getResourceGroupInPortal = getResourceGroupInPortal;
+exports.AuthSvcScopes = ["https://api.spaces.skype.com/Region.ReadWrite"];
+exports.GraphScopes = ["Application.ReadWrite.All", "TeamsAppInstallation.ReadForUser"];
+exports.GraphReadUserScopes = ["https://graph.microsoft.com/User.ReadBasic.All"];
+const SPFxScopes = (tenant) => [`${tenant}/Sites.FullControl.All`];
+exports.SPFxScopes = SPFxScopes;
+exports.AzureScopes = ["https://management.core.windows.net/user_impersonation"];
 //# sourceMappingURL=constants.js.map

package/build/common/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,MAAa,cAAc;;AAA3B,wCAKC;AAJiB,2BAAY,GAAG,OAAO,CAAC;AACvB,qCAAsB,GAAG,iCAAiC,CAAC;AAC3D,iCAAkB,GAAG,oBAAoB,CAAC;AAC1C,yBAAU,GAAG,WAAW,CAAC;AAG3C,MAAa,SAAS;;AAAtB,8BAKC;AAJiB,0BAAgB,GAAG,yCAAyC,CAAC;AAC7D,qBAAW,GAAG,iCAAiC,CAAC;AAChD,4BAAkB,GAAG,4DAA4D,CAAC;AAClF,sBAAY,GAAG,sCAAsC,CAAC;AAGxE,MAAa,sBAAsB;;AAAnC,wDAIC;AAHiB,wCAAiB,GAAG,wCAAwC,CAAC;AAC7D,iCAAU,GAAG,iCAAiC,CAAC;AAC/C,iCAAU,GAAG,0DAA0D,CAAC;AAG1F,MAAa,aAAa;;AAA1B,sCAGC;AAFiB,2BAAa,GAAG,sCAAsC,CAAC;AACvD,iBAAG,GAAG,sCAAsC,CAAC;AAG/D,MAAa,cAAc;;AAA3B,wCAIC;AAHiB,sBAAO,GAAG,sCAAsC,CAAC;AACjD,mBAAI,GAAG,sCAAsC,CAAC;AAC9C,mBAAI,GAAG,sCAAsC,CAAC;AAGhE,MAAa,eAAe;;AAA5B,0CAIC;AAHiB,uBAAO,GAAG,sCAAsC,CAAC;AACjD,oBAAI,GAAG,sCAAsC,CAAC;AAC9C,oBAAI,GAAG,sCAAsC,CAAC;AAEhE,MAAa,eAAe;;AAA5B,0CAgBC;AAfiB,yBAAS,GAAG,oBAAoB,CAAC;AACjC,2BAAW,GAAG,sBAAsB,CAAC;AACrC,6BAAa,GAAG,wBAAwB,CAAC;AACzC,gCAAgB,GAAG,oBAAoB,CAAC;AACxC,kCAAkB,GAAG,8BAA8B,CAAC;AACpD,wBAAQ,GAAG,mBAAmB,CAAC;AAC/B,0BAAU,GAAG,sBAAsB,CAAC;AACpC,iCAAiB,GAAG,oBAAoB,CAAC;AACzC,kCAAkB,GAAG,+BAA+B,CAAC;AACrD,kCAAkB,GAAG,8BAA8B,CAAC;AACpD,8BAAc,GAAG,0BAA0B,CAAC;AAC5C,+BAAe,GAAG,0BAA0B,CAAC;AAC7C,4BAAY,GAAG,uBAAuB,CAAC;AACvC,2BAAW,GAAG,yBAAyB,CAAC;AACxC,4BAAY,GAAG,6BAA6B,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../src/common/constants.ts"],"names":[],"mappings":"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"}

package/build/common/globalState.js

@@ -10,7 +10,7 @@ const fs = tslib_1.__importStar(require("fs-extra"));
 const crypto_1 = tslib_1.__importDefault(require("crypto"));
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const proper_lockfile_1 = tslib_1.__importDefault(require("proper-lockfile"));
-const tools_1 = require("./tools");
+const utils_1 = require("./utils");
 const GlobalStateFileName = "state.json";
 /**
  * Return a value.
@@ -43,7 +43,7 @@ async function globalStateGet(key, defaultValue) {
         }
         catch (e) {
             if (e["code"] === "ELOCKED") {
-                await tools_1.waitSeconds(1);
+                await utils_1.waitSeconds(1);
                 continue;
             }
             return undefined;
@@ -79,7 +79,7 @@ async function globalStateUpdate(key, value) {
         }
         catch (e) {
             if (e["code"] === "ELOCKED") {
-                await tools_1.waitSeconds(1);
+                await utils_1.waitSeconds(1);
                 continue;
             }
             throw e;

package/build/common/local/taskDefinition.js

@@ -7,7 +7,7 @@ const tslib_1 = require("tslib");
 const constants_1 = require("./constants");
 const path_1 = tslib_1.__importDefault(require("path"));
 const system_1 = require("../deps-checker/util/system");
-const create_1 = require("../../question/create");
+const constants_2 = require("../../question/constants");
 class TaskDefinition {
     static frontendStart(workspaceFolder) {
         return {
@@ -23,7 +23,7 @@ class TaskDefinition {
     static backendStart(workspaceFolder, programmingLanguage, funcCommand, enableLanguageWorker) {
         // NOTE: properly handle quoting and escaping to work on windows (both powershell and cmd), linux and osx
         const languageWorkerArg = enableLanguageWorker ? `--language-worker="--inspect=9229"` : "";
-        const args = programmingLanguage === create_1.ProgrammingLanguage.TS
+        const args = programmingLanguage === constants_2.ProgrammingLanguage.TS
             ? `start --typescript ${languageWorkerArg} --port "7071" --cors "*"`
             : `start --javascript ${languageWorkerArg} --port "7071" --cors "*"`;
         return {
@@ -63,7 +63,7 @@ class TaskDefinition {
     static botStart(workspaceFolder, programmingLanguage, enableInspect) {
         // TODO: tell nodemon which files to watch (depends on bot's decision)
         const inspectArg = enableInspect ? "--inspect=9239" : "";
-        const command = programmingLanguage === create_1.ProgrammingLanguage.TS
+        const command = programmingLanguage === constants_2.ProgrammingLanguage.TS
             ? `npx nodemon --exec node ${inspectArg} --signal SIGINT -r ts-node/register index.ts`
             : `npx nodemon ${inspectArg} --signal SIGINT index.js`;
         return {

package/build/common/local/taskDefinition.js.map

@@ -1 +1 @@
-{"version":3,"file":"taskDefinition.js","sourceRoot":"","sources":["../../../src/common/local/taskDefinition.ts"],"names":[],"mappings":"AAAA,uCAAuC;AACvC,kCAAkC;AAClC,YAAY,CAAC;;;;AAEb,2CAA4D;AAC5D,wDAAwB;AACxB,wDAAwD;AACxD,kDAA4D;AAe5D,MAAa,cAAc;IACzB,MAAM,CAAC,aAAa,CAAC,eAAuB;QAC1C,OAAO;YACL,IAAI,EAAE,gBAAgB;YACtB,OAAO,EAAE,yBAAyB;YAClC,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY,CACjB,eAAuB,EACvB,mBAAuC,EACvC,WAAmB,EACnB,oBAA6B;QAE7B,yGAAyG;QACzG,MAAM,iBAAiB,GAAG,oBAAoB,CAAC,CAAC,CAAC,oCAAoC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC3F,MAAM,IAAI,GACR,mBAAmB,KAAK,4BAAmB,CAAC,EAAE;YAC5C,CAAC,CAAC,sBAAsB,iBAAiB,2BAA2B;YACpE,CAAC,CAAC,sBAAsB,iBAAiB,2BAA2B,CAAC;QACzE,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,GAAG,WAAW,IAAI,IAAI,EAAE;YACjC,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;gBACf,OAAO,EAAE,kBAAS,EAAE;aACrB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,YAAY,CAAC,eAAuB;QACzC,OAAO;YACL,IAAI,EAAE,eAAe;YACrB,OAAO,EAAE,iBAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,cAAsB,EAAE,eAAmC;QAC1E,OAAO;YACL,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,cAAc;YACvB,IAAI,EAAE,CAAC,kCAAkC,CAAC;YAC1C,GAAG,EAAE,eAAe;YACpB,WAAW,EAAE;gBACX,SAAS,EAAE,KAAK;aACjB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CACb,eAAuB,EACvB,mBAAuC,EACvC,aAAsB;QAEtB,sEAAsE;QACtE,MAAM,UAAU,GAAG,aAAa,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,EAAE,CAAC;QACzD,MAAM,OAAO,GACX,mBAAmB,KAAK,4BAAmB,CAAC,EAAE;YAC5C,CAAC,CAAC,2BAA2B,UAAU,+CAA+C;YACtF,CAAC,CAAC,eAAe,UAAU,2BAA2B,CAAC;QAC3D,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,OAAO,EAAE,OAAO;YAChB,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,GAAG,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,eAAuB;QAC/C,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,0DAA0D;YAC1D,OAAO,EAAE,uBAAuB;YAChC,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,GAAG,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,kBAAkB,CAAC,eAAuB;QAC/C,OAAO;YACL,IAAI,EAAE,WAAW;YACjB,0DAA0D;YAC1D,OAAO,EAAE,qBAAqB;YAC9B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,GAAG,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;gBACf,OAAO,EAAE,kBAAS,EAAE;aACrB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,oBAAoB,CAAC,eAAuB;QACjD,OAAO;YACL,IAAI,EAAE,wBAAwB;YAC9B,OAAO,EAAE,iCAAiC;YAC1C,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,GAAG,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,UAAU,CACf,eAAuB,EACvB,SAAkB,EAClB,eAAqC;;QAErC,OAAO;YACL,IAAI,EAAE,aAAa;YACnB,OAAO,EAAE,SAAS;gBAChB,CAAC,CAAC,mEAAmE;gBACrE,CAAC,CAAC,8BAA8B;YAClC,GAAG,EAAE,eAAe;gBAClB,CAAC,CAAC;oBACE,IAAI,EAAE,GAAG,eAAe,CAAC,IAAI,CAAC,cAAI,CAAC,SAAS,CAAC,GAAG,cAAI,CAAC,SAAS,GAC5D,MAAA,OAAO,CAAC,GAAG,CAAC,IAAI,mCAAI,EACtB,EAAE;iBACH;gBACH,CAAC,CAAC,SAAS;YACb,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,GAAG,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;gBACf,OAAO,EAAE,kBAAS,EAAE;aACrB;YACD,YAAY,EAAE,CAAC,SAAS;SACzB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,eAAe,CAAC,eAAuB;QAC5C,OAAO;YACL,IAAI,EAAE,sBAAsB;YAC5B,OAAO,EAAE,6BAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,cAAc,CAAC,eAAuB;QAC3C,OAAO;YACL,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,6BAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,wBAAwB,CAC7B,eAAuB,EACvB,cAAsB;QAEtB,OAAO;YACL,IAAI,EAAE,4BAA4B;YAClC,OAAO,EAAE,cAAc;YACvB,IAAI,EAAE,CAAC,OAAO,EAAE,mBAAmB,EAAE,IAAI,EAAE,KAAK,EAAE,yBAAyB,CAAC;YAC5E,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,QAAQ,CAAC;YACpD,WAAW,EAAE;gBACX,SAAS,EAAE,KAAK;aACjB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,UAAU,CAAC,eAAuB;QACvC,OAAO;YACL,IAAI,EAAE,iBAAiB;YACvB,OAAO,EAAE,6BAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,GAAG,CAAC;YAC/C,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,eAAuB;QACxC,OAAO;YACL,IAAI,EAAE,kBAAkB;YACxB,OAAO,EAAE,6BAAiB;YAC1B,GAAG,EAAE,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,IAAI,CAAC;YAChD,WAAW,EAAE;gBACX,SAAS,EAAE,IAAI;aAChB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,QAAQ,CAAC,eAAuB;QACrC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,IAAI,CAAC,CAAC;QAC7D,OAAO;YACL,IAAI,EAAE,qBAAqB;YAC3B,OAAO,EAAE,MAAM;YACf,IAAI,EAAE,CAAC,GAAG,QAAQ,gCAAgC,EAAE,gBAAgB,EAAE,YAAY,CAAC;YACnF,GAAG,EAAE,QAAQ;YACb,WAAW,EAAE;gBACX,SAAS,EAAE,KAAK;aACjB;YACD,YAAY,EAAE,KAAK;SACpB,CAAC;IACJ,CAAC;IAED,MAAM,CAAC,SAAS,CAAC,eAAuB;QACtC,MAAM,QAAQ,GAAG,cAAI,CAAC,IAAI,CAAC,eAAe,EAAE,sBAAU,CAAC,IAAI,CAAC,CAAC;QAC7D,OAAO;YACL,IAAI,EAAE,YAAY;YAClB,OAAO,EAAE,MAAM;YACf,IAAI,EAAE,CAAC,GAAG,QAAQ,gCAAgC,EAAE,OAAO,EAAE,aAAa,EAAE,YAAY,CAAC;YACzF,GAAG,EAAE,QAAQ;YACb,WAAW,EAAE;gBACX,SAAS,EAAE,KAAK;aACjB;YACD,YAAY,EAAE,IAAI;SACnB,CAAC;IACJ,CAAC;CACF;AAhPD,wCAgPC"}
+{"version":3,"file":"taskDefinition.js","sourceRoot":"","sources":["../../../src/common/local/taskDefinition.ts"],"names":[],"mappings":"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"}

package/build/common/m365/launchHelper.d.ts

@@ -1,5 +1,5 @@
 import { FxError, LogProvider, M365TokenProvider, Result } from "@microsoft/teamsfx-api";
-import { HubTypes } from "../../question/other";
+import { HubTypes } from "../../question/constants";
 export declare class LaunchHelper {
     private readonly m365TokenProvider;
     private readonly logger?;

package/build/common/m365/launchHelper.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"launchHelper.d.ts","sourceRoot":"","sources":["../../../src/common/m365/launchHelper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAQlG,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAIhD,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;gBAEnB,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,WAAW;IAKhE,YAAY,CACvB,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,aAAa,UAAO,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAqDtB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAwBjE,eAAe;YAUf,eAAe;CAS9B"}
+{"version":3,"file":"launchHelper.d.ts","sourceRoot":"","sources":["../../../src/common/m365/launchHelper.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAM,MAAM,EAAE,MAAM,wBAAwB,CAAC;AAMlG,OAAO,EAAE,QAAQ,EAAE,MAAM,0BAA0B,CAAC;AAMpD,qBAAa,YAAY;IACvB,OAAO,CAAC,QAAQ,CAAC,iBAAiB,CAAoB;IACtD,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAc;gBAEnB,iBAAiB,EAAE,iBAAiB,EAAE,MAAM,CAAC,EAAE,WAAW;IAKhE,YAAY,CACvB,GAAG,EAAE,QAAQ,EACb,UAAU,EAAE,MAAM,EAClB,YAAY,EAAE,MAAM,EAAE,EACtB,aAAa,UAAO,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAqDtB,YAAY,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;YAwBjE,eAAe;YAUf,eAAe;CAS9B"}

package/build/common/m365/launchHelper.js

@@ -5,15 +5,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LaunchHelper = void 0;
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const hooks_1 = require("@feathersjs/hooks");
 const error_1 = require("../../core/error");
-const tools_1 = require("../tools");
+const globalVars_1 = require("../../core/globalVars");
+const common_1 = require("../../error/common");
+const constants_1 = require("../../question/constants");
 const errors_1 = require("./errors");
 const packageService_1 = require("./packageService");
 const serviceConstant_1 = require("./serviceConstant");
-const common_1 = require("../../error/common");
-const other_1 = require("../../question/other");
-const globalVars_1 = require("../../core/globalVars");
-const hooks_1 = require("@feathersjs/hooks");
+const constants_2 = require("../../component/driver/teamsApp/constants");
 class LaunchHelper {
     constructor(m365TokenProvider, logger) {
         this.m365TokenProvider = m365TokenProvider;
@@ -27,7 +27,7 @@ class LaunchHelper {
         let url;
         const copilotCapabilities = ["plugin", "copilotGpt"];
         switch (hub) {
-            case other_1.HubTypes.teams: {
+            case constants_1.HubTypes.teams: {
                 let installAppPackage = true;
                 if (capabilities.length > 0 &&
                     capabilities.filter((capability) => !copilotCapabilities.includes(capability)).length == 0) {
@@ -43,7 +43,7 @@ class LaunchHelper {
                 }
                 break;
             }
-            case other_1.HubTypes.outlook: {
+            case constants_1.HubTypes.outlook: {
                 const result = await this.getM365AppId(teamsAppId);
                 if (result.isErr()) {
                     return teamsfx_api_1.err(result.error);
@@ -54,7 +54,7 @@ class LaunchHelper {
                 url = new URL(baseUrl);
                 break;
             }
-            case other_1.HubTypes.office:
+            case constants_1.HubTypes.office:
                 {
                     const result = await this.getM365AppId(teamsAppId);
                     if (result.isErr()) {
@@ -95,7 +95,7 @@ class LaunchHelper {
     }
     async getTidFromToken() {
         try {
-            const statusRes = await this.m365TokenProvider.getStatus({ scopes: tools_1.AppStudioScopes });
+            const statusRes = await this.m365TokenProvider.getStatus({ scopes: constants_2.AppStudioScopes });
             const tokenObject = statusRes.isOk() ? statusRes.value.accountInfo : undefined;
             return tokenObject === null || tokenObject === void 0 ? void 0 : tokenObject.tid;
         }
@@ -105,7 +105,7 @@ class LaunchHelper {
     }
     async getUpnFromToken() {
         try {
-            const statusRes = await this.m365TokenProvider.getStatus({ scopes: tools_1.AppStudioScopes });
+            const statusRes = await this.m365TokenProvider.getStatus({ scopes: constants_2.AppStudioScopes });
             const tokenObject = statusRes.isOk() ? statusRes.value.accountInfo : undefined;
             return tokenObject === null || tokenObject === void 0 ? void 0 : tokenObject.upn;
         }

package/build/common/m365/launchHelper.js.map

@@ -1 +1 @@
-{"version":3,"file":"launchHelper.js","sourceRoot":"","sources":["../../../src/common/m365/launchHelper.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"launchHelper.js","sourceRoot":"","sources":["../../../src/common/m365/launchHelper.ts"],"names":[],"mappings":"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"}

package/build/common/m365/packageService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"packageService.d.ts","sourceRoot":"","sources":["../../../src/common/m365/packageService.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,WAAW,EAA0B,MAAM,wBAAwB,CAAC;AAsB7E,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAC,cAAc,CAAiB;IAE9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;WAEnC,iBAAiB,IAAI,cAAc;gBAU9B,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAQ5C,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBlD,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAiEnF,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwE3E,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAsD1E,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IASnE,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAO7E,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBxD,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA6BxE,oBAAoB,CAC/B,KAAK,EAAE,MAAM,EACb,cAAc,UAAQ,GACrB,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC;IAwCnB,gBAAgB,CAC3B,KAAK,EAAE,MAAM,EACb,cAAc,UAAQ,GACrB,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAgC/B,OAAO,CAAC,UAAU;IAwBlB,OAAO,CAAC,QAAQ;CASjB"}
+{"version":3,"file":"packageService.d.ts","sourceRoot":"","sources":["../../../src/common/m365/packageService.ts"],"names":[],"mappings":"AAIA,OAAO,EAAE,WAAW,EAA0B,MAAM,wBAAwB,CAAC;AAuB7E,qBAAa,cAAc;IACzB,OAAO,CAAC,MAAM,CAAC,cAAc,CAAiB;IAE9C,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC;IAC/B,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC;IAC9B,OAAO,CAAC,QAAQ,CAAC,MAAM,CAA0B;WAEnC,iBAAiB,IAAI,cAAc;gBAU9B,QAAQ,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,WAAW;IAQ5C,kBAAkB,CAAC,KAAK,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IAwBlD,mBAAmB,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAiEnF,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,GAAG,OAAO,CAAC,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IAwE3E,yBAAyB,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC;IAsD1E,eAAe,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC;IASnE,aAAa,CAAC,KAAK,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,GAAG,SAAS,CAAC;IAO7E,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAmBxD,sBAAsB,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;IA6BxE,oBAAoB,CAC/B,KAAK,EAAE,MAAM,EACb,cAAc,UAAQ,GACrB,OAAO,CAAC,MAAM,EAAE,GAAG,SAAS,CAAC;IAwCnB,gBAAgB,CAC3B,KAAK,EAAE,MAAM,EACb,cAAc,UAAQ,GACrB,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC;IAgC/B,OAAO,CAAC,UAAU;IAwBlB,OAAO,CAAC,QAAQ;CASjB"}

package/build/common/m365/packageService.js

@@ -4,19 +4,19 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackageService = void 0;
 const tslib_1 = require("tslib");
+const hooks_1 = require("@feathersjs/hooks");
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const form_data_1 = tslib_1.__importDefault(require("form-data"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
-const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const tools_1 = require("../tools");
-const errors_1 = require("./errors");
-const serviceConstant_1 = require("./serviceConstant");
+const globalVars_1 = require("../../core/globalVars");
 const common_1 = require("../../error/common");
 const types_1 = require("../../error/types");
-const globalVars_1 = require("../../core/globalVars");
-const hooks_1 = require("@feathersjs/hooks");
 const telemetry_1 = require("../telemetry");
+const utils_1 = require("../utils");
 const wrappedAxiosClient_1 = require("../wrappedAxiosClient");
+const errors_1 = require("./errors");
+const serviceConstant_1 = require("./serviceConstant");
 const M365ErrorSource = "M365";
 const M365ErrorComponent = "PackageService";
 // Call m365 service for package CRUD
@@ -101,7 +101,7 @@ class PackageService {
                         return [titleId, appId];
                     }
                     else {
-                        await tools_1.waitSeconds(2);
+                        await utils_1.waitSeconds(2);
                     }
                 } while (true);
             }
@@ -165,7 +165,7 @@ class PackageService {
                     return [titleId, appId];
                 }
                 else {
-                    await tools_1.waitSeconds(2);
+                    await utils_1.waitSeconds(2);
                 }
             } while (true);
         }
@@ -310,7 +310,7 @@ class PackageService {
             // Short nextInterval means cache is refreshing
             if (ensureUpToDate && nextInterval > 0 && nextInterval < 10) {
                 (_f = this.logger) === null || _f === void 0 ? void 0 : _f.debug(`Active experiences is refreshing, wait for ${nextInterval} seconds.`);
-                await tools_1.waitSeconds(nextInterval);
+                await utils_1.waitSeconds(nextInterval);
                 response = await this.axiosInstance.get("/catalog/v1/users/uitypes", {
                     baseURL: serviceUrl,
                     headers: {

package/build/common/m365/packageService.js.map

@@ -1 +1 @@
-{"version":3,"file":"packageService.js","sourceRoot":"","sources":["../../../src/common/m365/packageService.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"packageService.js","sourceRoot":"","sources":["../../../src/common/m365/packageService.ts"],"names":[],"mappings":"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"}

package/build/common/requestUtils.d.ts

@@ -0,0 +1,4 @@
+import { AxiosResponse, CancelToken } from "axios";
+export declare function sendRequestWithRetry<T>(requestFn: () => Promise<AxiosResponse<T>>, tryLimits: number): Promise<AxiosResponse<T>>;
+export declare function sendRequestWithTimeout<T>(requestFn: (cancelToken: CancelToken) => Promise<AxiosResponse<T>>, timeoutInMs: number, tryLimits?: number): Promise<AxiosResponse<T>>;
+//# sourceMappingURL=requestUtils.d.ts.map

package/build/common/requestUtils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"requestUtils.d.ts","sourceRoot":"","sources":["../../src/common/requestUtils.ts"],"names":[],"mappings":"AAGA,OAAc,EAAE,aAAa,EAAE,WAAW,EAAE,MAAM,OAAO,CAAC;AAE1D,wBAAsB,oBAAoB,CAAC,CAAC,EAC1C,SAAS,EAAE,MAAM,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAC1C,SAAS,EAAE,MAAM,GAChB,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAwB3B;AACD,wBAAsB,sBAAsB,CAAC,CAAC,EAC5C,SAAS,EAAE,CAAC,WAAW,EAAE,WAAW,KAAK,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,EAClE,WAAW,EAAE,MAAM,EACnB,SAAS,SAAI,GACZ,OAAO,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,CAe3B"}

package/build/common/requestUtils.js

@@ -0,0 +1,52 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.sendRequestWithTimeout = exports.sendRequestWithRetry = void 0;
+const tslib_1 = require("tslib");
+const axios_1 = tslib_1.__importDefault(require("axios"));
+async function sendRequestWithRetry(requestFn, tryLimits) {
+    var _a;
+    // !status means network error, see https://github.com/axios/axios/issues/383
+    const canTry = (status) => !status || (status >= 500 && status < 600);
+    let status;
+    let error;
+    for (let i = 0; i < tryLimits && canTry(status); i++) {
+        try {
+            const res = await requestFn();
+            if (res.status === 200 || res.status === 201) {
+                return res;
+            }
+            else {
+                error = new Error(`HTTP Request failed: ${JSON.stringify(res)}`);
+            }
+            status = res.status;
+        }
+        catch (e) {
+            error = e;
+            status = (_a = e === null || e === void 0 ? void 0 : e.response) === null || _a === void 0 ? void 0 : _a.status;
+        }
+    }
+    error !== null && error !== void 0 ? error : (error = new Error(`RequestWithRetry got bad tryLimits: ${tryLimits}`));
+    throw error;
+}
+exports.sendRequestWithRetry = sendRequestWithRetry;
+async function sendRequestWithTimeout(requestFn, timeoutInMs, tryLimits = 1) {
+    const source = axios_1.default.CancelToken.source();
+    const timeout = setTimeout(() => {
+        source.cancel();
+    }, timeoutInMs);
+    try {
+        const res = await sendRequestWithRetry(() => requestFn(source.token), tryLimits);
+        clearTimeout(timeout);
+        return res;
+    }
+    catch (err) {
+        if (axios_1.default.isCancel(err)) {
+            throw new Error("Request timeout");
+        }
+        throw err;
+    }
+}
+exports.sendRequestWithTimeout = sendRequestWithTimeout;
+//# sourceMappingURL=requestUtils.js.map

package/build/common/requestUtils.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"requestUtils.js","sourceRoot":"","sources":["../../src/common/requestUtils.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;;AAElC,0DAA0D;AAEnD,KAAK,UAAU,oBAAoB,CACxC,SAA0C,EAC1C,SAAiB;;IAEjB,6EAA6E;IAC7E,MAAM,MAAM,GAAG,CAAC,MAA0B,EAAE,EAAE,CAAC,CAAC,MAAM,IAAI,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,GAAG,GAAG,CAAC,CAAC;IAE1F,IAAI,MAA0B,CAAC;IAC/B,IAAI,KAAY,CAAC;IAEjB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,IAAI,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,EAAE,EAAE;QACpD,IAAI;YACF,MAAM,GAAG,GAAG,MAAM,SAAS,EAAE,CAAC;YAC9B,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,KAAK,GAAG,EAAE;gBAC5C,OAAO,GAAG,CAAC;aACZ;iBAAM;gBACL,KAAK,GAAG,IAAI,KAAK,CAAC,wBAAwB,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC;aAClE;YACD,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;SACrB;QAAC,OAAO,CAAM,EAAE;YACf,KAAK,GAAG,CAAC,CAAC;YACV,MAAM,GAAG,MAAA,CAAC,aAAD,CAAC,uBAAD,CAAC,CAAE,QAAQ,0CAAE,MAAM,CAAC;SAC9B;KACF;IAED,KAAK,aAAL,KAAK,cAAL,KAAK,IAAL,KAAK,GAAK,IAAI,KAAK,CAAC,uCAAuC,SAAS,EAAE,CAAC,EAAC;IACxE,MAAM,KAAK,CAAC;AACd,CAAC;AA3BD,oDA2BC;AACM,KAAK,UAAU,sBAAsB,CAC1C,SAAkE,EAClE,WAAmB,EACnB,SAAS,GAAG,CAAC;IAEb,MAAM,MAAM,GAAG,eAAK,CAAC,WAAW,CAAC,MAAM,EAAE,CAAC;IAC1C,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,EAAE;QAC9B,MAAM,CAAC,MAAM,EAAE,CAAC;IAClB,CAAC,EAAE,WAAW,CAAC,CAAC;IAChB,IAAI;QACF,MAAM,GAAG,GAAG,MAAM,oBAAoB,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC,CAAC;QACjF,YAAY,CAAC,OAAO,CAAC,CAAC;QACtB,OAAO,GAAG,CAAC;KACZ;IAAC,OAAO,GAAY,EAAE;QACrB,IAAI,eAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;YACvB,MAAM,IAAI,KAAK,CAAC,iBAAiB,CAAC,CAAC;SACpC;QACD,MAAM,GAAG,CAAC;KACX;AACH,CAAC;AAnBD,wDAmBC"}

package/build/common/samples.d.ts

@@ -1,6 +1,11 @@
-import { SampleUrlInfo } from "../component/generator/utils";
 export declare const SampleConfigTag = "v2.5.0";
 export declare const SampleConfigBranchForPrerelease = "main";
+export declare type SampleUrlInfo = {
+    owner: string;
+    repository: string;
+    ref: string;
+    dir: string;
+};
 export interface SampleConfig {
     id: string;
     onboardDate: Date;

package/build/common/samples.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"samples.d.ts","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,aAAa,EAA0B,MAAM,8BAA8B,CAAC;AAUrF,eAAO,MAAM,eAAe,WAAW,CAAC;AAExC,eAAO,MAAM,+BAA+B,SAAS,CAAC;AAEtD,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,IAAI,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IAExB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,aAAa,CAAC;CAChC;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,aAAa,EAAE;QACb,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;CACH;AAOD,cAAM,cAAc;IAClB,OAAO,CAAC,gBAAgB,CAA+B;IAEvD,IAAW,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAKvD;IAEY,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;YAM/C,uBAAuB;IAsCrC,OAAO,CAAC,uBAAuB;IA4ClB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;YA2BzD,mBAAmB;CAiBlC;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}
+{"version":3,"file":"samples.d.ts","sourceRoot":"","sources":["../../src/common/samples.ts"],"names":[],"mappings":"AAeA,eAAO,MAAM,eAAe,WAAW,CAAC;AAExC,eAAO,MAAM,+BAA+B,SAAS,CAAC;AAEtD,oBAAY,aAAa,GAAG;IAC1B,KAAK,EAAE,MAAM,CAAC;IACd,UAAU,EAAE,MAAM,CAAC;IACnB,GAAG,EAAE,MAAM,CAAC;IACZ,GAAG,EAAE,MAAM,CAAC;CACb,CAAC;AAEF,MAAM,WAAW,YAAY;IAC3B,EAAE,EAAE,MAAM,CAAC;IACX,WAAW,EAAE,IAAI,CAAC;IAClB,KAAK,EAAE,MAAM,CAAC;IACd,gBAAgB,EAAE,MAAM,CAAC;IACzB,eAAe,EAAE,MAAM,CAAC;IAExB,KAAK,EAAE,MAAM,EAAE,CAAC;IAChB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,IAAI,EAAE,MAAM,CAAC;IACb,aAAa,EAAE,MAAM,CAAC;IACtB,SAAS,EAAE,OAAO,CAAC;IACnB,aAAa,EAAE,MAAM,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAE3B,qBAAqB,CAAC,EAAE,MAAM,CAAC;IAC/B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,eAAe,EAAE,aAAa,CAAC;CAChC;AAED,UAAU,gBAAgB;IACxB,OAAO,EAAE,YAAY,EAAE,CAAC;IACxB,aAAa,EAAE;QACb,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,SAAS,EAAE,MAAM,EAAE,CAAC;QACpB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;CACH;AAOD,cAAM,cAAc;IAClB,OAAO,CAAC,gBAAgB,CAA+B;IAEvD,IAAW,gBAAgB,IAAI,OAAO,CAAC,gBAAgB,CAAC,CAKvD;IAEY,mBAAmB,IAAI,OAAO,CAAC,gBAAgB,CAAC;YAM/C,uBAAuB;IAsCrC,OAAO,CAAC,uBAAuB;IA4ClB,mBAAmB,CAAC,MAAM,EAAE,YAAY,GAAG,OAAO,CAAC,MAAM,CAAC;YA2BzD,mBAAmB;CAiBlC;AAED,eAAO,MAAM,cAAc,gBAAuB,CAAC"}

package/build/common/samples.js

@@ -6,10 +6,10 @@ exports.sampleProvider = exports.SampleConfigBranchForPrerelease = exports.Sampl
 const tslib_1 = require("tslib");
 const axios_1 = tslib_1.__importDefault(require("axios"));
 const hooks_1 = require("@feathersjs/hooks");
-const utils_1 = require("../component/generator/utils");
 const globalVars_1 = require("../core/globalVars");
 const common_1 = require("../error/common");
 const constants_1 = require("./constants");
+const requestUtils_1 = require("./requestUtils");
 const packageJson = require("../../package.json");
 const SampleConfigOwner = "OfficeDev";
 const SampleConfigRepo = "TeamsFx-Samples";
@@ -100,7 +100,7 @@ class SampleProvider {
         const urlInfo = sample.downloadUrlInfo;
         const url = `https://api.github.com/repos/${urlInfo.owner}/${urlInfo.repository}/readme/${urlInfo.dir}/?ref=${urlInfo.ref}`;
         try {
-            const readmeResponse = await utils_1.sendRequestWithTimeout(async () => {
+            const readmeResponse = await requestUtils_1.sendRequestWithTimeout(async () => {
                 return await axios_1.default.get(url, {
                     headers: {
                         Accept: "application/vnd.github.html",
@@ -122,7 +122,7 @@ class SampleProvider {
     async fetchRawFileContent(branchOrTag) {
         const url = `https://raw.githubusercontent.com/${SampleConfigOwner}/${SampleConfigRepo}/${branchOrTag}/${SampleConfigFile}`;
         try {
-            const fileResponse = await utils_1.sendRequestWithTimeout(async () => {
+            const fileResponse = await requestUtils_1.sendRequestWithTimeout(async () => {
                 return await axios_1.default.get(url, { responseType: "json" });
             }, 1000, 3);
             if (fileResponse && fileResponse.data) {