@microsoft/teamsfx-core 3.0.5-alpha.c3195a105.0 → 3.0.5-alpha.ca20d3d57.0

package/build/component/driver/index.js

@@ -5,40 +5,39 @@ Object.defineProperty(exports, "__esModule", { value: true });
 /**
  * @author xzf0587 <zhaofengxu@microsoft.com>
  */
-require("./teamsApp/create");
-require("./teamsApp/validate");
-require("./teamsApp/validateAppPackage");
-require("./teamsApp/validateTestCases");
-require("./teamsApp/configure");
-require("./teamsApp/copyAppPackageToSPFx");
-require("./teamsApp/publishAppPackage");
-require("./teamsApp/syncManifest");
-require("./devChannel/create");
-require("./devChannel/installApp");
 require("./aad/create");
 require("./aad/update");
+require("./add/addWebPart");
+require("./apiKey/create");
+require("./apiKey/update");
 require("./arm/deploy");
 require("./botAadApp/create");
+require("./botFramework/createOrUpdateBot");
 require("./deploy/azure/azureAppServiceDeployDriver");
 require("./deploy/azure/azureFunctionDeployDriver");
+require("./deploy/azure/azureStaticWebAppGetDeploymentTokenDriver");
 require("./deploy/azure/azureStorageDeployDriver");
 require("./deploy/azure/azureStorageStaticWebsiteConfigDriver");
 require("./deploy/spfx/deployDriver");
-require("./deploy/azure/azureStaticWebAppGetDeploymentTokenDriver");
-require("./script/dotnetBuildDriver");
-require("./script/npmBuildDriver");
-require("./script/npxBuildDriver");
-require("./script/scriptDriver");
+require("./devChannel/create");
+require("./devChannel/installApp");
 require("./devTool/installDriver");
 require("./file/createOrUpdateEnvironmentFile");
 require("./file/createOrUpdateJsonFile");
-require("./botFramework/createOrUpdateBot");
 require("./m365/acquire");
-require("./add/addWebPart");
-require("./apiKey/create");
-require("./apiKey/update");
 require("./oauth/create");
 require("./oauth/update");
-require("./share/shareToOthers");
+require("./script/dotnetBuildDriver");
+require("./script/npmBuildDriver");
+require("./script/npxBuildDriver");
+require("./script/scriptDriver");
+require("./teamsApp/configure");
+require("./teamsApp/copyAppPackageToSPFx");
+require("./teamsApp/create");
+require("./teamsApp/publishAppPackage");
+require("./teamsApp/syncManifest");
+require("./teamsApp/validate");
+require("./teamsApp/validateAppPackage");
+require("./teamsApp/validateTestCases");
 require("./typeSpec/compile");
 //# sourceMappingURL=index.js.map

package/build/component/driver/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAElC;;GAEG;AACH,6BAA2B;AAC3B,+BAA6B;AAC7B,yCAAuC;AACvC,wCAAsC;AACtC,gCAA8B;AAC9B,2CAAyC;AACzC,wCAAsC;AACtC,mCAAiC;AACjC,+BAA6B;AAC7B,mCAAiC;AACjC,wBAAsB;AACtB,wBAAsB;AACtB,wBAAsB;AACtB,8BAA4B;AAC5B,sDAAoD;AACpD,oDAAkD;AAClD,mDAAiD;AACjD,gEAA8D;AAC9D,sCAAoC;AACpC,oEAAkE;AAClE,sCAAoC;AACpC,mCAAiC;AACjC,mCAAiC;AACjC,iCAA+B;AAC/B,mCAAiC;AACjC,gDAA8C;AAC9C,yCAAuC;AACvC,4CAA0C;AAC1C,0BAAwB;AACxB,4BAA0B;AAC1B,2BAAyB;AACzB,2BAAyB;AACzB,0BAAwB;AACxB,0BAAwB;AACxB,iCAA+B;AAC/B,8BAA4B"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/component/driver/index.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;AAElC;;GAEG;AACH,wBAAsB;AACtB,wBAAsB;AACtB,4BAA0B;AAC1B,2BAAyB;AACzB,2BAAyB;AACzB,wBAAsB;AACtB,8BAA4B;AAC5B,4CAA0C;AAC1C,sDAAoD;AACpD,oDAAkD;AAClD,oEAAkE;AAClE,mDAAiD;AACjD,gEAA8D;AAC9D,sCAAoC;AACpC,+BAA6B;AAC7B,mCAAiC;AACjC,mCAAiC;AACjC,gDAA8C;AAC9C,yCAAuC;AACvC,0BAAwB;AACxB,0BAAwB;AACxB,0BAAwB;AACxB,sCAAoC;AACpC,mCAAiC;AACjC,mCAAiC;AACjC,iCAA+B;AAC/B,gCAA8B;AAC9B,2CAAyC;AACzC,6BAA2B;AAC3B,wCAAsC;AACtC,mCAAiC;AACjC,+BAA6B;AAC7B,yCAAuC;AACvC,wCAAsC;AACtC,8BAA4B"}

