@microsoft/teamsfx-core 2.0.5 → 2.0.6-alpha.07708d12e.0

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

@@ -2,7 +2,7 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.capitalizeFirstLetter = exports.maskSecretValues = exports.parseSetOutputCommand = exports.convertScriptErrorToFxError = exports.bufferToString = exports.executeCommand = exports.scriptDriver = exports.ScriptDriver = void 0;
+exports.capitalizeFirstLetter = exports.maskSecretValues = exports.parseSetOutputCommand = exports.convertScriptErrorToFxError = exports.bufferToString = exports.getStderrHandler = exports.executeCommand = exports.scriptDriver = exports.ScriptDriver = void 0;
 const tslib_1 = require("tslib");
 /**
  * @author huajiezhang <huajiezhang@microsoft.com>
@@ -22,9 +22,8 @@ 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) {
+    async _run(typedArgs, 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 executeCommand(typedArgs.run, context.projectPath, context.logProvider, context.ui, typedArgs.workingDirectory, undefined, typedArgs.shell, typedArgs.timeout, typedArgs.redirectTo);
         if (res.isErr())
@@ -34,19 +33,14 @@ let ScriptDriver = class ScriptDriver {
         return teamsfx_api_1.ok(new Map(kvArray));
     }
     async execute(args, ctx) {
-        const res = await this.run(args, ctx);
+        const typedArgs = args;
+        const res = await this._run(typedArgs, ctx);
         const summaries = res.isOk()
             ? [`Successfully executed command ${maskSecretValues(args.run)}`]
             : [];
         return { result: res, summaries: summaries };
     }
 };
-tslib_1.__decorate([
-    hooks_1.hooks([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, "run", null);
 tslib_1.__decorate([
     hooks_1.hooks([addStartAndEndTelemetry_1.addStartAndEndTelemetry(ACTION_NAME, commonConstant_1.TelemetryConstant.SCRIPT_COMPONENT)]),
     tslib_1.__metadata("design:type", Function),
@@ -59,7 +53,8 @@ ScriptDriver = tslib_1.__decorate([
 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) => {
+    const systemEncoding = await charsetUtils_1.getSystemEncoding();
+    return new Promise((resolve, reject) => {
         var _a, _b;
         const platform = os_1.default.platform();
         let workingDir = workingDirectory || ".";
@@ -67,13 +62,7 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
         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);
@@ -81,9 +70,14 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
         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}".`);
+        logProvider.verbose(`Start to run command: "${command}" with args: ${JSON.stringify({
+            shell: shell,
+            cwd: workingDir,
+            encoding: "buffer",
+            env: Object.assign(Object.assign({}, process.env), env),
+            timeout: timeout,
+        })}.`);
         const allOutputStrings = [];
-        const systemEncoding = await charsetUtils_1.getSystemEncoding();
         const stderrStrings = [];
         process.env.VSLANG = undefined; // Workaroud to disable VS environment variable to void charset encoding issue for non-English characters
         const cp = child_process_1.default.exec(run, {
@@ -92,7 +86,7 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
             encoding: "buffer",
             env: Object.assign(Object.assign({}, process.env), env),
             timeout: timeout,
-        }, async (error) => {
+        }, (error) => {
             if (error) {
                 error.message = stderrStrings.join("").trim() || error.message;
                 resolve(teamsfx_api_1.err(convertScriptErrorToFxError(error, run)));
@@ -101,29 +95,36 @@ async function executeCommand(command, projectPath, logProvider, ui, workingDire
                 // 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: ${JSON.stringify(outputObject)}`);
                 resolve(teamsfx_api_1.ok([outputString, outputObject]));
             }
         });
         const dataHandler = (data) => {
+            allOutputStrings.push(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);
-        });
+        const handler = getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler);
+        (_b = cp.stderr) === null || _b === void 0 ? void 0 : _b.on("data", handler);
     });
 }
 exports.executeCommand = executeCommand;
+function getStderrHandler(logProvider, systemEncoding, stderrStrings, dataHandler) {
+    return (data) => {
+        const str = bufferToString(data, systemEncoding);
+        logProvider.warning(` [script action stderr] ${maskSecretValues(str)}`);
+        dataHandler(str);
+        stderrStrings.push(str);
+    };
+}
+exports.getStderrHandler = getStderrHandler;
 function bufferToString(data, systemEncoding) {
     const str = systemEncoding === "utf8" || systemEncoding === "utf-8"
         ? data.toString()
@@ -133,10 +134,10 @@ function bufferToString(data, systemEncoding) {
 exports.bufferToString = bufferToString;
 function convertScriptErrorToFxError(error, run) {
     if (error.killed) {
-        return new script_1.ScriptTimeoutError(run);
+        return new script_1.ScriptTimeoutError(run, error);
     }
     else {
-        return new script_1.ScriptExecutionError(run, error.message);
+        return new script_1.ScriptExecutionError(run, error.message, error);
     }
 }
 exports.convertScriptErrorToFxError = convertScriptErrorToFxError;

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,qBAAqB,EACrB,iBAAiB,EAEjB,MAAM,EAGN,WAAW,EAIX,OAAO,EACR,MAAM,wBAAwB,CAAC;AAqBhC,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AASpE,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,CAuJ/C;AAED,wBAAsB,0BAA0B,CAC9C,GAAG,EAAE,OAAO,EACZ,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,CAkDtC"}
+{"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,EAGN,WAAW,EAIX,OAAO,EACR,MAAM,wBAAwB,CAAC;AAqBhC,OAAO,EAAE,UAAU,EAAE,MAAM,wCAAwC,CAAC;AASpE,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,CAuJ/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"}

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

@@ -75,7 +75,7 @@ async function updateManifestV3(ctx, inputs) {
     // 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);
+        const res = (await buildDriver.execute(createAppPackageArgs, driverContext)).result;
         if (res.isErr()) {
             return teamsfx_api_1.err(res.error);
         }
@@ -89,10 +89,10 @@ async function updateManifestV3(ctx, inputs) {
         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);
+            return (await buildDriver.execute(createAppPackageArgs, driverContext)).result;
         }
         else if ((res === null || res === void 0 ? void 0 : res.isOk()) && res.value === previewUpdate) {
-            await buildDriver.run(createAppPackageArgs, driverContext);
+            await buildDriver.execute(createAppPackageArgs, driverContext);
         }
         else {
             return teamsfx_api_1.err(new common_1.UserCancelError("appStudio"));
@@ -119,7 +119,7 @@ async function updateManifestV3(ctx, inputs) {
             }
         }
         const configureDriver = typedi_1.Container.get(configure_1.actionName);
-        const result = await configureDriver.run(updateTeamsAppArgs, driverContext);
+        const result = (await configureDriver.execute(updateTeamsAppArgs, driverContext)).result;
         if (result.isErr()) {
             return teamsfx_api_1.err(result.error);
         }
@@ -192,7 +192,10 @@ async function updateTeamsAppV3ForPublish(ctx, inputs) {
             }
         }
         catch (e) {
-            validationError = results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, errors_1.AppStudioError.ValidationFailedError.message([e.message]));
+            validationError = results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.ValidationFailedError.name, 
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
+            errors_1.AppStudioError.ValidationFailedError.message([e.message]));
+            // eslint-disable-next-line @typescript-eslint/no-unnecessary-type-assertion
             validationError.stack = e.stack;
         }
     }
@@ -209,7 +212,7 @@ async function updateTeamsAppV3ForPublish(ctx, inputs) {
         return teamsfx_api_1.err(validationError);
     }
     const configureDriver = typedi_1.Container.get(configure_1.actionName);
-    const result = await configureDriver.run(updateTeamsAppArgs, driverContext);
+    const result = (await configureDriver.execute(updateTeamsAppArgs, driverContext)).result;
     if (result.isErr()) {
         return teamsfx_api_1.err(result.error);
     }
@@ -229,7 +232,7 @@ async function getAppPackage(teamsAppId, m365TokenProvider, logProvider) {
         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) {
+        zipEntries === null || zipEntries === void 0 ? void 0 : zipEntries.forEach(function (zipEntry) {
             const data = zipEntry.getData();
             const name = zipEntry.entryName.toLowerCase();
             switch (name) {
@@ -250,7 +253,7 @@ async function getAppPackage(teamsAppId, m365TokenProvider, logProvider) {
                         set_1.default(appPackage, ["languages", base], data);
                     }
                     else {
-                        await (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(localizeUtils_1.getLocalizedString("plugins.appstudio.unprocessedFile", name));
                     }
             }
         });

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":";;;;AAAA,uCAAuC;AACvC,kCAAkC;AAClC,wDAgBgC;AAChC,8DAA6B;AAC7B,gEAA0B;AAC1B,mDAA6B;AAC7B,4DAAuB;AACvB,mDAA6B;AAC7B,0EAA0C;AAC1C,mCAAmC;AACnC,iDAAwD;AACxD,+DAA4D;AAC5D,qCAA0C;AAC1C,uCAAmD;AACnD,iEAAqF;AACrF,yDAAsD;AACtD,2CAAgE;AAMhE,iDAA8C;AAE9C,+BAAyC;AACzC,6DAA6B;AAC7B,yDAA8E;AAC9E,2CAAwE;AACxE,kDAA2E;AAC3E,iDAAmD;AACnD,gDAAkD;AAE3C,KAAK,UAAU,qCAAqC,CACzD,UAAkB,EAClB,aAAgC,EAChC,MAAmB;IAEnB,MAAM,iBAAiB,GAAG,MAAM,aAAa,CAAC,cAAc,CAAC;QAC3D,MAAM,EAAE,uBAAe;KACxB,CAAC,CAAC;IACH,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;QAC7B,OAAO,iBAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;KACrC;IAED,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC;IAE/C,IAAI;QACF,MAAM,iCAAe,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;KAClE;IAAC,OAAO,KAAU,EAAE;QACnB,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAClD,MAAM,MAAM,GAAG,MAAM,iCAAe,CAAC,mBAAmB,CAAC,UAAU,EAAE,cAAc,EAAE,MAAM,CAAC,CAAC;YAE7F,OAAO,gBAAE,CAAC,MAAM,CAAC,CAAC;SACnB;KACF;IAED,OAAO,gBAAE,CAAC,KAAK,CAAC,CAAC;AACnB,CAAC;AAzBD,sFAyBC;AAEM,KAAK,UAAU,gBAAgB,CACpC,GAAY,EACZ,MAA6B;;IAE7B,0BAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACzB,MAAM,KAAK,GAAG;QACZ,QAAQ,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW;KAClC,CAAC;IACF,MAAM,oBAAoB,GACxB,MAAA,MAAM,CAAC,oBAAoB,mCAAI,6BAAa,CAAC,uBAAuB,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;IAC3F,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAChC,MAAM,CAAC,WAAW,EAClB,kCAAoB,EACpB,6BAAe,EACf,YAAY,KAAK,CAAC,QAAQ,OAAO,CAClC,CAAC;IAEF,qBAAqB;IACrB,MAAM,WAAW,GAA2B,kBAAS,CAAC,GAAG,CAAC,6BAA0B,CAAC,CAAC;IACtF,MAAM,oBAAoB,GAAG,4BAA4B,CACvD,MAAM,CAAC,WAAW,EAClB,oBAAoB,EACpB,KAAK,CAAC,QAAS,CAChB,CAAC;IACF,MAAM,kBAAkB,GAA0B;QAChD,cAAc,EAAE,oBAAoB,CAAC,aAAa;KACnD,CAAC;IACF,MAAM,aAAa,GAAkB,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IACxE,MAAM,iBAAO,CAAC,OAAO,CAAC,MAAM,CAAC,WAAW,EAAE,KAAK,CAAC,QAAS,CAAC,CAAC;IAE3D,kBAAkB;IAClB,IAAI,QAAa,CAAC;IAClB,MAAM,cAAc,GAAG,MAAM,6BAAa,CAAC,aAAa,CAAC,oBAAoB,CAAC,CAAC;IAC/E,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;QAC1B,OAAO,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;KAClC;SAAM;QACL,QAAQ,GAAG,cAAc,CAAC,KAAK,CAAC;KACjC;IAED,2BAA2B;IAC3B,IACE,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,gBAAgB,CAAC,CAAC;QACxC,CAAC,CAAC,MAAM,kBAAE,CAAC,UAAU,CAAC,oBAAoB,CAAC,aAAa,CAAC,CAAC,EAC1D;QACA,MAAM,GAAG,GAAG,MAAM,WAAW,CAAC,GAAG,CAAC,oBAAoB,EAAE,aAAa,CAAC,CAAC;QACvE,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,OAAO,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACvB;KACF;IACD,MAAM,gBAAgB,GAAG,MAAM,kBAAE,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC;IAC7D,MAAM,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC;IAC/B,OAAO,QAAQ,CAAC,EAAE,CAAC;IACnB,OAAO,gBAAgB,CAAC,EAAE,CAAC;IAC3B,IAAI,CAAC,gBAAC,CAAC,OAAO,CAAC,QAAQ,EAAE,gBAAgB,CAAC,EAAE;QAC1C,MAAM,WAAW,GAAG,kCAAkB,CAAC,+BAA+B,CAAC,CAAC;QACxE,MAAM,aAAa,GAAG,kCAAkB,CAAC,oCAAoC,CAAC,CAAC;QAC/E,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,WAAW,CAC/C,MAAM,EACN,kCAAkB,CAAC,qCAAqC,CAAC,EACzD,IAAI,EACJ,aAAa,EACb,WAAW,CACZ,CAAC;QAEF,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAE,KAAI,GAAG,CAAC,KAAK,KAAK,WAAW,EAAE;YAC5C,OAAO,MAAM,WAAW,CAAC,GAAG,CAAC,oBAAoB,EAAE,aAAa,CAAC,CAAC;SACnE;aAAM,IAAI,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAE,KAAI,GAAG,CAAC,KAAK,KAAK,aAAa,EAAE;YACrD,MAAM,WAAW,CAAC,GAAG,CAAC,oBAAoB,EAAE,aAAa,CAAC,CAAC;SAC5D;aAAM;YACL,OAAO,iBAAG,CAAC,IAAI,wBAAe,CAAC,WAAW,CAAC,CAAC,CAAC;SAC9C;KACF;IAED,MAAM,iBAAiB,GAAG,MAAM,GAAG,CAAC,aAAc,CAAC,iBAAiB,CAAC,cAAc,CAAC;QAClF,MAAM,EAAE,uBAAe;KACxB,CAAC,CAAC;IACH,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;QAC7B,OAAO,iBAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;KACrC;IACD,MAAM,cAAc,GAAG,iBAAiB,CAAC,KAAK,CAAC;IAE/C,IAAI;QACF,MAAM,eAAe,GAAG,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC;QAC1D,IAAI,eAAe,EAAE;YACnB,MAAM,GAAG,GAAG,MAAM,iCAAe,CAAC,MAAM,CAAC,UAAU,EAAE,cAAc,EAAE,GAAG,CAAC,WAAW,CAAC,CAAC;YACtF,MAAM,mBAAmB,GAAG,MAAA,MAAA,IAAI,IAAI,CAAC,GAAG,CAAC,SAAU,CAAC,0CAAE,OAAO,EAAE,mCAAI,CAAC,CAAC,CAAC;YACtE,IAAI,IAAI,IAAI,CAAC,eAAe,CAAC,CAAC,OAAO,EAAE,GAAG,mBAAmB,EAAE;gBAC7D,MAAM,MAAM,GAAG,kCAAkB,CAAC,sCAAsC,CAAC,CAAC;gBAC1E,MAAM,GAAG,GAAG,MAAM,GAAG,CAAC,eAAe,CAAC,WAAW,CAC/C,MAAM,EACN,kCAAkB,CAAC,sCAAsC,CAAC,EAC1D,IAAI,EACJ,MAAM,CACP,CAAC;gBACF,IAAI,CAAC,CAAC,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAE,KAAI,GAAG,CAAC,KAAK,KAAK,MAAM,CAAC,EAAE;oBAC1C,OAAO,iBAAG,CAAC,IAAI,wBAAe,CAAC,WAAW,CAAC,CAAC,CAAC;iBAC9C;aACF;SACF;QAED,MAAM,eAAe,GAA4B,kBAAS,CAAC,GAAG,CAAC,sBAA2B,CAAC,CAAC;QAC5F,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;QAC5E,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SAC1B;QAED,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,MAAM,UAAU,GAAG,MAAM,GAAG,CAAC,aAAc,CAAC,iBAAiB,CAAC,aAAa,CAAC;YAC1E,MAAM,EAAE,uBAAe;SACxB,CAAC,CAAC;QACH,IAAI,UAAU,CAAC,IAAI,EAAE,EAAE;YACrB,SAAS,GAAG,UAAU,CAAC,KAAK,CAAC,WAAqB,CAAC;SACpD;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,qBAAS,CAAC,gCAAgC,EAAE,UAAU,EAAE,SAAS,CAAC,CAAC;QAC3F,IAAI,MAAM,CAAC,QAAQ,KAAK,sBAAQ,CAAC,GAAG,EAAE;YACpC,MAAM,OAAO,GAAG;gBACd;oBACE,OAAO,EAAE,kCAAkB,CAAC,4CAA4C,CAAC;oBACzE,KAAK,EAAE,oBAAM,CAAC,YAAY;iBAC3B;gBACD,EAAE,OAAO,EAAE,GAAG,EAAE,KAAK,EAAE,oBAAM,CAAC,WAAW,EAAE;aAC5C,CAAC;YACF,MAAM,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,OAAO,EAAE,KAAK,CAAC,CAAC;SAC/D;aAAM;YACL,KAAK,GAAG,CAAC,eAAe;iBACrB,WAAW,CACV,MAAM,EACN,kCAAkB,CAAC,yCAAyC,CAAC,EAC7D,KAAK,EACL,kCAAkB,CAAC,uCAAuC,CAAC,CAC5D;iBACA,IAAI,CAAC,KAAK,EAAE,GAAG,EAAE,EAAE;gBAClB,IACE,CAAA,GAAG,aAAH,GAAG,uBAAH,GAAG,CAAE,IAAI,EAAE;oBACX,GAAG,CAAC,KAAK,KAAK,kCAAkB,CAAC,uCAAuC,CAAC,EACzE;oBACA,MAAM,GAAG,CAAC,eAAe,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;iBACxC;YACH,CAAC,CAAC,CAAC;SACN;QACD,OAAO,MAAM,CAAC;KACf;IAAC,OAAO,KAAU,EAAE;QACnB,IAAI,KAAK,CAAC,OAAO,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE;YAClD,OAAO,iBAAG,CACR,gCAAsB,CAAC,SAAS,CAC9B,uBAAc,CAAC,iCAAiC,CAAC,IAAI,EACrD,uBAAc,CAAC,iCAAiC,CAAC,OAAO,CAAC,UAAU,CAAC,CACrE,CACF,CAAC;SACH;aAAM;YACL,OAAO,iBAAG,CAAC,KAAK,CAAC,CAAC;SACnB;KACF;AACH,CAAC;AA1JD,4CA0JC;AAEM,KAAK,UAAU,0BAA0B,CAC9C,GAAY,EACZ,MAA6B;;IAE7B,IAAI,UAAU,CAAC;IACf,MAAM,aAAa,GAAkB,qBAAqB,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;IAExE,MAAM,kBAAkB,GAA0B;QAChD,cAAc,EAAE,MAAM,CAAC,wBAAa,CAAC,cAAc,CAAC;KACrD,CAAC;IAEF,MAAM,UAAU,GAAG,IAAI,iBAAM,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAC,UAAU,EAAE,CAAC;IAC9E,MAAM,YAAY,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,SAAS,KAAK,qBAAS,CAAC,aAAa,CAAC,CAAC;IACrF,IAAI,eAAsC,CAAC;IAC3C,IAAI,YAAY,EAAE;QAChB,IAAI;YACF,MAAM,cAAc,GAAG,YAAY,CAAC,OAAO,EAAE,CAAC,QAAQ,EAAE,CAAC;YACzD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,cAAc,CAAqB,CAAC;YAChE,IAAI,CAAC,QAAQ,CAAC,EAAE,IAAI,CAAC,gBAAM,CAAC,QAAQ,CAAC,EAAE,CAAC,EAAE;gBACxC,eAAe,GAAG,gCAAsB,CAAC,SAAS,CAChD,uBAAc,CAAC,qBAAqB,CAAC,IAAI,EACzC,uBAAc,CAAC,qBAAqB,CAAC,OAAO,CAAC;oBAC3C,kCAAkB,CAAC,8BAA8B,CAAC;iBACnD,CAAC,CACH,CAAC;aACH;iBAAM;gBACL,UAAU,GAAG,QAAQ,CAAC,EAAE,CAAC;gBACzB,MAAM,gBAAgB,GAAG,MAAM,0BAAY,CAAC,gBAAgB,CAAC,QAAQ,CAAC,CAAC;gBACvE,IAAI,gBAAgB,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC/B,MAAM,UAAU,GAAG,uBAAc,CAAC,qBAAqB,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC;oBAClF,eAAe,GAAG,gCAAsB,CAAC,SAAS,CAChD,uBAAc,CAAC,qBAAqB,CAAC,IAAI,EACzC,UAAU,CACX,CAAC;iBACH;aACF;SACF;QAAC,OAAO,CAAC,EAAE;YACV,eAAe,GAAG,gCAAsB,CAAC,SAAS,CAChD,uBAAc,CAAC,qBAAqB,CAAC,IAAI,EACzC,uBAAc,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAE,CAAS,CAAC,OAAO,CAAC,CAAC,CACnE,CAAC;YACF,eAAe,CAAC,KAAK,GAAI,CAAS,CAAC,KAAK,CAAC;SAC1C;KACF;SAAM;QACL,wBAAwB;QACxB,eAAe,GAAG,IAAI,0BAAiB,CAAC,aAAa,EAAE,eAAe,CAAC,CAAC;KACzE;IAED,IAAI,eAAe,EAAE;QACnB,MAAM,wBAAwB,GAAG,gCAAgB,CAC/C,gEAAgE,CACjE,CAAC;QACF,MAAM,iBAAiB,GAAG,kCAAkB,CAC1C,gEAAgE,CACjE,CAAC;QACF,eAAe,CAAC,OAAO,IAAI,IAAI,wBAAwB,EAAE,CAAC;QAC1D,eAAe,CAAC,cAAc,IAAI,IAAI,iBAAiB,EAAE,CAAC;QAC1D,MAAA,GAAG,CAAC,WAAW,0CAAE,KAAK,CAAC,kCAAkB,CAAC,0CAA0C,CAAC,CAAC,CAAC;QACvF,OAAO,iBAAG,CAAC,eAAe,CAAC,CAAC;KAC7B;IAED,MAAM,eAAe,GAA4B,kBAAS,CAAC,GAAG,CAAC,sBAA2B,CAAC,CAAC;IAC5F,MAAM,MAAM,GAAG,MAAM,eAAe,CAAC,GAAG,CAAC,kBAAkB,EAAE,aAAa,CAAC,CAAC;IAC5E,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;QAClB,OAAO,iBAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;KAC1B;IAED,OAAO,gBAAE,CAAC,UAAU,CAAC,CAAC;AACxB,CAAC;AApED,gEAoEC;AAEM,KAAK,UAAU,aAAa,CACjC,UAAkB,EAClB,iBAAoC,EACpC,WAAyB;IAEzB,MAAM,iBAAiB,GAAG,MAAM,iBAAiB,CAAC,cAAc,CAAC;QAC/D,MAAM,EAAE,uBAAe;KACxB,CAAC,CAAC;IACH,IAAI,iBAAiB,CAAC,KAAK,EAAE,EAAE;QAC7B,OAAO,iBAAG,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC;KACrC;IACD,IAAI;QACF,MAAM,IAAI,GAAG,MAAM,iCAAe,CAAC,aAAa,CAC9C,UAAU,EACV,iBAAiB,CAAC,KAAK,EACvB,WAAW,CACZ,CAAC;QAEF,MAAM,UAAU,GAAe,EAAE,CAAC;QAElC,MAAM,MAAM,GAAG,MAAM,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;QAC3C,MAAM,GAAG,GAAG,IAAI,iBAAM,CAAC,MAAM,CAAC,CAAC;QAC/B,MAAM,UAAU,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,CAAC,+BAA+B;QAEpE,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,OAAO,CAAC,KAAK,WAAW,QAAQ;YAC1C,MAAM,IAAI,GAAG,QAAQ,CAAC,OAAO,EAAE,CAAC;YAChC,MAAM,IAAI,GAAG,QAAQ,CAAC,SAAS,CAAC,WAAW,EAAE,CAAC;YAC9C,QAAQ,IAAI,EAAE;gBACZ,KAAK,eAAe;oBAClB,UAAU,CAAC,QAAQ,GAAG,IAAI,CAAC;oBAC3B,MAAM;gBACR,KAAK,WAAW;oBACd,UAAU,CAAC,KAAK,mCAAQ,UAAU,CAAC,KAAK,KAAE,KAAK,EAAE,IAAI,GAAE,CAAC;oBACxD,MAAM;gBACR,KAAK,aAAa;oBAChB,UAAU,CAAC,KAAK,mCAAQ,UAAU,CAAC,KAAK,KAAE,OAAO,EAAE,IAAI,GAAE,CAAC;oBAC1D,MAAM;gBACR;oBACE,MAAM,GAAG,GAAG,cAAO,CAAC,IAAI,CAAC,CAAC;oBAC1B,MAAM,IAAI,GAAG,eAAQ,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;oBACjC,0FAA0F;oBAC1F,IAAI,kCAAsB,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,KAAK,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE;wBAClE,aAAG,CAAC,UAAU,EAAE,CAAC,WAAW,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC;qBAC5C;yBAAM;wBACL,MAAM,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,CACxB,kCAAkB,CAAC,mCAAmC,EAAE,IAAI,CAAC,CAC9D,CAAA,CAAC;qBACH;aACJ;QACH,CAAC,CAAC,CAAC;QACH,OAAO,gBAAE,CAAC,UAAU,CAAC,CAAC;KACvB;IAAC,OAAO,CAAM,EAAE;QACf,OAAO,iBAAG,CAAC,CAAC,CAAC,CAAC;KACf;AACH,CAAC;AAtDD,sCAsDC;AAED,SAAS,qBAAqB,CAAC,GAAY,EAAE,MAA6B;IACxE,OAAO;QACL,oBAAoB,EAAE,GAAG,CAAC,aAAc,CAAC,oBAAoB;QAC7D,iBAAiB,EAAE,GAAG,CAAC,aAAc,CAAC,iBAAiB;QACvD,EAAE,EAAE,GAAG,CAAC,eAAe;QACvB,WAAW,EAAE,SAAS;QACtB,WAAW,EAAE,GAAG,CAAC,WAAW;QAC5B,iBAAiB,EAAE,GAAG,CAAC,iBAAiB;QACxC,WAAW,EAAE,GAAG,CAAC,WAAY;QAC7B,QAAQ,EAAE,MAAM,CAAC,QAAQ;KAC1B,CAAC;AACJ,CAAC;AAED,SAAS,4BAA4B,CACnC,WAAmB,EACnB,oBAA4B,EAC5B,OAAe;IAEf,MAAM,gBAAgB,GAAG,IAAI,CAAC,IAAI,CAChC,WAAW,EACX,kCAAoB,EACpB,6BAAe,EACf,YAAY,OAAO,OAAO,CAC3B,CAAC;IAEF,OAAO;QACL,YAAY,EAAE,oBAAoB;QAClC,aAAa,EAAE,IAAI,CAAC,IAAI,CACtB,WAAW,EACX,kCAAoB,EACpB,6BAAe,EACf,cAAc,OAAO,MAAM,CAC5B;QACD,cAAc,EAAE,gBAAgB;KACjC,CAAC;AACJ,CAAC"}
+{"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

@@ -27,8 +27,8 @@ export declare namespace AppStudioClient {
      * @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>;
+    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
@@ -53,10 +53,16 @@ export declare namespace AppStudioClient {
      * @returns
      */
     function publishTeamsAppUpdate(teamsAppId: string, file: Buffer, appStudioToken: string): Promise<string>;
