@microsoft/teamsfx-core 2.0.10-rc.0 → 2.0.10

package/build/component/driver/teamsApp/create.js

@@ -4,24 +4,24 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateTeamsAppDriver = exports.internalOutputNames = void 0;
 const tslib_1 = require("tslib");
-const lib_1 = require("@feathersjs/hooks/lib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
-const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
-const typedi_1 = require("typedi");
+const adm_zip_1 = tslib_1.__importDefault(require("adm-zip"));
 const uuid_1 = require("uuid");
-const teamsDevPortalClient_1 = require("../../../client/teamsDevPortalClient");
-const constants_1 = require("../../../common/constants");
-const localizeUtils_1 = require("../../../common/localizeUtils");
-const common_1 = require("../../../error/common");
-const folder_1 = require("../../../folder");
+const typedi_1 = require("typedi");
+const lib_1 = require("@feathersjs/hooks/lib");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
-const utils_1 = require("../util/utils");
 const wrapUtil_1 = require("../util/wrapUtil");
-const constants_2 = require("./constants");
-const errors_1 = require("./errors");
+const appStudioClient_1 = require("./clients/appStudioClient");
 const results_1 = require("./results");
+const errors_1 = require("./errors");
+const constants_1 = require("./constants");
+const tools_1 = require("../../../common/tools");
+const localizeUtils_1 = require("../../../common/localizeUtils");
+const folder_1 = require("../../../folder");
+const common_1 = require("../../../error/common");
+const utils_1 = require("../util/utils");
 const actionName = "teamsApp/create";
 const defaultOutputNames = {
     teamsAppId: "TEAMS_APP_ID",
@@ -31,8 +31,8 @@ exports.internalOutputNames = {
 };
 let CreateTeamsAppDriver = class CreateTeamsAppDriver {
     constructor() {
-        this.description = (0, localizeUtils_1.getLocalizedString)("driver.teamsApp.description.createDriver");
-        this.progressTitle = (0, localizeUtils_1.getLocalizedString)("driver.teamsApp.progressBar.createTeamsAppStepMessage");
+        this.description = localizeUtils_1.getLocalizedString("driver.teamsApp.description.createDriver");
+        this.progressTitle = localizeUtils_1.getLocalizedString("driver.teamsApp.progressBar.createTeamsAppStepMessage");
     }
     async execute(args, context, outputEnvVarNames) {
         const wrapContext = new wrapUtil_1.WrapDriverContext(context, actionName, actionName);
@@ -45,26 +45,26 @@ let CreateTeamsAppDriver = class CreateTeamsAppDriver {
     async create(args, context, outputEnvVarNames) {
         const result = this.validateArgs(args);
         if (result.isErr()) {
-            return (0, teamsfx_api_1.err)(result.error);
+            return teamsfx_api_1.err(result.error);
         }
         if (!outputEnvVarNames) {
             outputEnvVarNames = new Map(Object.entries(defaultOutputNames));
         }
         outputEnvVarNames = new Map([...outputEnvVarNames, ...Object.entries(exports.internalOutputNames)]);
-        const state = (0, utils_1.loadStateFromEnv)(outputEnvVarNames);
+        const state = utils_1.loadStateFromEnv(outputEnvVarNames);
         let create = true;
         const appStudioTokenRes = await context.m365TokenProvider.getAccessToken({
-            scopes: constants_1.AppStudioScopes,
+            scopes: tools_1.AppStudioScopes,
         });
         if (appStudioTokenRes.isErr()) {
-            return (0, teamsfx_api_1.err)(appStudioTokenRes.error);
+            return teamsfx_api_1.err(appStudioTokenRes.error);
         }
         const appStudioToken = appStudioTokenRes.value;
         let createdAppDefinition;
         const teamsAppId = state.teamsAppId;
         if (teamsAppId) {
             try {
-                createdAppDefinition = await teamsDevPortalClient_1.teamsDevPortalClient.getApp(appStudioToken, teamsAppId);
+                createdAppDefinition = await appStudioClient_1.AppStudioClient.getApp(teamsAppId, appStudioToken, context.logProvider);
                 create = false;
             }
             catch (error) { }
@@ -76,24 +76,24 @@ let CreateTeamsAppDriver = class CreateTeamsAppDriver {
                 manifest.id = teamsAppId;
             }
             else {
-                manifest.id = (0, uuid_1.v4)();
+                manifest.id = uuid_1.v4();
             }
             const zip = new adm_zip_1.default();
-            zip.addFile(constants_2.Constants.MANIFEST_FILE, Buffer.from(JSON.stringify(manifest, null, 4)));
-            const sourceTemplatesFolder = (0, folder_1.getTemplatesFolder)();
-            const defaultColorPath = path.join(sourceTemplatesFolder, constants_2.COLOR_TEMPLATE);
-            const defaultOutlinePath = path.join(sourceTemplatesFolder, constants_2.OUTLINE_TEMPLATE);
+            zip.addFile(constants_1.Constants.MANIFEST_FILE, Buffer.from(JSON.stringify(manifest, null, 4)));
+            const sourceTemplatesFolder = folder_1.getTemplatesFolder();
+            const defaultColorPath = path.join(sourceTemplatesFolder, constants_1.COLOR_TEMPLATE);
+            const defaultOutlinePath = path.join(sourceTemplatesFolder, constants_1.OUTLINE_TEMPLATE);
             const colorFile = await fs_extra_1.default.readFile(defaultColorPath);
-            zip.addFile(constants_2.DEFAULT_COLOR_PNG_FILENAME, colorFile);
+            zip.addFile(constants_1.DEFAULT_COLOR_PNG_FILENAME, colorFile);
             const outlineFile = await fs_extra_1.default.readFile(defaultOutlinePath);
-            zip.addFile(constants_2.DEFAULT_OUTLINE_PNG_FILENAME, outlineFile);
+            zip.addFile(constants_1.DEFAULT_OUTLINE_PNG_FILENAME, outlineFile);
             const archivedFile = zip.toBuffer();
             try {
-                createdAppDefinition = await teamsDevPortalClient_1.teamsDevPortalClient.importApp(appStudioTokenRes.value, archivedFile);
-                const message = (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.teamsAppCreatedNotice", createdAppDefinition.teamsAppId);
+                createdAppDefinition = await appStudioClient_1.AppStudioClient.importApp(archivedFile, appStudioTokenRes.value, context.logProvider);
+                const message = localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppCreatedNotice", createdAppDefinition.teamsAppId);
                 context.logProvider.verbose(message);
                 context.addSummary(message);
-                return (0, teamsfx_api_1.ok)(new Map([
+                return teamsfx_api_1.ok(new Map([
                     [outputEnvVarNames.get("teamsAppId"), createdAppDefinition.teamsAppId],
                     [outputEnvVarNames.get("teamsAppTenantId"), createdAppDefinition.tenantId],
                 ]));
@@ -103,18 +103,18 @@ let CreateTeamsAppDriver = class CreateTeamsAppDriver {
                     if (e instanceof teamsfx_api_1.UserError && !e.helpLink) {
                         e.helpLink = "https://aka.ms/teamsfx-actions/teamsapp-create";
                     }
-                    return (0, teamsfx_api_1.err)(e);
+                    return teamsfx_api_1.err(e);
                 }
                 else {
                     const error = results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.TeamsAppCreateFailedError.name, errors_1.AppStudioError.TeamsAppCreateFailedError.message(e), "https://aka.ms/teamsfx-actions/teamsapp-create");
-                    return (0, teamsfx_api_1.err)(error);
+                    return teamsfx_api_1.err(error);
                 }
             }
         }
         else {
-            context.addSummary((0, localizeUtils_1.getLocalizedString)("driver.teamsApp.summary.createTeamsAppAlreadyExists", teamsAppId));
-            context.logProvider.verbose((0, localizeUtils_1.getLocalizedString)("driver.teamsApp.summary.createTeamsAppAlreadyExists", teamsAppId));
-            return (0, teamsfx_api_1.ok)(new Map([
+            context.addSummary(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.createTeamsAppAlreadyExists", teamsAppId));
+            context.logProvider.verbose(localizeUtils_1.getLocalizedString("driver.teamsApp.summary.createTeamsAppAlreadyExists", teamsAppId));
+            return teamsfx_api_1.ok(new Map([
                 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
                 [outputEnvVarNames.get("teamsAppId"), createdAppDefinition.teamsAppId],
                 // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
@@ -128,22 +128,22 @@ let CreateTeamsAppDriver = class CreateTeamsAppDriver {
             invalidParams.push("name");
         }
         if (invalidParams.length > 0) {
-            return (0, teamsfx_api_1.err)(new common_1.InvalidActionInputError(actionName, invalidParams, "https://aka.ms/teamsfx-actions/teamsapp-create"));
+            return teamsfx_api_1.err(new common_1.InvalidActionInputError(actionName, invalidParams, "https://aka.ms/teamsfx-actions/teamsapp-create"));
         }
         else {
-            return (0, teamsfx_api_1.ok)(undefined);
+            return teamsfx_api_1.ok(undefined);
         }
     }
 };
 tslib_1.__decorate([
-    (0, lib_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(actionName, actionName)]),
+    lib_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(actionName, actionName)]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, wrapUtil_1.WrapDriverContext,
         Map]),
     tslib_1.__metadata("design:returntype", Promise)
 ], CreateTeamsAppDriver.prototype, "create", null);
 CreateTeamsAppDriver = tslib_1.__decorate([
-    (0, typedi_1.Service)(actionName)
+    typedi_1.Service(actionName)
 ], CreateTeamsAppDriver);
 exports.CreateTeamsAppDriver = CreateTeamsAppDriver;
 //# sourceMappingURL=create.js.map

package/build/component/driver/teamsApp/create.js.map

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

package/build/component/driver/teamsApp/createAppPackage.d.ts

@@ -16,9 +16,8 @@ export declare class CreateAppPackageDriver implements StepDriver {
      * Add plugin file and plugin related files to zip.
      * @param zip zip
      * @param pluginRelativePath plugin file path relative to app package folder
-     * @param appDirectory app package path containing manifest template.
+     * @param appDirectory app package path
      * @param context context
-     * @param outputDirectory optional. Folder where we should put the resolved manifest in.
      * @returns result of adding plugin file and plugin related files
      */
     private addPlugin;
@@ -33,6 +32,5 @@ export declare class CreateAppPackageDriver implements StepDriver {
     private addPluginRelatedFiles;
     private addFileWithVariable;
     private addFileInZip;
-    private writeJsonFile;
 }
 //# sourceMappingURL=createAppPackage.d.ts.map

package/build/component/driver/teamsApp/createAppPackage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"createAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,OAAO,EAAE,MAAM,EAAiC,MAAM,wBAAwB,CAAC;AAQhG,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAQzE,eAAO,MAAM,UAAU,2BAA2B,CAAC;AAEnD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAA4E;IACvF,QAAQ,CAAC,aAAa,SAEpB;IAEW,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAad,KAAK,CAChB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;mBAmQ3B,aAAa;IASlC,OAAO,CAAC,YAAY;YAwBN,sBAAsB;IAsBpC;;;;;;;;OAQG;YACW,SAAS;IAwCvB;;;;;;;OAOG;YACW,qBAAqB;YA4CrB,mBAAmB;IA+BjC,OAAO,CAAC,YAAY;YAIN,aAAa;CAO5B"}
+{"version":3,"file":"createAppPackage.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/createAppPackage.ts"],"names":[],"mappings":"AAIA,OAAO,EAAU,OAAO,EAAE,MAAM,EAAiC,MAAM,wBAAwB,CAAC;AAahG,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAC;AACxD,OAAO,EAAE,eAAe,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAEtE,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAQzE,eAAO,MAAM,UAAU,2BAA2B,CAAC;AAEnD,qBACa,sBAAuB,YAAW,UAAU;IACvD,WAAW,SAA4E;IACvF,QAAQ,CAAC,aAAa,SAEpB;IAEW,OAAO,CAClB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,aAAa,GACrB,OAAO,CAAC,eAAe,CAAC;IAad,KAAK,CAChB,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,iBAAiB,GACzB,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC;mBAuP3B,aAAa;IASlC,OAAO,CAAC,YAAY;YAwBN,sBAAsB;IAsBpC;;;;;;;OAOG;YACW,SAAS;IAoCvB;;;;;;;OAOG;YACW,qBAAqB;YA4CrB,mBAAmB;IAuBjC,OAAO,CAAC,YAAY;CAGrB"}

package/build/component/driver/teamsApp/createAppPackage.js

@@ -12,22 +12,21 @@ const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const path = tslib_1.__importStar(require("path"));
 const typedi_1 = require("typedi");
 const localizeUtils_1 = require("../../../common/localizeUtils");
-const globalVars_1 = require("../../../common/globalVars");
+const globalVars_1 = require("../../../core/globalVars");
 const common_1 = require("../../../error/common");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
 const wrapUtil_1 = require("../util/wrapUtil");
 const constants_1 = require("./constants");
 const ManifestUtils_1 = require("./utils/ManifestUtils");
+const telemetry_1 = require("./utils/telemetry");
 const teamsApp_1 = require("../../../error/teamsApp");
 const utils_1 = require("./utils/utils");
 const CopilotGptManifestUtils_1 = require("./utils/CopilotGptManifestUtils");
-const envFunctionUtils_1 = require("../../utils/envFunctionUtils");
-const common_2 = require("../../utils/common");
 exports.actionName = "teamsApp/zipAppPackage";
 let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDriver {
     constructor() {
-        this.description = (0, localizeUtils_1.getLocalizedString)("driver.teamsApp.description.createAppPackageDriver");
-        this.progressTitle = (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.createPackage.progressBar.message");
+        this.description = localizeUtils_1.getLocalizedString("driver.teamsApp.description.createAppPackageDriver");
+        this.progressTitle = localizeUtils_1.getLocalizedString("plugins.appstudio.createPackage.progressBar.message");
     }
     async execute(args, context) {
         const wrapContext = new wrapUtil_1.WrapDriverContext(context, exports.actionName, exports.actionName);
@@ -41,7 +40,7 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
         var _a, _b;
         const result = this.validateArgs(args);
         if (result.isErr()) {
-            return (0, teamsfx_api_1.err)(result.error);
+            return teamsfx_api_1.err(result.error);
         }
         let manifestPath = args.manifestPath;
         if (!path.isAbsolute(manifestPath)) {
@@ -49,45 +48,42 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
         }
         const manifestRes = await ManifestUtils_1.manifestUtils.getManifestV3(manifestPath, context);
         if (manifestRes.isErr()) {
-            return (0, teamsfx_api_1.err)(manifestRes.error);
+            return teamsfx_api_1.err(manifestRes.error);
         }
         const manifest = manifestRes.value;
         // Deal with relative path
         // Environment variables should have been replaced by value
         // ./build/appPackage/appPackage.dev.zip instead of ./build/appPackage/appPackage.${{TEAMSFX_ENV}}.zip
-        const zipFileName = (0, common_2.getAbsolutePath)(args.outputZipPath, context.projectPath);
+        let zipFileName = args.outputZipPath;
+        if (!path.isAbsolute(zipFileName)) {
+            zipFileName = path.join(context.projectPath, zipFileName);
+        }
         const zipFileDir = path.dirname(zipFileName);
         await fs_extra_1.default.mkdir(zipFileDir, { recursive: true });
-        let jsonFileDir;
-        let teamsManifestJsonFileName;
-        const shouldwriteAllManifest = !!args.outputFolder;
-        if (args.outputJsonPath) {
-            teamsManifestJsonFileName = (0, common_2.getAbsolutePath)(args.outputJsonPath, context.projectPath);
-            jsonFileDir = path.dirname(teamsManifestJsonFileName);
-        }
-        else {
-            jsonFileDir = (0, common_2.getAbsolutePath)(args.outputFolder, context.projectPath);
-            teamsManifestJsonFileName = path.join(jsonFileDir, `manifest.${process.env.TEAMSFX_ENV}.json`);
+        let jsonFileName = args.outputJsonPath;
+        if (!path.isAbsolute(jsonFileName)) {
+            jsonFileName = path.join(context.projectPath, jsonFileName);
         }
+        const jsonFileDir = path.dirname(jsonFileName);
         await fs_extra_1.default.mkdir(jsonFileDir, { recursive: true });
         const appDirectory = path.dirname(manifestPath);
         const colorFile = path.resolve(appDirectory, manifest.icons.color);
         if (!(await fs_extra_1.default.pathExists(colorFile))) {
             const error = new common_1.FileNotFoundError(exports.actionName, colorFile, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage");
-            return (0, teamsfx_api_1.err)(error);
+            return teamsfx_api_1.err(error);
         }
         const colorFileRelativePath = path.relative(appDirectory, colorFile);
         if (colorFileRelativePath.startsWith("..")) {
-            return (0, teamsfx_api_1.err)(new teamsApp_1.InvalidFileOutsideOfTheDirectotryError(colorFile));
+            return teamsfx_api_1.err(new teamsApp_1.InvalidFileOutsideOfTheDirectotryError(colorFile));
         }
         const outlineFile = path.resolve(appDirectory, manifest.icons.outline);
         if (!(await fs_extra_1.default.pathExists(outlineFile))) {
             const error = new common_1.FileNotFoundError(exports.actionName, outlineFile, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage");
-            return (0, teamsfx_api_1.err)(error);
+            return teamsfx_api_1.err(error);
         }
         const outlineFileRelativePath = path.relative(appDirectory, outlineFile);
         if (outlineFileRelativePath.startsWith("..")) {
-            return (0, teamsfx_api_1.err)(new teamsApp_1.InvalidFileOutsideOfTheDirectotryError(outlineFile));
+            return teamsfx_api_1.err(new teamsApp_1.InvalidFileOutsideOfTheDirectotryError(outlineFile));
         }
         // pre-check existence
         if (manifest.localizationInfo &&
@@ -97,7 +93,7 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
                 const file = language.file;
                 const fileName = `${appDirectory}/${file}`;
                 if (!(await fs_extra_1.default.pathExists(fileName))) {
-                    return (0, teamsfx_api_1.err)(new common_1.FileNotFoundError(exports.actionName, fileName, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage"));
+                    return teamsfx_api_1.err(new common_1.FileNotFoundError(exports.actionName, fileName, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage"));
                 }
             }
         }
@@ -117,7 +113,7 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
                 const fileName = path.resolve(appDirectory, file);
                 const relativePath = path.relative(appDirectory, fileName);
                 if (relativePath.startsWith("..")) {
-                    return (0, teamsfx_api_1.err)(new teamsApp_1.InvalidFileOutsideOfTheDirectotryError(fileName));
+                    return teamsfx_api_1.err(new teamsApp_1.InvalidFileOutsideOfTheDirectotryError(fileName));
                 }
                 const dir = path.dirname(file);
                 zip.addLocalFile(fileName, dir === "." ? "" : dir);
@@ -131,11 +127,11 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
             const apiSpecificationFile = path.resolve(appDirectory, manifest.composeExtensions[0].apiSpecificationFile);
             const checkExistenceRes = await this.validateReferencedFile(apiSpecificationFile, appDirectory);
             if (checkExistenceRes.isErr()) {
-                return (0, teamsfx_api_1.err)(checkExistenceRes.error);
+                return teamsfx_api_1.err(checkExistenceRes.error);
             }
-            const addFileWithVariableRes = await this.addFileWithVariable(zip, manifest.composeExtensions[0].apiSpecificationFile, apiSpecificationFile, envFunctionUtils_1.ManifestType.ApiSpec, context);
+            const addFileWithVariableRes = await this.addFileWithVariable(zip, manifest.composeExtensions[0].apiSpecificationFile, apiSpecificationFile, telemetry_1.TelemetryPropertyKey.customizedOpenAPIKeys, context);
             if (addFileWithVariableRes.isErr()) {
-                return (0, teamsfx_api_1.err)(addFileWithVariableRes.error);
+                return teamsfx_api_1.err(addFileWithVariableRes.error);
             }
             if (manifest.composeExtensions[0].commands.length > 0) {
                 for (const command of manifest.composeExtensions[0].commands) {
@@ -143,7 +139,7 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
                         const adaptiveCardFile = path.resolve(appDirectory, command.apiResponseRenderingTemplateFile);
                         const checkExistenceRes = await this.validateReferencedFile(adaptiveCardFile, appDirectory);
                         if (checkExistenceRes.isErr()) {
-                            return (0, teamsfx_api_1.err)(checkExistenceRes.error);
+                            return teamsfx_api_1.err(checkExistenceRes.error);
                         }
                         const dir = path.dirname(command.apiResponseRenderingTemplateFile);
                         this.addFileInZip(zip, dir, adaptiveCardFile);
@@ -154,9 +150,9 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
         const plugins = (_a = manifest.copilotExtensions) === null || _a === void 0 ? void 0 : _a.plugins;
         // API plugin
         if ((plugins === null || plugins === void 0 ? void 0 : plugins.length) && plugins[0].file) {
-            const addFilesRes = await this.addPlugin(zip, plugins[0].file, appDirectory, context, !shouldwriteAllManifest ? undefined : jsonFileDir);
+            const addFilesRes = await this.addPlugin(zip, plugins[0].file, appDirectory, context);
             if (addFilesRes.isErr()) {
-                return (0, teamsfx_api_1.err)(addFilesRes.error);
+                return teamsfx_api_1.err(addFilesRes.error);
             }
         }
         const declarativeCopilots = (_b = manifest.copilotExtensions) === null || _b === void 0 ? void 0 : _b.declarativeCopilots;
@@ -165,15 +161,13 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
             const copilotGptManifestFile = path.resolve(appDirectory, declarativeCopilots[0].file);
             const checkExistenceRes = await this.validateReferencedFile(copilotGptManifestFile, appDirectory);
             if (checkExistenceRes.isErr()) {
-                return (0, teamsfx_api_1.err)(checkExistenceRes.error);
+                return teamsfx_api_1.err(checkExistenceRes.error);
             }
-            const addFileWithVariableRes = await this.addFileWithVariable(zip, declarativeCopilots[0].file, copilotGptManifestFile, envFunctionUtils_1.ManifestType.DeclarativeCopilotManifest, context, shouldwriteAllManifest
-                ? path.join(jsonFileDir, path.relative(appDirectory, copilotGptManifestFile))
-                : undefined);
+            const addFileWithVariableRes = await this.addFileWithVariable(zip, declarativeCopilots[0].file, copilotGptManifestFile, telemetry_1.TelemetryPropertyKey.customizedAIPluginKeys, context);
             if (addFileWithVariableRes.isErr()) {
-                return (0, teamsfx_api_1.err)(addFileWithVariableRes.error);
+                return teamsfx_api_1.err(addFileWithVariableRes.error);
             }
-            const getCopilotGptRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.getManifest(copilotGptManifestFile, context);
+            const getCopilotGptRes = await CopilotGptManifestUtils_1.copilotGptManifestUtils.readCopilotGptManifestFile(copilotGptManifestFile);
             if (getCopilotGptRes.isOk()) {
                 if (getCopilotGptRes.value.actions) {
                     const pluginFiles = getCopilotGptRes.value.actions.map((action) => action.file);
@@ -181,19 +175,23 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
                         const pluginFileAbsolutePath = path.resolve(path.dirname(copilotGptManifestFile), pluginFile);
                         const pluginFileRelativePath = path.relative(appDirectory, pluginFileAbsolutePath);
                         const useForwardSlash = declarativeCopilots[0].file.concat(pluginFile).includes("/");
-                        const addPluginRes = await this.addPlugin(zip, (0, utils_1.normalizePath)(pluginFileRelativePath, useForwardSlash), appDirectory, context, !shouldwriteAllManifest ? undefined : jsonFileDir);
+                        const addPluginRes = await this.addPlugin(zip, utils_1.normalizePath(pluginFileRelativePath, useForwardSlash), appDirectory, context);
                         if (addPluginRes.isErr()) {
-                            return (0, teamsfx_api_1.err)(addPluginRes.error);
+                            return teamsfx_api_1.err(addPluginRes.error);
                         }
                     }
                 }
             }
             else {
-                return (0, teamsfx_api_1.err)(getCopilotGptRes.error);
+                return teamsfx_api_1.err(getCopilotGptRes.error);
             }
         }
         zip.writeZip(zipFileName);
-        await this.writeJsonFile(teamsManifestJsonFileName, JSON.stringify(manifest, null, 4));
+        if (await fs_extra_1.default.pathExists(jsonFileName)) {
+            await fs_extra_1.default.chmod(jsonFileName, 0o777);
+        }
+        await fs_extra_1.default.writeFile(jsonFileName, JSON.stringify(manifest, null, 4));
+        await fs_extra_1.default.chmod(jsonFileName, 0o444);
         const builtSuccess = [
             { content: "(√)Done: ", color: teamsfx_api_1.Colors.BRIGHT_GREEN },
             { content: "Teams Package ", color: teamsfx_api_1.Colors.BRIGHT_WHITE },
@@ -201,67 +199,64 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
             { content: " built successfully!", color: teamsfx_api_1.Colors.BRIGHT_WHITE },
         ];
         context.logProvider.info(builtSuccess);
-        return (0, teamsfx_api_1.ok)(new Map());
+        return teamsfx_api_1.ok(new Map());
     }
-    static async expandEnvVars(filePath, ctx, manifestType) {
+    static async expandEnvVars(filePath, ctx, telemetryKey) {
         const content = await fs_extra_1.default.readFile(filePath, "utf8");
-        return (0, utils_1.getResolvedManifest)(content, filePath, manifestType, ctx);
+        return utils_1.getResolvedManifest(content, filePath, telemetryKey, ctx);
     }
     validateArgs(args) {
         const invalidParams = [];
         if (!args || !args.manifestPath) {
             invalidParams.push("manifestPath");
         }
-        if (!args || (!args.outputJsonPath && !args.outputFolder)) {
-            invalidParams.push("outputJsonPath or outputFolder");
+        if (!args || !args.outputJsonPath) {
+            invalidParams.push("outputJsonPath");
         }
         if (!args || !args.outputZipPath) {
             invalidParams.push("outputZipPath");
         }
         if (invalidParams.length > 0) {
-            return (0, teamsfx_api_1.err)(new common_1.InvalidActionInputError(exports.actionName, invalidParams, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage"));
+            return teamsfx_api_1.err(new common_1.InvalidActionInputError(exports.actionName, invalidParams, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage"));
         }
         else {
-            return (0, teamsfx_api_1.ok)(undefined);
+            return teamsfx_api_1.ok(undefined);
         }
     }
     async validateReferencedFile(file, directory) {
         if (!(await fs_extra_1.default.pathExists(file))) {
-            return (0, teamsfx_api_1.err)(new common_1.FileNotFoundError(exports.actionName, file, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage"));
+            return teamsfx_api_1.err(new common_1.FileNotFoundError(exports.actionName, file, "https://aka.ms/teamsfx-actions/teamsapp-zipAppPackage"));
         }
         const relativePath = path.relative(directory, file);
         if (relativePath.startsWith("..")) {
-            return (0, teamsfx_api_1.err)(new teamsApp_1.InvalidFileOutsideOfTheDirectotryError(file));
+            return teamsfx_api_1.err(new teamsApp_1.InvalidFileOutsideOfTheDirectotryError(file));
         }
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
     /**
      * Add plugin file and plugin related files to zip.
      * @param zip zip
      * @param pluginRelativePath plugin file path relative to app package folder
-     * @param appDirectory app package path containing manifest template.
+     * @param appDirectory app package path
      * @param context context
-     * @param outputDirectory optional. Folder where we should put the resolved manifest in.
      * @returns result of adding plugin file and plugin related files
      */
-    async addPlugin(zip, pluginRelativePath, appDirectory, context, outputDirectory) {
+    async addPlugin(zip, pluginRelativePath, appDirectory, context) {
         const pluginFile = path.resolve(appDirectory, pluginRelativePath);
         const checkExistenceRes = await this.validateReferencedFile(pluginFile, appDirectory);
         if (checkExistenceRes.isErr()) {
-            return (0, teamsfx_api_1.err)(checkExistenceRes.error);
+            return teamsfx_api_1.err(checkExistenceRes.error);
         }
-        const addFileWithVariableRes = await this.addFileWithVariable(zip, pluginRelativePath, pluginFile, envFunctionUtils_1.ManifestType.PluginManifest, context, !outputDirectory
-            ? undefined
-            : path.join(outputDirectory, path.relative(appDirectory, pluginFile)));
+        const addFileWithVariableRes = await this.addFileWithVariable(zip, pluginRelativePath, pluginFile, telemetry_1.TelemetryPropertyKey.customizedAIPluginKeys, context);
         if (addFileWithVariableRes.isErr()) {
-            return (0, teamsfx_api_1.err)(addFileWithVariableRes.error);
+            return teamsfx_api_1.err(addFileWithVariableRes.error);
         }
         const addFilesRes = await this.addPluginRelatedFiles(zip, pluginRelativePath, appDirectory, context);
         if (addFilesRes.isErr()) {
-            return (0, teamsfx_api_1.err)(addFilesRes.error);
+            return teamsfx_api_1.err(addFilesRes.error);
         }
         else {
-            return (0, teamsfx_api_1.ok)(undefined);
+            return teamsfx_api_1.ok(undefined);
         }
     }
     /**
@@ -280,7 +275,7 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
             pluginContent = (await fs_extra_1.default.readJSON(pluginFilePath));
         }
         catch (e) {
-            return (0, teamsfx_api_1.err)(new common_1.JSONSyntaxError(pluginFilePath, e, exports.actionName));
+            return teamsfx_api_1.err(new common_1.JSONSyntaxError(pluginFilePath, e, exports.actionName));
         }
         const runtimes = pluginContent.runtimes;
         if (runtimes && runtimes.length > 0) {
@@ -290,55 +285,44 @@ let CreateAppPackageDriver = CreateAppPackageDriver_1 = class CreateAppPackageDr
                     // add openapi spec
                     const checkExistenceRes = await this.validateReferencedFile(specFile, appDirectory);
                     if (checkExistenceRes.isErr()) {
-                        return (0, teamsfx_api_1.err)(checkExistenceRes.error);
+                        return teamsfx_api_1.err(checkExistenceRes.error);
                     }
                     const entryName = path.relative(appDirectory, specFile);
                     const useForwardSlash = pluginFile.concat(runtime.spec.url).includes("/");
-                    const addFileWithVariableRes = await this.addFileWithVariable(zip, (0, utils_1.normalizePath)(entryName, useForwardSlash), specFile, envFunctionUtils_1.ManifestType.ApiSpec, context);
+                    const addFileWithVariableRes = await this.addFileWithVariable(zip, utils_1.normalizePath(entryName, useForwardSlash), specFile, telemetry_1.TelemetryPropertyKey.customizedOpenAPIKeys, context);
                     if (addFileWithVariableRes.isErr()) {
-                        return (0, teamsfx_api_1.err)(addFileWithVariableRes.error);
+                        return teamsfx_api_1.err(addFileWithVariableRes.error);
                     }
                 }
             }
         }
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
-    async addFileWithVariable(zip, entryName, filePath, manifestType, context, outputPath // If outputPath exists, we will write down the file after replacing placeholders.
-    ) {
-        const expandedEnvVarResult = await CreateAppPackageDriver_1.expandEnvVars(filePath, context, manifestType);
+    async addFileWithVariable(zip, entryName, filePath, telemetryKey, context) {
+        const expandedEnvVarResult = await CreateAppPackageDriver_1.expandEnvVars(filePath, context, telemetryKey);
         if (expandedEnvVarResult.isErr()) {
-            return (0, teamsfx_api_1.err)(expandedEnvVarResult.error);
+            return teamsfx_api_1.err(expandedEnvVarResult.error);
         }
         const content = expandedEnvVarResult.value;
         const attr = await fs_extra_1.default.stat(filePath);
         zip.addFile(entryName, Buffer.from(content), "", attr.mode);
-        if (outputPath && path.extname(outputPath).toLowerCase() === ".json") {
-            await this.writeJsonFile(`${outputPath.substring(0, outputPath.length - 5)}.${process.env.TEAMSFX_ENV}.json`, content);
-        }
-        return (0, teamsfx_api_1.ok)(undefined);
+        return teamsfx_api_1.ok(undefined);
     }
     addFileInZip(zip, zipPath, filePath) {
         zip.addLocalFile(filePath, zipPath === "." ? "" : zipPath);
     }
-    async writeJsonFile(jsonFileName, content) {
-        if (await fs_extra_1.default.pathExists(jsonFileName)) {
-            await fs_extra_1.default.chmod(jsonFileName, 0o777);
-        }
-        await fs_extra_1.default.writeFile(jsonFileName, content);
-        await fs_extra_1.default.chmod(jsonFileName, 0o444);
-    }
 };
 tslib_1.__decorate([
-    (0, lib_1.hooks)([
-        (0, globalVars_1.ErrorContextMW)({ source: "Teams", component: "CreateAppPackageDriver" }),
-        (0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(exports.actionName, exports.actionName),
+    lib_1.hooks([
+        globalVars_1.ErrorContextMW({ source: "Teams", component: "CreateAppPackageDriver" }),
+        addStartAndEndTelemetry_1.addStartAndEndTelemetry(exports.actionName, exports.actionName),
     ]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, wrapUtil_1.WrapDriverContext]),
     tslib_1.__metadata("design:returntype", Promise)
 ], CreateAppPackageDriver.prototype, "build", null);
 CreateAppPackageDriver = CreateAppPackageDriver_1 = tslib_1.__decorate([
-    (0, typedi_1.Service)(exports.actionName)
+    typedi_1.Service(exports.actionName)
 ], CreateAppPackageDriver);
 exports.CreateAppPackageDriver = CreateAppPackageDriver;
 //# sourceMappingURL=createAppPackage.js.map