package/build/component/driver/m365/acquire.d.ts

@@ -1,9 +1,12 @@
 import { FxError, Result } from "@microsoft/teamsfx-api";
+import { AppScope } from "../../m365/packageService";
 import { DriverContext } from "../interface/commonArgs";
 import { ExecutionResult, StepDriver } from "../interface/stepDriver";
 interface AcquireArgs {
     appPackagePath?: string;
+    scope?: AppScope;
 }
+export declare const actionName = "teamsApp/extendToM365";
 export declare class M365TitleAcquireDriver implements StepDriver {
     description: string;
     readonly progressTitle: string;

package/build/component/driver/m365/acquire.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"acquire.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAQjF,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGtE,UAAU,WAAW;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAUD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAAyD;IACpE,QAAQ,CAAC,aAAa,SAA8D;IAGvE,GAAG,CACd,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAClB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;YAab,OAAO;IAsDrB,OAAO,CAAC,YAAY;IAYpB,OAAO,CAAC,yBAAyB;CAKlC"}
+{"version":3,"file":"acquire.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/m365/acquire.ts"],"names":[],"mappings":"AAOA,OAAO,EAAE,OAAO,EAAE,MAAM,EAA0B,MAAM,wBAAwB,CAAC;AAIjF,OAAO,EAAE,QAAQ,EAAkB,MAAM,2BAA2B,CAAC;AAIrE,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAGtE,UAAU,WAAW;IACnB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,KAAK,CAAC,EAAE,QAAQ,CAAC;CAClB;AAED,eAAO,MAAM,UAAU,0BAA0B,CAAC;AASlD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAAyD;IACpE,QAAQ,CAAC,aAAa,SAA8D;IAGvE,GAAG,CACd,IAAI,EAAE,WAAW,EACjB,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;IAQnC,OAAO,CAClB,IAAI,EAAE,WAAW,EACjB,GAAG,EAAE,aAAa,EAClB,iBAAiB,CAAC,EAAE,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,GACtC,OAAO,CAAC,eAAe,CAAC;YAab,OAAO;IA6DrB,OAAO,CAAC,YAAY;IAqBpB,OAAO,CAAC,yBAAyB;CAKlC"}

package/build/component/driver/m365/acquire.js