+    /**
+     * Get Stagged Teams app from tenant app catalog
+     * @param teamsAppId manifest.id, which is externalId in app catalog.
+     * @param appStudioToken
+     * @returns
+     */
     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 getUserList(teamsAppId: string, appStudioToken: string, logProvider: LogProvider): Promise<AppUser[] | undefined>;
+    function checkPermission(teamsAppId: string, appStudioToken: string, userObjectId: string, logProvider: LogProvider): Promise<string>;
+    function grantPermission(teamsAppId: string, appStudioToken: string, newUser: AppUser, logProvider: LogProvider): 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>;

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

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

package/build/component/driver/teamsApp/clients/appStudioClient.js

@@ -4,6 +4,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AppStudioClient = void 0;
 const tslib_1 = require("tslib");
+// eslint-disable-next-line no-secrets/no-secrets
 /**
  * @author yuqizhou77 <86260893+yuqizhou77@users.noreply.github.com>
  */
@@ -21,6 +22,8 @@ const telemetry_2 = require("../../../../common/telemetry");
 const tools_1 = require("../../../../common/tools");
 const commonConstant_1 = require("../../../constant/commonConstant");
 const ManifestUtils_1 = require("../utils/ManifestUtils");
+const globalVars_1 = require("../../../../core/globalVars");
+const teamsApp_1 = require("../../../../error/teamsApp");
 // eslint-disable-next-line @typescript-eslint/no-namespace
 var AppStudioClient;
 (function (AppStudioClient) {
@@ -60,12 +63,14 @@ var AppStudioClient;
     }
     AppStudioClient.sendSuccessEvent = sendSuccessEvent;
     function wrapException(e, apiName, telemetryProperties) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const correlationId = (_a = e.response) === null || _a === void 0 ? void 0 : _a.headers[constants_1.Constants.CORRELATION_ID];
-        const requestPath = ((_b = e.request) === null || _b === void 0 ? void 0 : _b.path) ? `${e.request.method} ${e.request.path}` : "";
-        const extraData = ((_c = e.response) === null || _c === void 0 ? void 0 : _c.data) ? `data: ${JSON.stringify(e.response.data)}` : "";
-        const error = results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.DeveloperPortalAPIFailedError.name, errors_1.AppStudioError.DeveloperPortalAPIFailedError.message(e, correlationId, requestPath, apiName, extraData), e);
-        telemetry_1.TelemetryUtils.sendErrorEvent(telemetry_1.TelemetryEventName.appStudioApi, error, Object.assign({ method: (_d = e.request) === null || _d === void 0 ? void 0 : _d.method, "status-code": `${(_e = e === null || e === void 0 ? void 0 : e.response) === null || _e === void 0 ? void 0 : _e.status}`, url: `<${apiName}-url>` }, telemetryProperties));
+        // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+        const extraData = ((_b = e.response) === null || _b === void 0 ? void 0 : _b.data) ? `data: ${JSON.stringify(e.response.data)}` : "";
+        const error = new teamsApp_1.DeveloperPortalAPIFailedError(e, correlationId, apiName, extraData);
+        telemetry_1.TelemetryUtils.sendErrorEvent(telemetry_1.TelemetryEventName.appStudioApi, error, Object.assign({ method: (_c = e.request) === null || _c === void 0 ? void 0 : _c.method, 
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+            "status-code": `${(_d = e === null || e === void 0 ? void 0 : e.response) === null || _d === void 0 ? void 0 : _d.status}`, url: `<${apiName}-url>` }, telemetryProperties));
         return error;
     }
     AppStudioClient.wrapException = wrapException;
