@microsoft/teamsfx-core 2.0.10-alpha.fa1ce1fbb.0 → 2.0.10-alpha.fe2e47f9c.0

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

@@ -17,7 +17,6 @@ const path = tslib_1.__importStar(require("path"));
 const typedi_1 = require("typedi");
 const script_1 = require("../../../error/script");
 const commonConstant_1 = require("../../constant/commonConstant");
-const messages_1 = require("../../messages");
 const charsetUtils_1 = require("../../utils/charsetUtils");
 const addStartAndEndTelemetry_1 = require("../middleware/addStartAndEndTelemetry");
 const stringUtils_1 = require("../../../common/stringUtils");
@@ -51,45 +50,43 @@ async function defaultShell() {
 exports.defaultShell = defaultShell;
 let ScriptDriver = class ScriptDriver {
     async _run(typedArgs, context) {
-        var _a, _b;
-        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 : "./")));
+        var _a;
+        await ((_a = context.progressBar) === null || _a === void 0 ? void 0 : _a.next("Running script"));
         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);
+            return (0, teamsfx_api_1.err)(res.error);
         const outputs = res.value[1];
         const kvArray = Object.keys(outputs).map((k) => [k, outputs[k]]);
-        return teamsfx_api_1.ok(new Map(kvArray));
+        return (0, teamsfx_api_1.ok)(new Map(kvArray));
     }
     async execute(args, ctx) {
         const typedArgs = args;
         const res = await this._run(typedArgs, ctx);
-        const summaries = res.isOk()
-            ? [`Successfully executed command ${stringUtils_1.maskSecretValues(args.run)}`]
-            : [];
+        const summaries = res.isOk() ? [`Successfully executed command`] : [];
         return { result: res, summaries: summaries };
     }
 };
 tslib_1.__decorate([
-    hooks_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT)]),
+    (0, hooks_1.hooks)([(0, addStartAndEndTelemetry_1.addStartAndEndTelemetry)(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT)]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], ScriptDriver.prototype, "execute", null);
 ScriptDriver = tslib_1.__decorate([
-    typedi_1.Service(ACTION_NAME)
+    (0, typedi_1.Service)(ACTION_NAME)
 ], ScriptDriver);
 exports.ScriptDriver = ScriptDriver;
 exports.scriptDriver = new ScriptDriver();
 async function executeCommand(command, projectPath, logProvider, ui, workingDirectory, env, shell, timeout, redirectTo) {
-    const systemEncoding = await charsetUtils_1.getSystemEncoding(command);
+    const systemEncoding = await (0, charsetUtils_1.getSystemEncoding)(command);
     const dshell = await defaultShell();
     return new Promise((resolve) => {
         var _a, _b;
         const finalShell = shell || dshell;
-        let finalCmd = command;
-        if (typeof finalShell === "string" && finalShell.includes("cmd")) {
-            finalCmd = `%ComSpec% /D /E:ON /V:OFF /S /C "CALL ${command}"`;
-        }
+        const finalCmd = command;
+        // if (typeof finalShell === "string" && finalShell.includes("cmd")) {
+        //   finalCmd = `%ComSpec% /D /E:ON /V:OFF /S /C "CALL ${command}"`;
+        // }
         const platform = os_1.default.platform();
         let workingDir = workingDirectory || ".";
         workingDir = path.isAbsolute(workingDir) ? workingDir : path.join(projectPath, workingDir);
@@ -100,7 +97,9 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
         if (redirectTo) {
             appendFile = path.isAbsolute(redirectTo) ? redirectTo : path.join(projectPath, redirectTo);
         }
-        logProvider.verbose(`Start to run command: "${stringUtils_1.maskSecretValues(finalCmd)}" with args: ${JSON.stringify({
+        logProvider.verbose(`Start to run command: "${(0, stringUtils_1.maskSecret)(finalCmd, {
+            replace: "***",
+        })}" with args: ${JSON.stringify({
             shell: finalShell,
             cwd: workingDir,
             encoding: systemEncoding,
@@ -119,15 +118,17 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
         }, (error) => {
             if (error) {
                 error.message = stderrStrings.join("").trim() || error.message;
-                resolve(teamsfx_api_1.err(convertScriptErrorToFxError(error, finalCmd)));
+                resolve((0, teamsfx_api_1.err)(convertScriptErrorToFxError(error, finalCmd)));
             }
             else {
                 // handle '::set-output' or '::set-teamsfx-env' pattern
                 const outputString = allOutputStrings.join("");
                 const outputObject = parseSetOutputCommand(outputString);
                 if (Object.keys(outputObject).length > 0)
-                    logProvider.verbose(`script output env variables: ${stringUtils_1.maskSecretValues(JSON.stringify(outputObject))}`);
-                resolve(teamsfx_api_1.ok([outputString, outputObject]));
+                    logProvider.verbose(`script output env variables: ${(0, stringUtils_1.maskSecret)(JSON.stringify(outputObject), {
+                        replace: "***",
+                    })}`);
+                resolve((0, teamsfx_api_1.ok)([outputString, outputObject]));
             }
         });
         const dataHandler = (data) => {
@@ -138,7 +139,7 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
         };
         (_a = cp.stdout) === null || _a === void 0 ? void 0 : _a.on("data", (data) => {
             const str = bufferToString(data, systemEncoding);
-            logProvider.info(` [script stdout] ${stringUtils_1.maskSecretValues(str)}`);
+            logProvider.info(` [script stdout] ${(0, stringUtils_1.maskSecret)(str, { replace: "***" })}`);
             dataHandler(str);
         });
         const handler = getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler);
