@microsoft/teamsfx-core 2.0.1 → 2.0.2-alpha.21023e5be.0

package/build/component/driver/script/scriptDriver.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.scriptDriver = exports.ScriptDriver = void 0;
+exports.capitalizeFirstLetter = exports.maskSecretValues = exports.parseSetOutputCommand = exports.convertScriptErrorToFxError = exports.bufferToString = exports.executeCommand = exports.scriptDriver = exports.ScriptDriver = void 0;
 const tslib_1 = require("tslib");
 /**
  * @author huajiezhang <huajiezhang@microsoft.com>
@@ -10,15 +10,21 @@ const typedi_1 = require("typedi");
 const hooks_1 = require("@feathersjs/hooks");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
 const commonConstant_1 = require("../../constant/commonConstant");
-const utils_1 = require("../../code/utils");
 const messages_1 = require("../../messages");
+const script_1 = require("../../../error/script");
+const charsetUtils_1 = require("../../utils/charsetUtils");
+const path = tslib_1.__importStar(require("path"));
+const os_1 = tslib_1.__importDefault(require("os"));
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const iconv_lite_1 = tslib_1.__importDefault(require("iconv-lite"));
+const child_process_1 = tslib_1.__importDefault(require("child_process"));
 const ACTION_NAME = "script";
 let ScriptDriver = class ScriptDriver {
     async run(args, context) {
         var _a, _b;
         const typedArgs = args;
         await ((_a = context.progressBar) === null || _a === void 0 ? void 0 : _a.next(messages_1.ProgressMessages.runCommand(typedArgs.run, (_b = typedArgs.workingDirectory) !== null && _b !== void 0 ? _b : "./")));
-        const res = await utils_1.executeCommand(typedArgs.run, context.projectPath, context.logProvider, context.ui, typedArgs.workingDirectory, undefined, typedArgs.shell, typedArgs.timeout, typedArgs.redirectTo);
+        const res = await executeCommand(typedArgs.run, context.projectPath, context.logProvider, context.ui, typedArgs.workingDirectory, undefined, typedArgs.shell, typedArgs.timeout, typedArgs.redirectTo);
         if (res.isErr())
             return teamsfx_api_1.err(res.error);
         const outputs = res.value[1];
@@ -28,7 +34,7 @@ let ScriptDriver = class ScriptDriver {
     async execute(args, ctx) {
         const res = await this.run(args, ctx);
         const summaries = res.isOk()
-            ? [`Successfully executed command ${utils_1.maskSecretValues(args.run)}`]
+            ? [`Successfully executed command ${maskSecretValues(args.run)}`]
             : [];
         return { result: res, summaries: summaries };
     }
@@ -50,4 +56,115 @@ ScriptDriver = tslib_1.__decorate([
 ], ScriptDriver);
 exports.ScriptDriver = ScriptDriver;
 exports.scriptDriver = new ScriptDriver();
+async function executeCommand(command, projectPath, logProvider, ui, workingDirectory, env, shell, timeout, redirectTo) {
+    return new Promise(async (resolve, reject) => {
+        var _a, _b;
+        const platform = os_1.default.platform();
+        let workingDir = workingDirectory || ".";
+        workingDir = path.isAbsolute(workingDir) ? workingDir : path.join(projectPath, workingDir);
+        if (platform === "win32") {
+            workingDir = capitalizeFirstLetter(path.resolve(workingDir !== null && workingDir !== void 0 ? workingDir : ""));
+        }
+        // const defaultOsToShellMap: any = {
+        //   win32: "powershell",
+        //   darwin: "bash",
+        //   linux: "bash",
+        // };
+        let run = command;
+        // shell = shell || defaultOsToShellMap[platform] || "pwsh";
+        let appendFile = undefined;
+        if (redirectTo) {
+            appendFile = path.isAbsolute(redirectTo) ? redirectTo : path.join(projectPath, redirectTo);
+        }
+        if (shell === "cmd") {
+            run = `%ComSpec% /D /E:ON /V:OFF /S /C "CALL ${command}"`;
+        }
+        await logProvider.info(`Start to run command: "${command}" on path: "${workingDir}".`);
+        const allOutputStrings = [];
+        const systemEncoding = await charsetUtils_1.getSystemEncoding();
+        const stderrStrings = [];
+        const cp = child_process_1.default.exec(run, {
+            shell: shell,
+            cwd: workingDir,
+            encoding: "buffer",
+            env: Object.assign(Object.assign({}, process.env), env),
+            timeout: timeout,
+        }, async (error) => {
+            if (error) {
+                error.message = stderrStrings.join("").trim() || error.message;
+                resolve(teamsfx_api_1.err(convertScriptErrorToFxError(error, run)));
+            }
+            else {
+                // handle '::set-output' or '::set-teamsfx-env' pattern
+                const outputString = allOutputStrings.join("");
+                const outputObject = parseSetOutputCommand(outputString);
+                resolve(teamsfx_api_1.ok([outputString, outputObject]));
+            }
+        });
+        const dataHandler = (data) => {
+            if (appendFile) {
+                fs_extra_1.default.appendFileSync(appendFile, data);
+            }
+            allOutputStrings.push(data);
+        };
+        (_a = cp.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => {
+            const str = bufferToString(data, systemEncoding);
+            logProvider.info(` [script action stdout] ${maskSecretValues(str)}`);
+            dataHandler(str);
+        });
+        (_b = cp.stderr) === null || _b === void 0 ? void 0 : _b.on("data", (data) => {
+            const str = bufferToString(data, systemEncoding);
+            logProvider.warning(` [script action stderr] ${maskSecretValues(str)}`);
+            dataHandler(str);
+            stderrStrings.push(str);
+        });
+    });
+}
+exports.executeCommand = executeCommand;
+function bufferToString(data, systemEncoding) {
+    const str = systemEncoding === "utf8" || systemEncoding === "utf-8"
+        ? data.toString()
+        : iconv_lite_1.default.decode(data, systemEncoding);
+    return str;
+}
+exports.bufferToString = bufferToString;
+function convertScriptErrorToFxError(error, run) {
+    if (error.killed) {
+        return new script_1.ScriptTimeoutError(run);
+    }
+    else {
+        return new script_1.ScriptExecutionError(run, error.message);
+    }
+}
+exports.convertScriptErrorToFxError = convertScriptErrorToFxError;
+function parseSetOutputCommand(stdout) {
+    const regex = /(::set-teamsfx-env|::set-output)\s+([^"'\s]+)=([^"'\s]+)/g;
+    const output = {};
+    let match;
+    while ((match = regex.exec(stdout))) {
+        if (match && match.length === 4) {
+            const key = match[2].trim();
+            const value = match[3].trim();
+            output[key] = value;
+        }
+    }
+    return output;
+}
+exports.parseSetOutputCommand = parseSetOutputCommand;
+function maskSecretValues(stdout) {
+    for (const key of Object.keys(process.env)) {
+        if (key.startsWith("SECRET_")) {
+            const value = process.env[key];
+            if (value) {
+                stdout = stdout.replace(value, "***");
+            }
+        }
+    }
+    return stdout;
+}
+exports.maskSecretValues = maskSecretValues;
+function capitalizeFirstLetter(raw) {
+    return raw.charAt(0).toUpperCase() + raw.slice(1);
+}
+exports.capitalizeFirstLetter = capitalizeFirstLetter;
 //# sourceMappingURL=scriptDriver.js.map

package/build/component/driver/script/scriptDriver.js.map

@@ -1 +1 @@
-{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":";;;;AAAA;;GAEG;AACH,wDAAkE;AAClE,mCAAiC;AAGjC,6CAA0C;AAC1C,mFAAgF;AAChF,kEAAkE;AAClE,4CAAoE;AACpE,6CAAkD;AAElD,MAAM,WAAW,GAAG,QAAQ,CAAC;AAW7B,IAAa,YAAY,GAAzB,MAAa,YAAY;IAEvB,KAAK,CAAC,GAAG,CAAC,IAAa,EAAE,OAAsB;;QAC7C,MAAM,SAAS,GAAG,IAAwB,CAAC;QAC3C,MAAM,CAAA,MAAA,OAAO,CAAC,WAAW,0CAAE,IAAI,CAC7B,2BAAgB,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,MAAA,SAAS,CAAC,gBAAgB,mCAAI,IAAI,CAAC,CAC/E,CAAA,CAAC;QACF,MAAM,GAAG,GAAG,MAAM,sBAAc,CAC9B,SAAS,CAAC,GAAG,EACb,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,WAAW,EACnB,OAAO,CAAC,EAAE,EACV,SAAS,CAAC,gBAAgB,EAC1B,SAAS,EACT,SAAS,CAAC,KAAK,EACf,SAAS,CAAC,OAAO,EACjB,SAAS,CAAC,UAAU,CACrB,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,EAAE;YAAE,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;QACvC,MAAM,OAAO,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAC7B,MAAM,OAAO,GAAuB,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;QACrF,OAAO,gBAAE,CAAC,IAAI,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;IAC9B,CAAC;IAGD,KAAK,CAAC,OAAO,CAAC,IAAa,EAAE,GAAkB;QAC7C,MAAM,GAAG,GAAG,MAAM,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;QACtC,MAAM,SAAS,GAAa,GAAG,CAAC,IAAI,EAAE;YACpC,CAAC,CAAC,CAAC,iCAAiC,wBAAgB,CAAE,IAAY,CAAC,GAAG,CAAC,EAAE,CAAC;YAC1E,CAAC,CAAC,EAAE,CAAC;QACP,OAAO,EAAE,MAAM,EAAE,GAAG,EAAE,SAAS,EAAE,SAAS,EAAE,CAAC;IAC/C,CAAC;CACF,CAAA;AA9BC;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;;;;uCAqBjF;AAGD;IADC,aAAK,CAAC,CAAC,iDAAuB,CAAC,WAAW,EAAE,kCAAiB,CAAC,gBAAgB,CAAC,CAAC,CAAC;;;;2CAOjF;AA/BU,YAAY;IADxB,gBAAO,CAAC,WAAW,CAAC;GACR,YAAY,CAgCxB;AAhCY,oCAAY;AAkCZ,QAAA,YAAY,GAAG,IAAI,YAAY,EAAE,CAAC"}
+{"version":3,"file":"scriptDriver.js","sourceRoot":"","sources":["../../../../src/component/driver/script/scriptDriver.ts"],"names":[],"mappings":"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"}

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

@@ -0,0 +1,7 @@
+import { FxError, InputsWithProjectPath, M365TokenProvider, Result, ResourceContextV3, LogProvider } from "@microsoft/teamsfx-api";
+import { AppPackage } from "./interfaces/appdefinitions/appPackage";
+export declare function checkIfAppInDifferentAcountSameTenant(teamsAppId: string, tokenProvider: M365TokenProvider, logger: LogProvider): Promise<Result<boolean, FxError>>;
+export declare function updateManifestV3(ctx: ResourceContextV3, inputs: InputsWithProjectPath): Promise<Result<Map<string, string>, FxError>>;
+export declare function updateTeamsAppV3ForPublish(ctx: ResourceContextV3, inputs: InputsWithProjectPath): Promise<Result<any, FxError>>;
+export declare function getAppPackage(teamsAppId: string, m365TokenProvider: M365TokenProvider, logProvider?: LogProvider): Promise<Result<AppPackage, FxError>>;
+//# sourceMappingURL=appStudio.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"appStudio.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/appStudio.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,OAAO,EACP,qBAAqB,EACrB,iBAAiB,EAEjB,MAAM,EACN,iBAAiB,EAGjB,WAAW,EAIZ,MAAM,wBAAwB,CAAC;AAqBhC,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAQpE,wBAAsB,qCAAqC,CACzD,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,iBAAiB,EAChC,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAqBnC;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,iBAAiB,EACtB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAuJ/C;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,iBAAiB,EACtB,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAiE/B;AAED,wBAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,iBAAiB,EAAE,iBAAiB,EACpC,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAgDtC"}

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

@@ -0,0 +1,282 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getAppPackage = exports.updateTeamsAppV3ForPublish = exports.updateManifestV3 = exports.checkIfAppInDifferentAcountSameTenant = void 0;
+const tslib_1 = require("tslib");
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+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 lodash_1 = tslib_1.__importDefault(require("lodash"));
+const util = tslib_1.__importStar(require("util"));
+const isUUID_1 = tslib_1.__importDefault(require("validator/lib/isUUID"));
+const typedi_1 = require("typedi");
+const tools_1 = require("../../../common/tools");
+const appStudioClient_1 = require("./clients/appStudioClient");
+const errors_1 = require("./errors");
+const results_1 = require("./results");
+const localizeUtils_1 = require("../../../common/localizeUtils");
+const ManifestUtils_1 = require("./utils/ManifestUtils");
+const constants_1 = require("./constants");
+const envUtil_1 = require("../../utils/envUtil");
+const path_1 = require("path");
+const set_1 = tslib_1.__importDefault(require("lodash/set"));
+const question_1 = require("../../../core/question");
+const createAppPackage_1 = require("./createAppPackage");
+const configure_1 = require("./configure");
+const common_1 = require("../../../error/common");
+async function checkIfAppInDifferentAcountSameTenant(teamsAppId, tokenProvider, logger) {
+    const appStudioTokenRes = await tokenProvider.getAccessToken({
+        scopes: tools_1.AppStudioScopes,
+    });
+    if (appStudioTokenRes.isErr()) {
+        return teamsfx_api_1.err(appStudioTokenRes.error);
+    }
+    const appStudioToken = appStudioTokenRes.value;
+    try {
+        await appStudioClient_1.AppStudioClient.getApp(teamsAppId, appStudioToken, logger);
+    }
+    catch (error) {
+        if (error.message && error.message.includes("404")) {
+            const exists = await appStudioClient_1.AppStudioClient.checkExistsInTenant(teamsAppId, appStudioToken, logger);
+            return teamsfx_api_1.ok(exists);
+        }
+    }
+    return teamsfx_api_1.ok(false);
+}
+exports.checkIfAppInDifferentAcountSameTenant = checkIfAppInDifferentAcountSameTenant;
+async function updateManifestV3(ctx, inputs) {
+    var _a, _b, _c;
+    const state = {
+        ENV_NAME: process.env.TEAMSFX_ENV,
+    };
+    const manifestTemplatePath = (_a = inputs.manifestTemplatePath) !== null && _a !== void 0 ? _a : (await ManifestUtils_1.manifestUtils.getTeamsAppManifestPath(inputs.projectPath));
+    const manifestFileName = path.join(inputs.projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.BuildFolderName, `manifest.${state.ENV_NAME}.json`);
+    // Prepare for driver
+    const buildDriver = typedi_1.Container.get(createAppPackage_1.actionName);
+    const createAppPackageArgs = generateCreateAppPackageArgs(inputs.projectPath, manifestTemplatePath, state.ENV_NAME);
+    const updateTeamsAppArgs = {
+        appPackagePath: createAppPackageArgs.outputZipPath,
+    };
+    const driverContext = generateDriverContext(ctx, inputs);
+    await envUtil_1.envUtil.readEnv(inputs.projectPath, state.ENV_NAME);
+    // render manifest
+    let manifest;
+    const manifestResult = await ManifestUtils_1.manifestUtils.getManifestV3(manifestTemplatePath);
+    if (manifestResult.isErr()) {
+        return teamsfx_api_1.err(manifestResult.error);
+    }
+    else {
+        manifest = manifestResult.value;
+    }
+    // read built manifest file
+    if (!(await fs_extra_1.default.pathExists(manifestFileName)) ||
+        !(await fs_extra_1.default.pathExists(createAppPackageArgs.outputZipPath))) {
+        const res = await buildDriver.run(createAppPackageArgs, driverContext);
+        if (res.isErr()) {
+            return teamsfx_api_1.err(res.error);
+        }
+    }
+    const existingManifest = await fs_extra_1.default.readJSON(manifestFileName);
+    const teamsAppId = manifest.id;
+    delete manifest.id;
+    delete existingManifest.id;
+    if (!lodash_1.default.isEqual(manifest, existingManifest)) {
+        const previewOnly = localizeUtils_1.getLocalizedString("plugins.appstudio.previewOnly");
+        const previewUpdate = localizeUtils_1.getLocalizedString("plugins.appstudio.previewAndUpdate");
+        const res = await ctx.userInteraction.showMessage("warn", localizeUtils_1.getLocalizedString("plugins.appstudio.updateManifestTip"), true, previewUpdate, previewOnly);
+        if ((res === null || res === void 0 ? void 0 : res.isOk()) && res.value === previewOnly) {
+            return await buildDriver.run(createAppPackageArgs, driverContext);
+        }
+        else if ((res === null || res === void 0 ? void 0 : res.isOk()) && res.value === previewUpdate) {
+            await buildDriver.run(createAppPackageArgs, driverContext);
+        }
+        else {
+            return teamsfx_api_1.err(new common_1.UserCancelError("appStudio"));
+        }
+    }
+    const appStudioTokenRes = await ctx.tokenProvider.m365TokenProvider.getAccessToken({
+        scopes: tools_1.AppStudioScopes,
+    });
+    if (appStudioTokenRes.isErr()) {
+        return teamsfx_api_1.err(appStudioTokenRes.error);
+    }
+    const appStudioToken = appStudioTokenRes.value;
+    try {
+        const localUpdateTime = process.env.TEAMS_APP_UPDATE_TIME;
+        if (localUpdateTime) {
+            const app = await appStudioClient_1.AppStudioClient.getApp(teamsAppId, appStudioToken, ctx.logProvider);
+            const devPortalUpdateTime = (_c = (_b = new Date(app.updatedAt)) === null || _b === void 0 ? void 0 : _b.getTime()) !== null && _c !== void 0 ? _c : -1;
+            if (new Date(localUpdateTime).getTime() < devPortalUpdateTime) {
+                const option = localizeUtils_1.getLocalizedString("plugins.appstudio.overwriteAndUpdate");
+                const res = await ctx.userInteraction.showMessage("warn", localizeUtils_1.getLocalizedString("plugins.appstudio.updateOverwriteTip"), true, option);
+                if (!((res === null || res === void 0 ? void 0 : res.isOk()) && res.value === option)) {
+                    return teamsfx_api_1.err(new common_1.UserCancelError("appStudio"));
+                }
+            }
+        }
+        const configureDriver = typedi_1.Container.get(configure_1.actionName);
+        const result = await configureDriver.run(updateTeamsAppArgs, driverContext);
+        if (result.isErr()) {
+            return teamsfx_api_1.err(result.error);
+        }
+        let loginHint = "";
+        const accountRes = await ctx.tokenProvider.m365TokenProvider.getJsonObject({
+            scopes: tools_1.AppStudioScopes,
+        });
+        if (accountRes.isOk()) {
+            loginHint = accountRes.value.unique_name;
+        }
+        const url = util.format(constants_1.Constants.DEVELOPER_PORTAL_APP_PACKAGE_URL, teamsAppId, loginHint);
+        if (inputs.platform === teamsfx_api_1.Platform.CLI) {
+            const message = [
+                {
+                    content: localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppUpdatedCLINotice"),
+                    color: teamsfx_api_1.Colors.BRIGHT_GREEN,
+                },
+                { content: url, color: teamsfx_api_1.Colors.BRIGHT_CYAN },
+            ];
+            ctx.userInteraction.showMessage("info", message, false);
+        }
+        else {
+            ctx.userInteraction
+                .showMessage("info", localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppUpdatedNotice"), false, localizeUtils_1.getLocalizedString("plugins.appstudio.viewDeveloperPortal"))
+                .then((res) => {
+                if ((res === null || res === void 0 ? void 0 : res.isOk()) &&
+                    res.value === localizeUtils_1.getLocalizedString("plugins.appstudio.viewDeveloperPortal")) {
+                    ctx.userInteraction.openUrl(url);
+                }
+            });
+        }
+        return result;
+    }
+    catch (error) {
+        if (error.message && error.message.includes("404")) {
+            return teamsfx_api_1.err(results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.UpdateManifestWithInvalidAppError.name, errors_1.AppStudioError.UpdateManifestWithInvalidAppError.message(teamsAppId)));
+        }
+        else {
+            return teamsfx_api_1.err(error);
+        }
+    }
+}
+exports.updateManifestV3 = updateManifestV3;
+async function updateTeamsAppV3ForPublish(ctx, inputs) {
+    var _a;
+    let teamsAppId;
+    const driverContext = generateDriverContext(ctx, inputs);
+    const updateTeamsAppArgs = {
+        appPackagePath: inputs[question_1.CoreQuestionNames.AppPackagePath],
+    };
+    const zipEntries = new adm_zip_1.default(updateTeamsAppArgs.appPackagePath).getEntries();
+    const manifestFile = zipEntries.find((x) => x.entryName === constants_1.Constants.MANIFEST_FILE);
+    let validationError;
+    if (manifestFile) {
+        try {
+            const manifestString = manifestFile.getData().toString();
+            const manifest = JSON.parse(manifestString);
+            if (!manifest.id || !isUUID_1.default(manifest.id)) {
+                validationError = results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, errors_1.AppStudioError.ValidationFailedError.message([
+                    localizeUtils_1.getLocalizedString("error.appstudio.noManifestId"),
+                ]));
+            }
+            else {
+                teamsAppId = manifest.id;
+                const validationResult = await teamsfx_api_1.ManifestUtil.validateManifest(manifest);
+                if (validationResult.length > 0) {
+                    const errMessage = errors_1.AppStudioError.ValidationFailedError.message(validationResult);
+                    validationError = results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, errMessage);
+                }
+            }
+        }
+        catch (e) {
+            validationError = results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, errors_1.AppStudioError.ValidationFailedError.message([e.message]));
+            validationError.stack = e.stack;
+        }
+    }
+    else {
+        // missing manifest file
+        validationError = new common_1.FileNotFoundError("appManifest", "manifest.json");
+    }
+    if (validationError) {
+        const suggestionDefaultMessage = localizeUtils_1.getDefaultString("error.appstudio.publishInDevPortalSuggestionForValidationError");
+        const suggestionMessage = localizeUtils_1.getLocalizedString("error.appstudio.publishInDevPortalSuggestionForValidationError");
+        validationError.message += ` ${suggestionDefaultMessage}`;
+        validationError.displayMessage += ` ${suggestionMessage}`;
+        (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.error(localizeUtils_1.getLocalizedString("plugins.appstudio.validationFailedNotice"));
+        return teamsfx_api_1.err(validationError);
+    }
+    const configureDriver = typedi_1.Container.get(configure_1.actionName);
+    const result = await configureDriver.run(updateTeamsAppArgs, driverContext);
+    if (result.isErr()) {
+        return teamsfx_api_1.err(result.error);
+    }
+    return teamsfx_api_1.ok(teamsAppId);
+}
+exports.updateTeamsAppV3ForPublish = updateTeamsAppV3ForPublish;
+async function getAppPackage(teamsAppId, m365TokenProvider, logProvider) {
+    const appStudioTokenRes = await m365TokenProvider.getAccessToken({
+        scopes: tools_1.AppStudioScopes,
+    });
+    if (appStudioTokenRes.isErr()) {
+        return teamsfx_api_1.err(appStudioTokenRes.error);
+    }
+    try {
+        const data = await appStudioClient_1.AppStudioClient.getAppPackage(teamsAppId, appStudioTokenRes.value, logProvider);
+        const appPackage = {};
+        const buffer = Buffer.from(data, "base64");
+        const zip = new adm_zip_1.default(buffer);
+        const zipEntries = zip.getEntries(); // an array of ZipEntry records
+        zipEntries === null || zipEntries === void 0 ? void 0 : zipEntries.forEach(async function (zipEntry) {
+            const data = zipEntry.getData();
+            const name = zipEntry.entryName.toLowerCase();
+            switch (name) {
+                case "manifest.json":
+                    appPackage.manifest = data;
+                    break;
+                case "color.png":
+                    appPackage.icons = Object.assign(Object.assign({}, appPackage.icons), { color: data });
+                    break;
+                case "outline.png":
+                    appPackage.icons = Object.assign(Object.assign({}, appPackage.icons), { outline: data });
+                    break;
+                default:
+                    const ext = path_1.extname(name);
+                    const base = path_1.basename(name, ext);
+                    // Since we don't support scene features, the remaining files are json files for language.
+                    if (constants_1.supportedLanguageCodes.findIndex((code) => code === base) > -1) {
+                        set_1.default(appPackage, ["languages", base], data);
+                    }
+                    else {
+                        logProvider === null || logProvider === void 0 ? void 0 : logProvider.warning(localizeUtils_1.getLocalizedString("plugins.appstudio.unprocessedFile", name));
+                    }
+            }
+        });
+        return teamsfx_api_1.ok(appPackage);
+    }
+    catch (e) {
+        return teamsfx_api_1.err(e);
+    }
+}
+exports.getAppPackage = getAppPackage;
+function generateDriverContext(ctx, inputs) {
+    return {
+        azureAccountProvider: ctx.tokenProvider.azureAccountProvider,
+        m365TokenProvider: ctx.tokenProvider.m365TokenProvider,
+        ui: ctx.userInteraction,
+        progressBar: undefined,
+        logProvider: ctx.logProvider,
+        telemetryReporter: ctx.telemetryReporter,
+        projectPath: ctx.projectPath,
+        platform: inputs.platform,
+    };
+}
+function generateCreateAppPackageArgs(projectPath, manifestTemplatePath, envName) {
+    const manifestFileName = path.join(projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.BuildFolderName, `manifest.${envName}.json`);
+    return {
+        manifestPath: manifestTemplatePath,
+        outputZipPath: path.join(projectPath, teamsfx_api_1.AppPackageFolderName, teamsfx_api_1.BuildFolderName, `appPackage.${envName}.zip`),
+        outputJsonPath: manifestFileName,
+    };
+}
+//# sourceMappingURL=appStudio.js.map

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

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

package/build/component/driver/teamsApp/clients/appStudioClient.d.ts

@@ -0,0 +1,58 @@
+/// <reference types="node" />
+import { LogProvider } from "@microsoft/teamsfx-api";
+import { AppDefinition } from "../../../driver/teamsApp/interfaces/appdefinitions/appDefinition";
+import { AppUser } from "../../../driver/teamsApp/interfaces/appdefinitions/appUser";
+import { IPublishingAppDenition } from "../interfaces/appdefinitions/IPublishingAppDefinition";
+import { IValidationResult } from "../../../driver/teamsApp/interfaces/appdefinitions/IValidationResult";
+export declare namespace AppStudioClient {
+    /**
+     * Set user region
+     * @param _region e.g. https://dev.teams.microsoft.com/amer
+     */
+    function setRegion(_region: string): void;
+    function sendStartEvent(apiName: string): void;
+    function sendSuccessEvent(apiName: string): void;
+    function wrapException(e: any, apiName: string): Error;
+    /**
+     * Import an app registration in app studio with the given archived file and returns the app definition.
+     * @param {Buffer}  file - Zip file with manifest.json and two icons
+     * @param {string}  appStudioToken
+     * @param {boolean} overwrite
+     * @param {LogProvider} logProvider
+     * @returns {Promise<AppDefinition>}
+     */
+    function importApp(file: Buffer, appStudioToken: string, logProvider?: LogProvider, overwrite?: boolean): Promise<AppDefinition>;
+    function getApp(teamsAppId: string, appStudioToken: string, logProvider?: LogProvider): Promise<AppDefinition>;
+    /**
+     * Check if app exists in the user's organization by the Teams app id
+     * @param teamsAppId
+     * @param appStudioToken
+     * @param logProvider
+     * @returns
+     */
+    function checkExistsInTenant(teamsAppId: string, appStudioToken: string, logProvider?: LogProvider): Promise<boolean>;
+    /**
+     * Publish Teams app to Teams App Catalog
+     * @param teamsAppId
+     * @param file
+     * @param appStudioToken
+     * @returns
+     */
+    function publishTeamsApp(teamsAppId: string, file: Buffer, appStudioToken: string): Promise<string>;
+    /**
+     * Update existed publish request
+     * @param teamsAppId
+     * @param file
+     * @param appStudioToken
+     * @returns
+     */
+    function publishTeamsAppUpdate(teamsAppId: string, file: Buffer, appStudioToken: string): Promise<string>;
+    function getAppByTeamsAppId(teamsAppId: string, appStudioToken: string): Promise<IPublishingAppDenition | undefined>;
+    function getUserList(teamsAppId: string, appStudioToken: string): Promise<AppUser[] | undefined>;
+    function checkPermission(teamsAppId: string, appStudioToken: string, userObjectId: string): Promise<string>;
+    function grantPermission(teamsAppId: string, appStudioToken: string, newUser: AppUser): Promise<void>;
+    function getAppPackage(teamsAppId: string, appStudioToken: string, logProvider?: LogProvider): Promise<any>;
+    function partnerCenterAppPackageValidation(file: Buffer, appStudioToken: string): Promise<IValidationResult>;
+    function getSideloadingStatus(appStudioToken: string): Promise<boolean | undefined>;
+}
+//# sourceMappingURL=appStudioClient.d.ts.map