@@ -79,6 +84,7 @@ var AppStudioClient;
      */
     async function importApp(file, appStudioToken, logProvider, overwrite = false) {
         var _a, _b, _c, _d, _e;
+        globalVars_1.setErrorContext({ source: "Teams" });
         const telemetryProperties = {
             [telemetry_1.TelemetryPropertyKey.OverwriteIfAppAlreadyExists]: String(overwrite),
             // To avoid url be redacted in telemetry, get region from full base url
@@ -88,6 +94,7 @@ var AppStudioClient;
         sendStartEvent(constants_1.APP_STUDIO_API_NAMES.CREATE_APP, telemetryProperties);
         try {
             const requester = createRequesterWithToken(appStudioToken, region);
+            logProvider.debug(`Sent API Request: ${region !== null && region !== void 0 ? region : baseUrl}/api/appdefinitions/v2/import`);
             const response = await utils_1.RetryHandler.Retry(() => requester.post(`/api/appdefinitions/v2/import`, file, {
                 headers: { "Content-Type": "application/zip" },
                 params: {
@@ -96,7 +103,7 @@ var AppStudioClient;
             }));
             if (response && response.data) {
                 const app = response.data;
-                await (logProvider === null || logProvider === void 0 ? void 0 : logProvider.debug(`Received data from app studio ${JSON.stringify(app)}`));
+                logProvider.debug(`Received data from Teams Developer Portal: ${JSON.stringify(app)}`);
                 sendSuccessEvent(constants_1.APP_STUDIO_API_NAMES.CREATE_APP, telemetryProperties);
                 return app;
             }
@@ -136,6 +143,7 @@ var AppStudioClient;
     AppStudioClient.importApp = importApp;
     async function getApp(teamsAppId, appStudioToken, logProvider) {
         var _a;
+        globalVars_1.setErrorContext({ source: "Teams" });
         sendStartEvent(constants_1.APP_STUDIO_API_NAMES.GET_APP);
         let requester;
         try {
@@ -143,11 +151,13 @@ var AppStudioClient;
             if (region) {
                 requester = createRequesterWithToken(appStudioToken, region);
                 try {
+                    logProvider.debug(`Sent API Request: ${region}/api/appdefinitions/v2/import`);
                     response = await utils_1.RetryHandler.Retry(() => requester.get(`/api/appdefinitions/${teamsAppId}`));
                 }
                 catch (e) {
                     // Teams apps created by non-regional API cannot be found by regional API
                     if (((_a = e.response) === null || _a === void 0 ? void 0 : _a.status) == 404) {
+                        logProvider.debug(`Sent API Request: ${baseUrl}/api/appdefinitions/v2/import`);
                         requester = createRequesterWithToken(appStudioToken);
                         response = await utils_1.RetryHandler.Retry(() => requester.get(`/api/appdefinitions/${teamsAppId}`));
                     }
@@ -157,6 +167,7 @@ var AppStudioClient;
                 }
             }
             else {
+                logProvider.debug(`Sent API Request: ${baseUrl}/api/appdefinitions/v2/import`);
                 requester = createRequesterWithToken(appStudioToken);
                 response = await utils_1.RetryHandler.Retry(() => requester.get(`/api/appdefinitions/${teamsAppId}`));
             }
@@ -167,7 +178,8 @@ var AppStudioClient;
                     return app;
                 }
                 else {
-                    await (logProvider === null || logProvider === void 0 ? void 0 : logProvider.error(`teamsAppId mismatch. Input: ${teamsAppId}. Got: ${app.teamsAppId}`));
+                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                    logProvider === null || logProvider === void 0 ? void 0 : logProvider.error(`teamsAppId mismatch. Input: ${teamsAppId}. Got: ${app.teamsAppId}`);
                 }
             }
         }
@@ -186,6 +198,7 @@ var AppStudioClient;
      * @returns
      */
     async function checkExistsInTenant(teamsAppId, appStudioToken, logProvider) {
+        globalVars_1.setErrorContext({ source: "Teams" });
         sendStartEvent(constants_1.APP_STUDIO_API_NAMES.EXISTS_IN_TENANTS);
         const requester = createRequesterWithToken(appStudioToken, region);
         try {
@@ -212,6 +225,7 @@ var AppStudioClient;
      * @returns
      */
     async function publishTeamsApp(teamsAppId, file, appStudioToken) {
+        var _a;
         sendStartEvent(constants_1.APP_STUDIO_API_NAMES.PUBLISH_APP);
         try {
             const requester = createRequesterWithToken(appStudioToken, region);
@@ -228,6 +242,20 @@ var AppStudioClient;
                             return appDefinition.teamsAppId;
                         }
                     }
+                    // Corner case
+                    // Fail if an app with the same external.id exists in the staged app entitlements
+                    // App with same id already exists in the staged apps, Invoke UpdateAPI instead.
+                    if (response.data.error.code == "Conflict" &&
+                        ((_a = response.data.error.innerError) === null || _a === void 0 ? void 0 : _a.code) == "AppDefinitionAlreadyExists") {
+                        try {
+                            return await publishTeamsAppUpdate(teamsAppId, file, appStudioToken);
+                        }
+                        catch (e) {
+                            // Update Published app failed as well
+                            const error = results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.TeamsAppPublishConflictError.name, errors_1.AppStudioError.TeamsAppPublishConflictError.message(teamsAppId), e);
+                            throw error;
+                        }
+                    }
                     const error = new Error(response === null || response === void 0 ? void 0 : response.data.error.message);
                     error.response = response;
                     error.request = response.request;
@@ -263,6 +291,7 @@ var AppStudioClient;
      */
     async function publishTeamsAppUpdate(teamsAppId, file, appStudioToken) {
         var _a, _b, _c;
+        globalVars_1.setErrorContext({ source: "Teams" });
         sendStartEvent(constants_1.APP_STUDIO_API_NAMES.UPDATE_PUBLISHED_APP);
         try {
             // Get App Definition from Teams App Catalog
@@ -276,6 +305,7 @@ var AppStudioClient;
             else {
                 throw results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.TeamsAppPublishFailedError.name, errors_1.AppStudioError.TeamsAppPublishFailedError.message(teamsAppId, `GET /api/publishing/${teamsAppId}`));
             }
+            // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
             const requestPath = `${(_a = response.request) === null || _a === void 0 ? void 0 : _a.method} ${(_b = response.request) === null || _b === void 0 ? void 0 : _b.path}`;
             if (response && response.data) {
                 if (response.data.error || response.data.errorMessage) {
@@ -305,11 +335,18 @@ var AppStudioClient;
         }
     }
     AppStudioClient.publishTeamsAppUpdate = publishTeamsAppUpdate;
+    /**
+     * Get Stagged Teams app from tenant app catalog
+     * @param teamsAppId manifest.id, which is externalId in app catalog.
+     * @param appStudioToken
+     * @returns
+     */
     async function getAppByTeamsAppId(teamsAppId, appStudioToken) {
+        globalVars_1.setErrorContext({ source: "Teams" });
         sendStartEvent(constants_1.APP_STUDIO_API_NAMES.GET_PUBLISHED_APP);
         const requester = createRequesterWithToken(appStudioToken, region);
         try {
-            const response = await requester.get(`/api/publishing/${teamsAppId}`);
+            const response = await utils_1.RetryHandler.Retry(() => requester.get(`/api/publishing/${teamsAppId}`));
             if (response && response.data && response.data.value && response.data.value.length > 0) {
                 const appdefinitions = response.data.value[0].appDefinitions.map((item) => {
                     return {
@@ -334,10 +371,10 @@ var AppStudioClient;
         }
     }
     AppStudioClient.getAppByTeamsAppId = getAppByTeamsAppId;
-    async function getUserList(teamsAppId, appStudioToken) {
+    async function getUserList(teamsAppId, appStudioToken, logProvider) {
         let app;
         try {
-            app = await getApp(teamsAppId, appStudioToken);
+            app = await getApp(teamsAppId, appStudioToken, logProvider);
         }
         catch (error) {
             throw error;
@@ -345,10 +382,10 @@ var AppStudioClient;
         return app.userList;
     }
     AppStudioClient.getUserList = getUserList;
-    async function checkPermission(teamsAppId, appStudioToken, userObjectId) {
+    async function checkPermission(teamsAppId, appStudioToken, userObjectId, logProvider) {
         let userList;
         try {
-            userList = await getUserList(teamsAppId, appStudioToken);
+            userList = await getUserList(teamsAppId, appStudioToken, logProvider);
         }
         catch (error) {
             return constants_1.Constants.PERMISSIONS.noPermission;
@@ -365,12 +402,12 @@ var AppStudioClient;
         }
     }
     AppStudioClient.checkPermission = checkPermission;
-    async function grantPermission(teamsAppId, appStudioToken, newUser) {
+    async function grantPermission(teamsAppId, appStudioToken, newUser, logProvider) {
         var _a, _b, _c, _d;
         sendStartEvent(constants_1.APP_STUDIO_API_NAMES.UPDATE_OWNER);
         let app;
         try {
-            app = await getApp(teamsAppId, appStudioToken);
+            app = await getApp(teamsAppId, appStudioToken, logProvider);
         }
         catch (error) {
             throw error;
@@ -388,8 +425,10 @@ var AppStudioClient;
             let response;
             if (region) {
                 try {
+                    logProvider.debug(localizeUtils_1.getLocalizedString("core.common.SendingApiRequest", `${baseUrl}/api/appdefinitions/{teamsAppId}/owner`, JSON.stringify(app)));
                     requester = createRequesterWithToken(appStudioToken, region);
                     response = await requester.post(`/api/appdefinitions/${teamsAppId}/owner`, app);
+                    logProvider.debug(localizeUtils_1.getLocalizedString("core.common.ReceiveApiResponse", JSON.stringify(response.data)));
                 }
                 catch (e) {
                     // Teams apps created by non-regional API cannot be found by regional API
@@ -403,8 +442,10 @@ var AppStudioClient;
                 }
             }
             else {
+                logProvider.debug(localizeUtils_1.getLocalizedString("core.common.SendingApiRequest", `${baseUrl}/api/appdefinitions/{teamsAppId}/owner`, JSON.stringify(app)));
                 requester = createRequesterWithToken(appStudioToken);
                 response = await requester.post(`/api/appdefinitions/${teamsAppId}/owner`, app);
+                logProvider.debug(localizeUtils_1.getLocalizedString("core.common.ReceiveApiResponse", JSON.stringify(response.data)));
             }
             if (!response || !response.data || !checkUser(response.data, newUser)) {
                 throw new Error(constants_1.ErrorMessages.GrantPermissionFailed);
@@ -424,6 +465,7 @@ var AppStudioClient;
     }
     AppStudioClient.grantPermission = grantPermission;
     async function getAppPackage(teamsAppId, appStudioToken, logProvider) {
+        globalVars_1.setErrorContext({ source: "Teams" });
         sendStartEvent(constants_1.APP_STUDIO_API_NAMES.GET_APP_PACKAGE);
         logProvider === null || logProvider === void 0 ? void 0 : logProvider.info("Downloading app package for app " + teamsAppId);
         const requester = createRequesterWithToken(appStudioToken, region);
@@ -494,11 +536,13 @@ var AppStudioClient;
                 }
                 if (result !== undefined) {
                     telemetry_2.sendTelemetryEvent(telemetry_2.Component.core, telemetry_2.TelemetryEvent.CheckSideloading, {
-                        [telemetry_2.TelemetryProperty.IsSideloadingAllowed]: result + "",
+                        [telemetry_2.TelemetryProperty.IsSideloadingAllowed]: result.toString() + "",
                     });
                 }
                 else {
-                    telemetry_2.sendTelemetryErrorEvent(telemetry_2.Component.core, telemetry_2.TelemetryEvent.CheckSideloading, new teamsfx_api_1.SystemError("M365Account", "UnknownValue", `AppStudio response code: ${response.status}, body: ${response.data}`), {
+                    telemetry_2.sendTelemetryErrorEvent(telemetry_2.Component.core, telemetry_2.TelemetryEvent.CheckSideloading, new teamsfx_api_1.SystemError("M365Account", "UnknownValue", 
+                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
+                    `AppStudio response code: ${response.status}, body: ${response.data}`), {
                         [telemetry_2.TelemetryProperty.CheckSideloadingStatusCode]: `${response.status}`,
                         [telemetry_2.TelemetryProperty.CheckSideloadingMethod]: "get",
                         [telemetry_2.TelemetryProperty.CheckSideloadingUrl]: apiName,
@@ -507,11 +551,8 @@ var AppStudioClient;
                 return result;
             }
             catch (error) {
-                telemetry_2.sendTelemetryErrorEvent(telemetry_2.Component.core, telemetry_2.TelemetryEvent.CheckSideloading, new teamsfx_api_1.SystemError({
-                    error,
-                    source: "M365Account",
-                    message: errors_1.AppStudioError.DeveloperPortalAPIFailedError.message(error, (_e = (_d = (_c = error.response) === null || _c === void 0 ? void 0 : _c.headers) === null || _d === void 0 ? void 0 : _d[constants_1.Constants.CORRELATION_ID]) !== null && _e !== void 0 ? _e : "", apiPath, apiName, ((_f = error.response) === null || _f === void 0 ? void 0 : _f.data) ? `data: ${JSON.stringify(error.response.data)}` : "")[0],
-                }), {
+                telemetry_2.sendTelemetryErrorEvent(telemetry_2.Component.core, telemetry_2.TelemetryEvent.CheckSideloading, new teamsApp_1.CheckSideloadingPermissionFailedError(error, (_e = (_d = (_c = error.response) === null || _c === void 0 ? void 0 : _c.headers) === null || _d === void 0 ? void 0 : _d[constants_1.Constants.CORRELATION_ID]) !== null && _e !== void 0 ? _e : "", apiName, ((_f = error.response) === null || _f === void 0 ? void 0 : _f.data) ? `data: ${JSON.stringify(error.response.data)}` : ""), {
+                    // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
                     [telemetry_2.TelemetryProperty.CheckSideloadingStatusCode]: `${(_g = error === null || error === void 0 ? void 0 : error.response) === null || _g === void 0 ? void 0 : _g.status}`,
                     [telemetry_2.TelemetryProperty.CheckSideloadingMethod]: "get",
                     [telemetry_2.TelemetryProperty.CheckSideloadingUrl]: apiName,