@@ -149,7 +150,7 @@ exports.executeCommand = executeCommand;
 function getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler) {
     return (data) => {
         const str = bufferToString(data, systemEncoding);
-        logProvider.warning(` [script stderr] ${stringUtils_1.maskSecretValues(str)}`);
+        logProvider.warning(` [script stderr] ${(0, stringUtils_1.maskSecret)(str, { replace: "***" })}`);
         dataHandler(str);
         stderrStrings.push(str);
     };
@@ -164,23 +165,21 @@ function bufferToString(data, systemEncoding) {
 exports.bufferToString = bufferToString;
 function convertScriptErrorToFxError(error, run) {
     if (error.killed) {
-        return new script_1.ScriptTimeoutError(error);
+        return new script_1.ScriptTimeoutError(error, run);
     }
     else {
-        return new script_1.ScriptExecutionError(error);
+        return new script_1.ScriptExecutionError(error, run);
     }
 }
 exports.convertScriptErrorToFxError = convertScriptErrorToFxError;
 function parseSetOutputCommand(stdout) {
-    const regex = /(::set-teamsfx-env|::set-output)\s+([^"'\s]+)=([^"'\s]+)/g;
+    const regex = /::(set-teamsfx-env|set-output)\s+(\w+)=((["'])(.*?)\4|[^"'\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;
-        }
+        const key = match[2];
+        const value = match[5] !== undefined ? match[5] : match[3];
+        output[key] = value;
     }
     return output;
 }

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":"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"}
+{"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.map

@@ -1 +1 @@
-{"version":3,"file":"appStudio.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/appStudio.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,OAAO,EACP,OAAO,EACP,qBAAqB,EACrB,WAAW,EACX,iBAAiB,EAGjB,MAAM,EAKP,MAAM,wBAAwB,CAAC;AA0BhC,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAIpE,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,OAAO,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAsJ/C;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAmE/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"}
+{"version":3,"file":"appStudio.d.ts","sourceRoot":"","sources":["../../../../src/component/driver/teamsApp/appStudio.ts"],"names":[],"mappings":"AAEA,OAAO,EAIL,OAAO,EACP,OAAO,EACP,qBAAqB,EACrB,WAAW,EACX,iBAAiB,EAGjB,MAAM,EAKP,MAAM,wBAAwB,CAAC;AA0BhC,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AAKpE,wBAAsB,qCAAqC,CACzD,UAAU,EAAE,MAAM,EAClB,aAAa,EAAE,iBAAiB,EAChC,MAAM,EAAE,WAAW,GAClB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAoBnC;AAED,wBAAsB,gBAAgB,CACpC,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAC,CAsJ/C;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,OAAO,EACZ,MAAM,EAAE,qBAAqB,GAC5B,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC,CAmE/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,CA4CtC"}

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

@@ -14,36 +14,37 @@ const path_1 = require("path");
 const typedi_1 = require("typedi");
 const util = tslib_1.__importStar(require("util"));
 const isUUID_1 = tslib_1.__importDefault(require("validator/lib/isUUID"));
+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 constants_2 = require("../../../question/constants");
 const envUtil_1 = require("../../utils/envUtil");
-const appStudioClient_1 = require("./clients/appStudioClient");
 const configure_1 = require("./configure");
 const constants_3 = require("./constants");
 const createAppPackage_1 = require("./createAppPackage");
 const errors_1 = require("./errors");
 const results_1 = require("./results");
 const ManifestUtils_1 = require("./utils/ManifestUtils");
+const utils_1 = require("../../../common/utils");
 async function checkIfAppInDifferentAcountSameTenant(teamsAppId, tokenProvider, logger) {
     const appStudioTokenRes = await tokenProvider.getAccessToken({
         scopes: constants_1.AppStudioScopes,
     });
     if (appStudioTokenRes.isErr()) {
-        return teamsfx_api_1.err(appStudioTokenRes.error);
+        return (0, teamsfx_api_1.err)(appStudioTokenRes.error);
     }
     const appStudioToken = appStudioTokenRes.value;
     try {
-        await appStudioClient_1.AppStudioClient.getApp(teamsAppId, appStudioToken, logger);
+        await teamsDevPortalClient_1.teamsDevPortalClient.getApp(appStudioToken, teamsAppId);
     }
     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);
+            const exists = await teamsDevPortalClient_1.teamsDevPortalClient.checkExistsInTenant(appStudioToken, teamsAppId);
+            return (0, teamsfx_api_1.ok)(exists);
         }
     }
-    return teamsfx_api_1.ok(false);
+    return (0, teamsfx_api_1.ok)(false);
 }
 exports.checkIfAppInDifferentAcountSameTenant = checkIfAppInDifferentAcountSameTenant;
 async function updateManifestV3(ctx, inputs) {
@@ -59,13 +60,13 @@ async function updateManifestV3(ctx, inputs) {
     const updateTeamsAppArgs = {
         appPackagePath: createAppPackageArgs.outputZipPath,
     };
-    const driverContext = generateDriverContext(ctx, inputs);
+    const driverContext = (0, utils_1.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);
+    const manifestResult = await ManifestUtils_1.manifestUtils.getManifestV3(manifestTemplatePath, driverContext);
     if (manifestResult.isErr()) {
-        return teamsfx_api_1.err(manifestResult.error);
+        return (0, teamsfx_api_1.err)(manifestResult.error);
     }
     else {
         manifest = manifestResult.value;
@@ -75,7 +76,7 @@ async function updateManifestV3(ctx, inputs) {
         !(await fs_extra_1.default.pathExists(createAppPackageArgs.outputZipPath))) {
         const res = (await buildDriver.execute(createAppPackageArgs, driverContext)).result;
         if (res.isErr()) {
-            return teamsfx_api_1.err(res.error);
+            return (0, teamsfx_api_1.err)(res.error);
         }
     }
     const existingManifest = await fs_extra_1.default.readJSON(manifestFileName);
@@ -83,9 +84,9 @@ async function updateManifestV3(ctx, inputs) {
     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);
+        const previewOnly = (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.previewOnly");
+        const previewUpdate = (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.previewAndUpdate");
+        const res = await ctx.userInteraction.showMessage("warn", (0, 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.execute(createAppPackageArgs, driverContext)).result;
         }
@@ -93,33 +94,33 @@ async function updateManifestV3(ctx, inputs) {
             await buildDriver.execute(createAppPackageArgs, driverContext);
         }
         else {
-            return teamsfx_api_1.err(new common_1.UserCancelError("appStudio"));
+            return (0, teamsfx_api_1.err)(new common_1.UserCancelError("appStudio"));
         }
     }
     const appStudioTokenRes = await ctx.tokenProvider.m365TokenProvider.getAccessToken({
         scopes: constants_1.AppStudioScopes,
     });
     if (appStudioTokenRes.isErr()) {
-        return teamsfx_api_1.err(appStudioTokenRes.error);
+        return (0, 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 app = await teamsDevPortalClient_1.teamsDevPortalClient.getApp(appStudioToken, teamsAppId);
             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);
+                const option = (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.overwriteAndUpdate");
+                const res = await ctx.userInteraction.showMessage("warn", (0, 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"));
+                    return (0, teamsfx_api_1.err)(new common_1.UserCancelError("appStudio"));
                 }
             }
         }
         const configureDriver = typedi_1.Container.get(configure_1.actionName);
         const result = (await configureDriver.execute(updateTeamsAppArgs, driverContext)).result;
         if (result.isErr()) {
-            return teamsfx_api_1.err(result.error);
+            return (0, teamsfx_api_1.err)(result.error);
         }
         let loginHint = "";
         const accountRes = await ctx.tokenProvider.m365TokenProvider.getJsonObject({
@@ -132,7 +133,7 @@ async function updateManifestV3(ctx, inputs) {
         if (inputs.platform === teamsfx_api_1.Platform.CLI) {
             const message = [
                 {
-                    content: localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppUpdatedCLINotice"),
+                    content: (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.teamsAppUpdatedCLINotice"),
                     color: teamsfx_api_1.Colors.BRIGHT_GREEN,
                 },
                 { content: url, color: teamsfx_api_1.Colors.BRIGHT_CYAN },
@@ -141,10 +142,10 @@ async function updateManifestV3(ctx, inputs) {
         }
         else {
             void ctx.userInteraction
-                .showMessage("info", localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppUpdatedNotice"), false, localizeUtils_1.getLocalizedString("plugins.appstudio.viewDeveloperPortal"))
+                .showMessage("info", (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.teamsAppUpdatedNotice"), false, (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.viewDeveloperPortal"))
                 .then(async (res) => {
                 if ((res === null || res === void 0 ? void 0 : res.isOk()) &&
-                    res.value === localizeUtils_1.getLocalizedString("plugins.appstudio.viewDeveloperPortal")) {
+                    res.value === (0, localizeUtils_1.getLocalizedString)("plugins.appstudio.viewDeveloperPortal")) {
                     await ctx.userInteraction.openUrl(url);
                 }
             });
@@ -153,10 +154,10 @@ async function updateManifestV3(ctx, inputs) {
     }
     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)));
+            return (0, 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);
+            return (0, teamsfx_api_1.err)(error);
         }
     }
 }
@@ -164,7 +165,7 @@ exports.updateManifestV3 = updateManifestV3;
 async function updateTeamsAppV3ForPublish(ctx, inputs) {
     var _a;
     let teamsAppId;
-    const driverContext = generateDriverContext(ctx, inputs);
+    const driverContext = (0, utils_1.generateDriverContext)(ctx, inputs);
     const updateTeamsAppArgs = {
         appPackagePath: inputs[constants_2.QuestionNames.AppPackagePath],
     };
@@ -175,9 +176,9 @@ async function updateTeamsAppV3ForPublish(ctx, inputs) {
         try {
             const manifestString = manifestFile.getData().toString();
             const manifest = JSON.parse(manifestString);
-            if (!manifest.id || !isUUID_1.default(manifest.id)) {
+            if (!manifest.id || !(0, 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"),
+                    (0, localizeUtils_1.getLocalizedString)("error.appstudio.noManifestId"),
                 ]));
             }
             else {
@@ -202,19 +203,19 @@ async function updateTeamsAppV3ForPublish(ctx, inputs) {
         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");
+        const suggestionDefaultMessage = (0, localizeUtils_1.getDefaultString)("error.appstudio.publishInDevPortalSuggestionForValidationError");
+        const suggestionMessage = (0, 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);
+        (_a = ctx.logProvider) === null || _a === void 0 ? void 0 : _a.error((0, localizeUtils_1.getLocalizedString)("plugins.appstudio.validationFailedNotice"));
+        return (0, teamsfx_api_1.err)(validationError);
     }
     const configureDriver = typedi_1.Container.get(configure_1.actionName);
     const result = (await configureDriver.execute(updateTeamsAppArgs, driverContext)).result;
     if (result.isErr()) {
-        return teamsfx_api_1.err(result.error);
+        return (0, teamsfx_api_1.err)(result.error);
     }
-    return teamsfx_api_1.ok(teamsAppId);
+    return (0, teamsfx_api_1.ok)(teamsAppId);
 }
 exports.updateTeamsAppV3ForPublish = updateTeamsAppV3ForPublish;
 async function getAppPackage(teamsAppId, m365TokenProvider, logProvider) {
@@ -222,10 +223,10 @@ async function getAppPackage(teamsAppId, m365TokenProvider, logProvider) {
         scopes: constants_1.AppStudioScopes,
     });
     if (appStudioTokenRes.isErr()) {
-        return teamsfx_api_1.err(appStudioTokenRes.error);
+        return (0, teamsfx_api_1.err)(appStudioTokenRes.error);
     }
     try {
-        const data = await appStudioClient_1.AppStudioClient.getAppPackage(teamsAppId, appStudioTokenRes.value, logProvider);
+        const data = await teamsDevPortalClient_1.teamsDevPortalClient.getAppPackage(appStudioTokenRes.value, teamsAppId);
         const appPackage = {};
         const buffer = Buffer.from(data, "base64");
         const zip = new adm_zip_1.default(buffer);
@@ -244,36 +245,24 @@ async function getAppPackage(teamsAppId, m365TokenProvider, logProvider) {
                     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);
+                    const ext = (0, path_1.extname)(name);
+                    const base = (0, path_1.basename)(name, ext);
                     // Since we don't support scene features, the remaining files are json files for language.
                     if (constants_3.supportedLanguageCodes.findIndex((code) => code === base) > -1) {
-                        set_1.default(appPackage, ["languages", base], data);
+                        (0, set_1.default)(appPackage, ["languages", base], data);
                     }
                     else {
-                        logProvider === null || logProvider === void 0 ? void 0 : logProvider.warning(localizeUtils_1.getLocalizedString("plugins.appstudio.unprocessedFile", name));
+                        logProvider === null || logProvider === void 0 ? void 0 : logProvider.warning((0, localizeUtils_1.getLocalizedString)("plugins.appstudio.unprocessedFile", name));
                     }
             }
         });
-        return teamsfx_api_1.ok(appPackage);
+        return (0, teamsfx_api_1.ok)(appPackage);
     }
     catch (e) {
-        return teamsfx_api_1.err(e);
+        return (0, 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 {

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

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