@@ -2,24 +2,25 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.M365TitleAcquireDriver = void 0;
+exports.M365TitleAcquireDriver = exports.actionName = void 0;
 const tslib_1 = require("tslib");
 const fs = tslib_1.__importStar(require("fs-extra"));
 const typedi_1 = require("typedi");
 const lib_1 = require("@feathersjs/hooks/lib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localizeUtils_1 = require("../../../common/localizeUtils");
+const common_1 = require("../../../error/common");
 const packageService_1 = require("../../m365/packageService");
 const serviceConstant_1 = require("../../m365/serviceConstant");
-const common_1 = require("../../../error/common");
 const common_2 = require("../../utils/common");
 const constants_1 = require("../aad/utility/constants");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
-const actionName = "teamsApp/extendToM365";
+exports.actionName = "teamsApp/extendToM365";
 const helpLink = "https://aka.ms/teamsfx-actions/teamsapp-extendToM365";
 const outputKeys = {
     titleId: "titleId",
     appId: "appId",
+    shareLink: "shareLink",
 };
 let M365TitleAcquireDriver = class M365TitleAcquireDriver {
     constructor() {
@@ -30,7 +31,7 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
         return (0, common_2.wrapRun)(async () => {
             const result = await this.handler(args, context);
             return result.output;
-        }, actionName);
+        }, exports.actionName);
     }
     async execute(args, ctx, outputEnvVarNames) {
         let summaries = [];
@@ -38,7 +39,7 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
             const result = await this.handler(args, ctx, outputEnvVarNames);
             summaries = result.summaries;
             return result.output;
-        }, actionName);
+        }, exports.actionName);
         return {
             result: outputResult,
             summaries,
@@ -51,7 +52,7 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
             this.validateOutputEnvVarNames(outputEnvVarNames);
             const appPackagePath = (0, common_2.getAbsolutePath)(args.appPackagePath, context.projectPath);
             if (!(await fs.pathExists(appPackagePath))) {
-                throw new common_1.FileNotFoundError(actionName, appPackagePath, helpLink);
+                throw new common_1.FileNotFoundError(exports.actionName, appPackagePath, helpLink);
             }
             // get sideloading service settings
             const sideloadingServiceEndpoint = (_a = process.env.SIDELOADING_SERVICE_ENDPOINT) !== null && _a !== void 0 ? _a : serviceConstant_1.MosServiceEndpoint;
@@ -64,23 +65,26 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
                 throw sideloadingTokenRes.error;
             }
             const sideloadingToken = sideloadingTokenRes.value;
-            const sideloadingRes = await packageService.sideLoading(sideloadingToken, appPackagePath);
+            const sideloadingRes = await packageService.sideLoading(sideloadingToken, appPackagePath, args.scope);
+            const mapping = new Map();
+            mapping.set(outputEnvVarNames.get(outputKeys.titleId), sideloadingRes[0]);
+            mapping.set(outputEnvVarNames.get(outputKeys.appId), sideloadingRes[1]);
+            if (outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.shareLink)) {
+                mapping.set(outputEnvVarNames.get(outputKeys.shareLink), sideloadingRes[2]);
+            }
             return {
-                output: new Map([
-                    [outputEnvVarNames.get(outputKeys.titleId), sideloadingRes[0]],
-                    [outputEnvVarNames.get(outputKeys.appId), sideloadingRes[1]],
-                ]),
+                output: mapping,
                 summaries: [(0, localizeUtils_1.getLocalizedString)("driver.m365.acquire.summary", sideloadingRes[0])],
             };
         }
         catch (error) {
             if (error instanceof teamsfx_api_1.UserError || error instanceof teamsfx_api_1.SystemError) {
-                (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, actionName, error.displayMessage));
+                (_c = context.logProvider) === null || _c === void 0 ? void 0 : _c.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, error.displayMessage));
                 throw error;
             }
             const message = JSON.stringify(error);
-            (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, actionName, message));
-            throw (0, common_1.assembleError)(error, actionName);
+            (_d = context.logProvider) === null || _d === void 0 ? void 0 : _d.error((0, localizeUtils_1.getLocalizedString)(constants_1.logMessageKeys.failExecuteDriver, exports.actionName, message));
+            throw (0, common_1.assembleError)(error, exports.actionName);
         }
     }
     validateArgs(args) {
@@ -88,30 +92,36 @@ let M365TitleAcquireDriver = class M365TitleAcquireDriver {
         if (!args.appPackagePath || typeof args.appPackagePath !== "string") {
             invalidParameters.push("appPackagePath");
         }
+        if (args.scope &&
+            !Object.values(packageService_1.AppScope)
+                .map((v) => v.toLowerCase())
+                .includes(args.scope)) {
+            invalidParameters.push("scope");
+        }
         if (invalidParameters.length > 0) {
-            throw new common_1.InvalidActionInputError(actionName, invalidParameters, helpLink);
+            throw new common_1.InvalidActionInputError(exports.actionName, invalidParameters, helpLink);
         }
     }
     validateOutputEnvVarNames(outputEnvVarNames) {
         if (!(outputEnvVarNames === null || outputEnvVarNames === void 0 ? void 0 : outputEnvVarNames.get(outputKeys.titleId)) || !outputEnvVarNames.get(outputKeys.appId)) {
-            throw new common_1.InvalidActionInputError(actionName, ["writeToEnvironmentFile"], helpLink);
+            throw new common_1.InvalidActionInputError(exports.actionName, ["writeToEnvironmentFile"], helpLink);
         }
     }
 };
 tslib_1.__decorate([
-    (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(actionName, actionName)]),
+    (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(exports.actionName, exports.actionName)]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], M365TitleAcquireDriver.prototype, "run", null);
 tslib_1.__decorate([
-    (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(actionName, actionName)]),
+    (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(exports.actionName, exports.actionName)]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object, Map]),
     tslib_1.__metadata("design:returntype", Promise)
 ], M365TitleAcquireDriver.prototype, "execute", null);
 M365TitleAcquireDriver = tslib_1.__decorate([
-    (0, typedi_1.Service)(actionName) // DO NOT MODIFY the service name
+    (0, typedi_1.Service)(exports.actionName) // DO NOT MODIFY the service name
 ], M365TitleAcquireDriver);
 exports.M365TitleAcquireDriver = M365TitleAcquireDriver;
 //# sourceMappingURL=acquire.js.map