package/build/component/driver/teamsApp/clients/appStudioClient.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"appStudioClient.d.ts","sourceRoot":"","sources":["../../../../../src/component/driver/teamsApp/clients/appStudioClient.ts"],"names":[],"mappings":";AAOA,OAAO,EAAe,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,kEAAkE,CAAC;AACjG,OAAO,EAAE,OAAO,EAAE,MAAM,4DAA4D,CAAC;AAErF,OAAO,EAAE,sBAAsB,EAAE,MAAM,uDAAuD,CAAC;AAgB/F,OAAO,EAAE,iBAAiB,EAAE,MAAM,sEAAsE,CAAC;AAKzG,yBAAiB,eAAe,CAAC;IAK/B;;;OAGG;IACH,SAAgB,SAAS,CAAC,OAAO,EAAE,MAAM,QAExC;IAoBD,SAAgB,cAAc,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAIpD;IAED,SAAgB,gBAAgB,CAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAItD;IAED,SAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,EAAE,MAAM,GAAG,KAAK,CAuB5D;IAED;;;;;;;OAOG;IACH,SAAsB,SAAS,CAC7B,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,WAAW,EACzB,SAAS,UAAQ,GAChB,OAAO,CAAC,aAAa,CAAC,CAgExB;IAED,SAAsB,MAAM,CAC1B,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,aAAa,CAAC,CA4CxB;IAED;;;;;;OAMG;IACH,SAAsB,mBAAmB,CACvC,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,OAAO,CAAC,CAkBlB;IAED;;;;;;OAMG;IACH,SAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC,CA4CjB;IAED;;;;;;OAMG;IACH,SAAsB,qBAAqB,CACzC,UAAU,EAAE,MAAM,EAClB,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,MAAM,CAAC,CAmDjB;IAED,SAAsB,kBAAkB,CACtC,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,sBAAsB,GAAG,SAAS,CAAC,CA2B7C;IAED,SAAsB,WAAW,CAC/B,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,OAAO,EAAE,GAAG,SAAS,CAAC,CAShC;IAED,SAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,MAAM,CAAC,CAkBjB;IAED,SAAsB,eAAe,CACnC,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,OAAO,EAAE,OAAO,GACf,OAAO,CAAC,IAAI,CAAC,CAoDf;IAED,SAAsB,aAAa,CACjC,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,WAAW,CAAC,EAAE,WAAW,GACxB,OAAO,CAAC,GAAG,CAAC,CAoBd;IAED,SAAsB,iCAAiC,CACrD,IAAI,EAAE,MAAM,EACZ,cAAc,EAAE,MAAM,GACrB,OAAO,CAAC,iBAAiB,CAAC,CAe5B;IAWD,SAAsB,oBAAoB,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,SAAS,CAAC,CAsE/F;CACF"}