package/build/component/driver/m365/acquire.js.map

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

package/build/component/driver/share/utils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/share/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAA+B,MAAM,wBAAwB,CAAC;AAc/F,wBAAsB,6BAA6B,CACjD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,CAAC,CAAC,CAmGlF"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/share/utils.ts"],"names":[],"mappings":"AAGA,OAAO,EAAO,OAAO,EAAM,MAAM,EAA+B,MAAM,wBAAwB,CAAC;AAc/F,wBAAsB,6BAA6B,CACjD,WAAW,EAAE,MAAM,GAClB,OAAO,CAAC,MAAM,CAAC;IAAE,UAAU,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,MAAM,CAAA;CAAE,EAAE,OAAO,CAAC,CAAC,CAsGlF"}

package/build/component/driver/share/utils.js

@@ -13,26 +13,28 @@ const lifecycle_1 = require("../../configManager/lifecycle");
 const envUtil_1 = require("../../utils/envUtil");
 const metadataUtil_1 = require("../../utils/metadataUtil");
 const pathUtils_1 = require("../../utils/pathUtils");
+const acquire_1 = require("../m365/acquire");
 const constants_1 = require("../teamsApp/constants");
-const shareToOthers = tslib_1.__importStar(require("./shareToOthers"));
 // Read m365agents.yaml and get the value of shared title id, and shared app id
 async function parseShareAppActionYamlConfig(projectPath) {
-    var _a, _b, _c;
+    var _a, _b, _c, _d, _e;
     const templatePath = pathUtils_1.pathUtils.getYmlFilePath(projectPath, "dev");
     const maybeProjectModel = await metadataUtil_1.metadataUtil.parse(templatePath);
     if (maybeProjectModel.isErr()) {
         return (0, teamsfx_api_1.err)(maybeProjectModel.error);
     }
     const projectModel = maybeProjectModel.value;
-    if (!projectModel.deploy || !projectModel.deploy.driverDefs) {
+    if ((!projectModel.provision || !projectModel.provision.driverDefs) &&
+        (!projectModel.deploy || !projectModel.deploy.driverDefs)) {
         return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.yamlConfigNotFound")));
     }
-    const shareToOthersAction = projectModel.deploy.driverDefs.find((d) => d.uses === shareToOthers.actionName);
-    if (!shareToOthersAction) {
-        return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.shareActionConfigNotFound", shareToOthers.actionName)));
+    const extendToM365Action = ((_a = projectModel.provision) === null || _a === void 0 ? void 0 : _a.driverDefs.find((d) => d.uses === acquire_1.actionName)) ||
+        ((_b = projectModel.deploy) === null || _b === void 0 ? void 0 : _b.driverDefs.find((d) => d.uses === acquire_1.actionName));
+    if (!extendToM365Action) {
+        return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.shareActionConfigNotFound", acquire_1.actionName)));
     }
     // 1. get manifest id
-    const appPackagePath = (_a = shareToOthersAction.with) === null || _a === void 0 ? void 0 : _a.appPackagePath;
+    const appPackagePath = (_c = extendToM365Action.with) === null || _c === void 0 ? void 0 : _c.appPackagePath;
     if (!appPackagePath) {
         return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share to Users", (0, localizeUtils_1.getLocalizedString)("error.share.appPackageConfigNotFound")));
     }
@@ -40,7 +42,7 @@ async function parseShareAppActionYamlConfig(projectPath) {
     if (readEnvRes.isErr()) {
         return (0, teamsfx_api_1.err)(readEnvRes.error);
     }
-    const resolvedDriver = (0, lifecycle_1.resolve)(shareToOthersAction, [], []);
+    const resolvedDriver = (0, lifecycle_1.resolve)(extendToM365Action, [], []);
     const resolvedAppPackagePath = path_1.default.resolve(projectPath, resolvedDriver.with.appPackagePath);
     if (!fs_extra_1.default.existsSync(resolvedAppPackagePath)) {
         return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.appPackageNotFound", resolvedAppPackagePath)));
@@ -56,8 +58,8 @@ async function parseShareAppActionYamlConfig(projectPath) {
         return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share to Users", (0, localizeUtils_1.getLocalizedString)("error.share.manifestIdNotFound")));
     }
     // 2. get shared title id and shared app id
-    const sharedTitleIdEnvName = (_b = shareToOthersAction.writeToEnvironmentFile) === null || _b === void 0 ? void 0 : _b.titleId;
-    const sharedAppIdEnvName = (_c = shareToOthersAction.writeToEnvironmentFile) === null || _c === void 0 ? void 0 : _c.appId;
+    const sharedTitleIdEnvName = (_d = extendToM365Action.writeToEnvironmentFile) === null || _d === void 0 ? void 0 : _d.titleId;
+    const sharedAppIdEnvName = (_e = extendToM365Action.writeToEnvironmentFile) === null || _e === void 0 ? void 0 : _e.appId;
     if (!sharedTitleIdEnvName || !sharedAppIdEnvName) {
         return (0, teamsfx_api_1.err)(new teamsfx_api_1.UserError("FxCore", "Share", (0, localizeUtils_1.getLocalizedString)("error.share.sharedConfigNotFound")));
     }

package/build/component/driver/share/utils.js.map

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

package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts

@@ -15,7 +15,7 @@ export declare class PluginManifestUtils {
         content: string;
         color: Colors;
     }>;
-    getDefaultNextAvailableApiSpecPath(apiSpecPath: string, apiSpecFolder: string, apiSpecFileName?: string, isKiotaIntegration?: boolean): Promise<string>;
+    getDefaultNextAvailableApiSpecPath(apiSpecPath: string, apiSpecFolder: string, isKiotaIntegration?: boolean): Promise<string>;
     getApiSpecFileName(openApiSpecFileNamePrefix: string, openApiSpecFileType: string, apiSpecFileNameSuffix: number, isKiotaIntegration: boolean): string;
     getApiSpecFilePathFromPlugin(plugin: PluginManifestSchema, pluginPath: string): Promise<string[]>;
 }

package/build/component/driver/teamsApp/utils/PluginManifestUtils.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"PluginManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAGN,OAAO,EACP,OAAO,EAEP,QAAQ,EACR,oBAAoB,EACpB,MAAM,EACN,gBAAgB,EAGjB,MAAM,wBAAwB,CAAC;AAUhC,OAAO,EAAE,8BAA8B,EAAE,MAAM,gCAAgC,CAAC;AAIhF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAG3D,qBAAa,mBAAmB;IACjB,sBAAsB,CACjC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAiBjD;;;;OAIG;IACU,WAAW,CACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAoBpC,qBAAqB,CAChC,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAC;IA6B9C,mCAAmC,CAC9C,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAiB9B,mBAAmB,CACxB,aAAa,EAAE,8BAA8B,EAC7C,QAAQ,EAAE,QAAQ,GACjB,MAAM,GAAG,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAsCxC,kCAAkC,CAC7C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,eAAe,CAAC,EAAE,MAAM,EACxB,kBAAkB,UAAQ;IAsC5B,kBAAkB,CAChB,yBAAyB,EAAE,MAAM,EACjC,mBAAmB,EAAE,MAAM,EAC3B,qBAAqB,EAAE,MAAM,EAC7B,kBAAkB,EAAE,OAAO,GAC1B,MAAM;IAWH,4BAA4B,CAChC,MAAM,EAAE,oBAAoB,EAC5B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC;CAiBrB;AAED,eAAO,MAAM,mBAAmB,qBAA4B,CAAC"}
+{"version":3,"file":"PluginManifestUtils.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"AAGA,OAAO,EACL,MAAM,EAGN,OAAO,EACP,OAAO,EAEP,QAAQ,EACR,oBAAoB,EACpB,MAAM,EACN,gBAAgB,EAGjB,MAAM,wBAAwB,CAAC;AAUhC,OAAO,EAAE,8BAA8B,EAAE,MAAM,gCAAgC,CAAC;AAIhF,OAAO,EAAE,aAAa,EAAE,MAAM,4BAA4B,CAAC;AAI3D,qBAAa,mBAAmB;IACjB,sBAAsB,CACjC,IAAI,EAAE,MAAM,GACX,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAiBjD;;;;OAIG;IACU,WAAW,CACtB,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,oBAAoB,EAAE,OAAO,CAAC,CAAC;IAoBpC,qBAAqB,CAChC,MAAM,EAAE,OAAO,EACf,IAAI,EAAE,MAAM,EACZ,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,MAAM,CAAC,8BAA8B,EAAE,OAAO,CAAC,CAAC;IA6B9C,mCAAmC,CAC9C,QAAQ,EAAE,gBAAgB,EAC1B,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,MAAM,EAAE,EAAE,OAAO,CAAC,CAAC;IAiB9B,mBAAmB,CACxB,aAAa,EAAE,8BAA8B,EAC7C,QAAQ,EAAE,QAAQ,GACjB,MAAM,GAAG,KAAK,CAAC;QAAE,OAAO,EAAE,MAAM,CAAC;QAAC,KAAK,EAAE,MAAM,CAAA;KAAE,CAAC;IAsCxC,kCAAkC,CAC7C,WAAW,EAAE,MAAM,EACnB,aAAa,EAAE,MAAM,EACrB,kBAAkB,UAAQ;IAwC5B,kBAAkB,CAChB,yBAAyB,EAAE,MAAM,EACjC,mBAAmB,EAAE,MAAM,EAC3B,qBAAqB,EAAE,MAAM,EAC7B,kBAAkB,EAAE,OAAO,GAC1B,MAAM;IAWH,4BAA4B,CAChC,MAAM,EAAE,oBAAoB,EAC5B,UAAU,EAAE,MAAM,GACjB,OAAO,CAAC,MAAM,EAAE,CAAC;CAiBrB;AAED,eAAO,MAAM,mBAAmB,qBAA4B,CAAC"}

package/build/component/driver/teamsApp/utils/PluginManifestUtils.js

@@ -18,6 +18,7 @@ const constant_1 = require("../../../configManager/constant");
 const os_1 = require("os");
 const envFunctionUtils_1 = require("../../../utils/envFunctionUtils");
 const utils_2 = require("../../../../common/utils");
+const featureFlags_1 = require("../../../../common/featureFlags");
 class PluginManifestUtils {
     async readPluginManifestFile(path) {
         if (!(await fs_extra_1.default.pathExists(path))) {
@@ -118,13 +119,15 @@ class PluginManifestUtils {
             return outputMessage;
         }
     }
-    async getDefaultNextAvailableApiSpecPath(apiSpecPath, apiSpecFolder, apiSpecFileName, isKiotaIntegration = false) {
+    async getDefaultNextAvailableApiSpecPath(apiSpecPath, apiSpecFolder, isKiotaIntegration = false) {
         let isYaml = false;
         try {
             isYaml = !(await (0, utils_2.isJsonSpecFile)(apiSpecPath));
         }
         catch (e) { }
-        let openApiSpecFileName = apiSpecFileName !== null && apiSpecFileName !== void 0 ? apiSpecFileName : (isYaml ? teamsfx_api_1.DefaultApiSpecYamlFileName : teamsfx_api_1.DefaultApiSpecJsonFileName);
+        let openApiSpecFileName = isYaml || featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.KiotaNPMIntegration)
+            ? teamsfx_api_1.DefaultApiSpecYamlFileName
+            : teamsfx_api_1.DefaultApiSpecJsonFileName;
         // Check if the default file name already exists
         if (!(await fs_extra_1.default.pathExists(path_1.default.join(apiSpecFolder, openApiSpecFileName)))) {
             return path_1.default.join(apiSpecFolder, openApiSpecFileName);

package/build/component/driver/teamsApp/utils/PluginManifestUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"PluginManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"PluginManifestUtils.js","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/utils/PluginManifestUtils.ts"],"names":[],"mappings":"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"}

package/build/component/m365/constants.d.ts

@@ -6,4 +6,5 @@ export declare enum Hub {
 export declare const outlookCopilotAppId = "d870f6cd-4aa5-4d42-9626-ab690c041429";
 export declare const outlookBaseUrl = "https://outlook.office.com";
 export declare const officeBaseUrl = "https://www.office.com";
+export declare const advancedDASettingUrl = "https://aka.ms/atk-actions/teamsapp-extendToM365";
 //# sourceMappingURL=constants.d.ts.map

package/build/component/m365/constants.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/component/m365/constants.ts"],"names":[],"mappings":"AAGA,oBAAY,GAAG;IACb,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,MAAM,0BAA0B;CACjC;AAED,eAAO,MAAM,mBAAmB,yCAAyC,CAAC;AAC1E,eAAO,MAAM,cAAc,+BAA+B,CAAC;AAC3D,eAAO,MAAM,aAAa,2BAA2B,CAAC"}
+{"version":3,"file":"constants.d.ts","sourceRoot":"","sources":["../../../src/component/m365/constants.ts"],"names":[],"mappings":"AAGA,oBAAY,GAAG;IACb,KAAK,UAAU;IACf,OAAO,YAAY;IACnB,MAAM,0BAA0B;CACjC;AAED,eAAO,MAAM,mBAAmB,yCAAyC,CAAC;AAC1E,eAAO,MAAM,cAAc,+BAA+B,CAAC;AAC3D,eAAO,MAAM,aAAa,2BAA2B,CAAC;AACtD,eAAO,MAAM,oBAAoB,qDAAqD,CAAC"}

package/build/component/m365/constants.js

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.officeBaseUrl = exports.outlookBaseUrl = exports.outlookCopilotAppId = exports.Hub = void 0;
+exports.advancedDASettingUrl = exports.officeBaseUrl = exports.outlookBaseUrl = exports.outlookCopilotAppId = exports.Hub = void 0;
 var Hub;
 (function (Hub) {
     Hub["teams"] = "Teams";
@@ -12,4 +12,5 @@ var Hub;
 exports.outlookCopilotAppId = "d870f6cd-4aa5-4d42-9626-ab690c041429";
 exports.outlookBaseUrl = "https://outlook.office.com";
 exports.officeBaseUrl = "https://www.office.com";
+exports.advancedDASettingUrl = "https://aka.ms/atk-actions/teamsapp-extendToM365";
 //# sourceMappingURL=constants.js.map

package/build/component/m365/constants.js.map

@@ -1 +1 @@
-{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/component/m365/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,IAAY,GAIX;AAJD,WAAY,GAAG;IACb,sBAAe,CAAA;IACf,0BAAmB,CAAA;IACnB,uCAAgC,CAAA;AAClC,CAAC,EAJW,GAAG,GAAH,WAAG,KAAH,WAAG,QAId;AAEY,QAAA,mBAAmB,GAAG,sCAAsC,CAAC;AAC7D,QAAA,cAAc,GAAG,4BAA4B,CAAC;AAC9C,QAAA,aAAa,GAAG,wBAAwB,CAAC"}
+{"version":3,"file":"constants.js","sourceRoot":"","sources":["../../../src/component/m365/constants.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC;;;AAElC,IAAY,GAIX;AAJD,WAAY,GAAG;IACb,sBAAe,CAAA;IACf,0BAAmB,CAAA;IACnB,uCAAgC,CAAA;AAClC,CAAC,EAJW,GAAG,GAAH,WAAG,KAAH,WAAG,QAId;AAEY,QAAA,mBAAmB,GAAG,sCAAsC,CAAC;AAC7D,QAAA,cAAc,GAAG,4BAA4B,CAAC;AAC9C,QAAA,aAAa,GAAG,wBAAwB,CAAC;AACzC,QAAA,oBAAoB,GAAG,kDAAkD,CAAC"}

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

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

package/build/component/m365/packageService.js

@@ -20,6 +20,8 @@ const common_1 = require("../../error/common");
 const types_1 = require("../../error/types");
 const errors_1 = require("./errors");
 const serviceConstant_1 = require("./serviceConstant");
+const localizeUtils_1 = require("../../common/localizeUtils");
+const constants_1 = require("./constants");
 const M365ErrorSource = "M365";
 const M365ErrorComponent = "PackageService";
 var AppScope;
@@ -145,7 +147,7 @@ class PackageService {
             featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.BuilderAPIEnabled)) {
             const res = await this.sideLoadingV2(token, packagePath, appScope);
             let shareLink = "";
-            if (appScope == AppScope.Shared) {
+            if (appScope.toLowerCase() === AppScope.Shared.toLowerCase()) {
                 shareLink = await this.getShareLink(token, res[0]);
             }
             (0, telemetry_1.sendTelemetryEvent)(telemetry_1.Component.core, telemetry_1.TelemetryEvent.MosSideloadEnd, {
@@ -357,7 +359,7 @@ class PackageService {
         return appId;
     }
     async unacquire(token, titleId) {
-        var _a, _b;
+        var _a, _b, _c;
         try {
             const serviceUrl = await this.getTitleServiceUrl(token);
             (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Unacquiring package with TitleId ${titleId} ...`);
@@ -367,7 +369,25 @@ class PackageService {
                     Authorization: `Bearer ${token}`,
                 },
             });
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.verbose("Unacquiring done.");
+            if (featureFlags_1.featureFlagManager.getBooleanValue(featureFlags_1.FeatureFlags.BuilderAPIEnabled)) {
+                try {
+                    await this.axiosInstance.delete(`/builder/v1/users/titles/${titleId}`, {
+                        baseURL: serviceUrl,
+                        headers: {
+                            Authorization: `Bearer ${token}`,
+                        },
+                    });
+                }
+                catch (error) {
+                    if (error.response && error.response.status === 404) {
+                        (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`TitleId ${titleId} not found, skip deleting.`);
+                    }
+                    else {
+                        throw error;
+                    }
+                }
+            }
+            (_c = this.logger) === null || _c === void 0 ? void 0 : _c.verbose("Unacquiring done.");
         }
         catch (error) {
             if (error.response) {
@@ -671,8 +691,9 @@ class PackageService {
         // add error details and trace to message
         const tracingId = ((_b = (_a = error.response.headers) === null || _a === void 0 ? void 0 : _a.traceresponse) !== null && _b !== void 0 ? _b : "");
         const originalMessage = error.message;
-        const innerError = ((_c = error.response.data) === null || _c === void 0 ? void 0 : _c.error) || { code: "", message: "" };
-        const finalMessage = `${originalMessage} (tracingId: ${tracingId}) ${innerError.code}: ${innerError.message} `;
+        const innerError = ((_c = error.response.data) === null || _c === void 0 ? void 0 : _c.error) ||
+            error.response.data.Error || { code: "", message: "" };
+        const finalMessage = `${originalMessage} (tracingId: ${tracingId}) ${innerError.Code}: ${innerError.Message} `;
         error.message = finalMessage;
         // HTTP 400 as user error due to invalid input
         if (((_d = error.response) === null || _d === void 0 ? void 0 : _d.status) === 400) {
@@ -683,6 +704,17 @@ class PackageService {
                 message: finalMessage,
             });
         }
+        else if (error.response.status === 403 &&
+            error.response.data.Error.Message ==
+                "User does not have access to upload advanced Copilot apps.") {
+            error = new teamsfx_api_1.UserError({
+                name: "PackageServiceError",
+                error,
+                source: M365ErrorSource,
+                message: (0, localizeUtils_1.getDefaultString)("error.m365.SharedScopeAdvancedDADisabled", constants_1.advancedDASettingUrl),
+                displayMessage: (0, localizeUtils_1.getLocalizedString)("error.m365.SharedScopeAdvancedDADisabled", constants_1.advancedDASettingUrl),
+            });
+        }
         return error;
     }
     checkZip(path) {