@microsoft/teamsfx-core 3.0.11 → 3.0.12-alpha.3253478ae.0

package/build/component/m365/launchHelper.js

@@ -13,18 +13,18 @@ const common_1 = require("../../error/common");
 const constants_2 = require("../../question/constants");
 const errors_1 = require("./errors");
 const packageService_1 = require("./packageService");
-const constants_3 = require("../../common/constants");
-const constants_4 = require("./constants");
+const constants_3 = require("./constants");
 class LaunchHelper {
+    m365TokenProvider;
+    logger;
     constructor(m365TokenProvider, logger) {
         this.m365TokenProvider = m365TokenProvider;
         this.logger = logger;
     }
     async getLaunchUrl(hub, teamsAppId, properties, withLoginHint = true) {
-        var _a;
         const capabilities = properties.capabilities;
         const loginHint = withLoginHint
-            ? (_a = (await this.getUpnFromToken())) !== null && _a !== void 0 ? _a : "login_your_m365_account" // a workaround that user has the chance to login
+            ? (await this.getUpnFromToken()) ?? "login_your_m365_account" // a workaround that user has the chance to login
             : undefined;
         let url;
         const copilotCapabilities = ["plugin", "copilotGpt"];
@@ -59,10 +59,10 @@ class LaunchHelper {
                     return (0, teamsfx_api_1.err)(result.error);
                 }
                 const baseUrl = hasCopilotExtensionOnly
-                    ? `${constants_4.outlookBaseUrl}/host/${constants_4.outlookCopilotAppId}`
+                    ? `${constants_3.outlookBaseUrl}/host/${constants_3.outlookCopilotAppId}`
                     : capabilities.includes("staticTab")
-                        ? `${constants_4.outlookBaseUrl}/host/${result.value}`
-                        : `${constants_4.outlookBaseUrl}/mail`;
+                        ? `${constants_3.outlookBaseUrl}/host/${result.value}`
+                        : `${constants_3.outlookBaseUrl}/mail`;
                 url = new URL(baseUrl);
                 break;
             }
@@ -73,8 +73,8 @@ class LaunchHelper {
                         return (0, teamsfx_api_1.err)(result.error);
                     }
                     const baseUrl = hasCopilotExtensionOnly
-                        ? `${constants_4.officeBaseUrl}/chat?auth=2`
-                        : `${constants_4.officeBaseUrl}/m365apps/${result.value}?auth=2`;
+                        ? `${constants_3.officeBaseUrl}/chat?auth=2`
+                        : `${constants_3.officeBaseUrl}/m365apps/${result.value}?auth=2`;
                     url = new URL(baseUrl);
                 }
                 break;
@@ -88,7 +88,7 @@ class LaunchHelper {
         const sideloadingServiceEndpoint = (0, constants_1.getResourceServiceEndpoint)(constants_1.ResourceServiceType.MOS3);
         const packageService = new packageService_1.PackageService(sideloadingServiceEndpoint, this.logger);
         const sideloadingTokenRes = await this.m365TokenProvider.getAccessToken({
-            scopes: (0, constants_3.MosServiceScope)(),
+            scopes: (0, constants_1.MosServiceScope)(),
         });
         if (sideloadingTokenRes.isErr()) {
             return (0, teamsfx_api_1.err)(sideloadingTokenRes.error);
@@ -109,9 +109,9 @@ class LaunchHelper {
         try {
             const statusRes = await this.m365TokenProvider.getStatus({ scopes: (0, constants_1.AppStudioScopes)() });
             const tokenObject = statusRes.isOk() ? statusRes.value.accountInfo : undefined;
-            return tokenObject === null || tokenObject === void 0 ? void 0 : tokenObject.tid;
+            return tokenObject?.tid;
         }
-        catch (_a) {
+        catch {
             return undefined;
         }
     }
@@ -119,18 +119,18 @@ class LaunchHelper {
         try {
             const statusRes = await this.m365TokenProvider.getStatus({ scopes: (0, constants_1.AppStudioScopes)() });
             const tokenObject = statusRes.isOk() ? statusRes.value.accountInfo : undefined;
-            return tokenObject === null || tokenObject === void 0 ? void 0 : tokenObject.upn;
+            return tokenObject?.upn;
         }
-        catch (_a) {
+        catch {
             return undefined;
         }
     }
 }
+exports.LaunchHelper = LaunchHelper;
 tslib_1.__decorate([
     (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ component: "LaunchHelper" })]),
     tslib_1.__metadata("design:type", Function),
     tslib_1.__metadata("design:paramtypes", [String, String, Object, Object]),
     tslib_1.__metadata("design:returntype", Promise)
 ], LaunchHelper.prototype, "getLaunchUrl", null);
-exports.LaunchHelper = LaunchHelper;
 //# sourceMappingURL=launchHelper.js.map

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

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

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

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

package/build/component/m365/packageService.js

@@ -28,7 +28,7 @@ var AppScope;
     AppScope["Personal"] = "Personal";
     AppScope["Shared"] = "Shared";
     AppScope["Tenant"] = "Tenant";
-})(AppScope = exports.AppScope || (exports.AppScope = {}));
+})(AppScope || (exports.AppScope = AppScope = {}));
 exports.AgentPermission = {
     name: "Agent",
     owner: "Owner",
@@ -36,6 +36,16 @@ exports.AgentPermission = {
 };
 // Call m365 service for package CRUD
 class PackageService {
+    static sharedInstance;
+    axiosInstance;
+    initEndpoint;
+    logger;
+    static GetSharedInstance() {
+        if (!PackageService.sharedInstance) {
+            PackageService.sharedInstance = new PackageService((0, constants_2.getResourceServiceEndpoint)(constants_2.ResourceServiceType.MOS3), globalVars_1.TOOLS.logProvider);
+        }
+        return PackageService.sharedInstance;
+    }
     constructor(endpoint, logger) {
         this.axiosInstance = wrappedAxiosClient_1.WrappedAxiosClient.create({
             timeout: 30000,
@@ -43,14 +53,7 @@ class PackageService {
         this.initEndpoint = endpoint;
         this.logger = logger;
     }
-    static GetSharedInstance() {
-        if (!PackageService.sharedInstance) {
-            PackageService.sharedInstance = new PackageService((0, constants_2.getResourceServiceEndpoint)(constants_2.ResourceServiceType.MOS3), globalVars_1.TOOLS.logProvider);
-        }
-        return PackageService.sharedInstance;
-    }
     async getTitleServiceUrl(token) {
-        var _a, _b;
         try {
             try {
                 new URL(this.initEndpoint);
@@ -64,17 +67,16 @@ class PackageService {
                     Authorization: `Bearer ${token}`,
                 },
             });
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(JSON.stringify(envInfo.data));
+            this.logger?.debug(JSON.stringify(envInfo.data));
             new URL(envInfo.data.titlesServiceUrl);
             return envInfo.data.titlesServiceUrl;
         }
         catch (error) {
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.error(`Get ServiceUrl failed. ${error.message}`);
+            this.logger?.error(`Get ServiceUrl failed. ${error.message}`);
             throw error;
         }
     }
     async sideLoadXmlManifest(token, manifestPath) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         try {
             const data = await fs_extra_1.default.readFile(manifestPath);
             const content = new form_data_1.default();
@@ -91,27 +93,27 @@ class PackageService {
             if (uploadResponse.status === 200) {
                 const titleId = uploadResponse.data.titleId;
                 const appId = uploadResponse.data.appId;
-                (_a = this.logger) === null || _a === void 0 ? void 0 : _a.info(`TitleId: ${titleId}`);
-                (_b = this.logger) === null || _b === void 0 ? void 0 : _b.info(`AppId: ${appId}`);
-                (_c = this.logger) === null || _c === void 0 ? void 0 : _c.verbose("Sideloading done.");
+                this.logger?.info(`TitleId: ${titleId}`);
+                this.logger?.info(`AppId: ${appId}`);
+                this.logger?.verbose("Sideloading done.");
                 return [titleId, appId];
             }
             else if (uploadResponse.status === 202) {
                 const statusId = uploadResponse.data.statusId;
-                (_d = this.logger) === null || _d === void 0 ? void 0 : _d.debug(`Acquiring package with statusId: ${statusId} ...`);
+                this.logger?.debug(`Acquiring package with statusId: ${statusId} ...`);
                 do {
                     const statusResponse = await this.axiosInstance.get(`/dev/v1/users/packages/status/${statusId}`, {
                         baseURL: serviceUrl,
                         headers: { Authorization: `Bearer ${token}` },
                     });
                     const resCode = statusResponse.status;
-                    (_e = this.logger) === null || _e === void 0 ? void 0 : _e.debug(`Package status: ${resCode} ...`);
+                    this.logger?.debug(`Package status: ${resCode} ...`);
                     if (resCode === 200) {
                         const titleId = statusResponse.data.titleId;
                         const appId = statusResponse.data.appId;
-                        (_f = this.logger) === null || _f === void 0 ? void 0 : _f.info(`TitleId: ${titleId}`);
-                        (_g = this.logger) === null || _g === void 0 ? void 0 : _g.info(`AppId: ${appId}`);
-                        (_h = this.logger) === null || _h === void 0 ? void 0 : _h.verbose("Sideloading done.");
+                        this.logger?.info(`TitleId: ${titleId}`);
+                        this.logger?.info(`AppId: ${appId}`);
+                        this.logger?.verbose("Sideloading done.");
                         return [titleId, appId];
                     }
                     else {
@@ -166,7 +168,6 @@ class PackageService {
     }
     // Side loading using Builder API
     async sideLoadingV2(token, manifestPath, appScope) {
-        var _a, _b, _c, _d, _e, _f;
         try {
             this.checkZip(manifestPath);
             const data = await fs_extra_1.default.readFile(manifestPath);
@@ -174,7 +175,7 @@ class PackageService {
             content.append("package", data);
             content.append("info", JSON.stringify({ builderName: "TeamsToolKit" }));
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`"Uploading package with sideLoading V2 in ${appScope} scope ..."`);
+            this.logger?.debug(`"Uploading package with sideLoading V2 in ${appScope} scope ..."`);
             const uploadHeaders = content.getHeaders();
             uploadHeaders["Authorization"] = `Bearer ${token}`;
             const uploadResponse = await this.axiosInstance.post("/builder/v1/users/packages", content, {
@@ -185,20 +186,20 @@ class PackageService {
                 },
             });
             const statusId = uploadResponse.data.statusId;
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`Acquiring package with statusId: ${statusId} ...`);
+            this.logger?.debug(`Acquiring package with statusId: ${statusId} ...`);
             do {
                 const statusResponse = await this.axiosInstance.get(`/builder/v1/users/packages/status/${statusId}`, {
                     baseURL: serviceUrl,
                     headers: { Authorization: `Bearer ${token}` },
                 });
                 const resCode = statusResponse.status;
-                (_c = this.logger) === null || _c === void 0 ? void 0 : _c.debug(`Package status: ${resCode} ...`);
+                this.logger?.debug(`Package status: ${resCode} ...`);
                 if (resCode === 200) {
                     const titleId = statusResponse.data.titleId;
                     const appId = statusResponse.data.appId;
-                    (_d = this.logger) === null || _d === void 0 ? void 0 : _d.info(`TitleId: ${titleId}`);
-                    (_e = this.logger) === null || _e === void 0 ? void 0 : _e.info(`AppId: ${appId}`);
-                    (_f = this.logger) === null || _f === void 0 ? void 0 : _f.verbose("Sideloading done.");
+                    this.logger?.info(`TitleId: ${titleId}`);
+                    this.logger?.info(`AppId: ${appId}`);
+                    this.logger?.verbose("Sideloading done.");
                     return [titleId, appId];
                 }
                 else {
@@ -218,14 +219,13 @@ class PackageService {
         }
     }
     async sideLoadingV1(token, manifestPath) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         try {
             this.checkZip(manifestPath);
             const data = await fs_extra_1.default.readFile(manifestPath);
             const content = new form_data_1.default();
             content.append("package", data);
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug("Uploading package with sideLoading V1 ...");
+            this.logger?.debug("Uploading package with sideLoading V1 ...");
             const uploadHeaders = content.getHeaders();
             uploadHeaders["Authorization"] = `Bearer ${token}`;
             const uploadResponse = await this.axiosInstance.post("/dev/v1/users/packages", content.getBuffer(), {
@@ -233,8 +233,8 @@ class PackageService {
                 headers: uploadHeaders,
             });
             const operationId = uploadResponse.data.operationId;
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`Package uploaded. OperationId: ${operationId}`);
-            (_c = this.logger) === null || _c === void 0 ? void 0 : _c.verbose("Acquiring package ...");
+            this.logger?.debug(`Package uploaded. OperationId: ${operationId}`);
+            this.logger?.verbose("Acquiring package ...");
             const acquireResponse = await this.axiosInstance.post("/dev/v1/users/packages/acquisitions", {
                 operationId: operationId,
             }, {
@@ -244,20 +244,20 @@ class PackageService {
                 },
             });
             const statusId = acquireResponse.data.statusId;
-            (_d = this.logger) === null || _d === void 0 ? void 0 : _d.debug(`Acquiring package with statusId: ${statusId} ...`);
+            this.logger?.debug(`Acquiring package with statusId: ${statusId} ...`);
             do {
                 const statusResponse = await this.axiosInstance.get(`/dev/v1/users/packages/status/${statusId}`, {
                     baseURL: serviceUrl,
                     headers: { Authorization: `Bearer ${token}` },
                 });
                 const resCode = statusResponse.status;
-                (_e = this.logger) === null || _e === void 0 ? void 0 : _e.debug(`Package status: ${resCode} ...`);
+                this.logger?.debug(`Package status: ${resCode} ...`);
                 if (resCode === 200) {
                     const titleId = statusResponse.data.titleId;
                     const appId = statusResponse.data.appId;
-                    (_f = this.logger) === null || _f === void 0 ? void 0 : _f.info(`TitleId: ${titleId}`);
-                    (_g = this.logger) === null || _g === void 0 ? void 0 : _g.info(`AppId: ${appId}`);
-                    (_h = this.logger) === null || _h === void 0 ? void 0 : _h.verbose("Sideloading done.");
+                    this.logger?.info(`TitleId: ${titleId}`);
+                    this.logger?.info(`AppId: ${appId}`);
+                    this.logger?.verbose("Sideloading done.");
                     return [titleId, appId];
                 }
                 else {
@@ -296,10 +296,9 @@ class PackageService {
         }
     }
     async getLaunchInfoByManifestId(token, manifestId) {
-        var _a, _b, _c;
         try {
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Getting LaunchInfo with ManifestId ${manifestId} ...`);
+            this.logger?.verbose(`Getting LaunchInfo with ManifestId ${manifestId} ...`);
             const launchInfo = await this.axiosInstance.post("/catalog/v1/users/titles/launchInfo", {
                 Id: manifestId,
                 IdType: "ManifestId",
@@ -331,11 +330,11 @@ class PackageService {
                     Authorization: `Bearer ${token}`,
                 },
             });
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(JSON.stringify(launchInfo.data));
+            this.logger?.debug(JSON.stringify(launchInfo.data));
             return launchInfo.data;
         }
         catch (error) {
-            (_c = this.logger) === null || _c === void 0 ? void 0 : _c.error("Get LaunchInfo failed.");
+            this.logger?.error("Get LaunchInfo failed.");
             if (error.response) {
                 if (error.response.status === 404) {
                     throw new errors_1.NotExtendedToM365Error(M365ErrorSource);
@@ -346,24 +345,22 @@ class PackageService {
         }
     }
     async retrieveTitleId(token, manifestId) {
-        var _a, _b, _c, _d, _e;
         const launchInfo = await this.getLaunchInfoByManifestId(token, manifestId);
-        const titleId = (_c = (_b = (_a = launchInfo.acquisition) === null || _a === void 0 ? void 0 : _a.titleId) === null || _b === void 0 ? void 0 : _b.id) !== null && _c !== void 0 ? _c : (_d = launchInfo.acquisition) === null || _d === void 0 ? void 0 : _d.titleId;
-        (_e = this.logger) === null || _e === void 0 ? void 0 : _e.debug(`TitleId: ${titleId}`);
+        const titleId = launchInfo.acquisition?.titleId?.id ??
+            launchInfo.acquisition?.titleId;
+        this.logger?.debug(`TitleId: ${titleId}`);
         return titleId;
     }
     async retrieveAppId(token, manifestId) {
-        var _a, _b;
         const launchInfo = await this.getLaunchInfoByManifestId(token, manifestId);
-        const appId = (_a = launchInfo.acquisition) === null || _a === void 0 ? void 0 : _a.appId;
-        (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`AppId: ${appId}`);
+        const appId = launchInfo.acquisition?.appId;
+        this.logger?.debug(`AppId: ${appId}`);
         return appId;
     }
     async unacquire(token, titleId) {
-        var _a, _b, _c;
         try {
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Unacquiring package with TitleId ${titleId} ...`);
+            this.logger?.verbose(`Unacquiring package with TitleId ${titleId} ...`);
             await this.axiosInstance.delete(`/catalog/v1/users/acquisitions/${titleId}`, {
                 baseURL: serviceUrl,
                 headers: {
@@ -380,13 +377,13 @@ class PackageService {
             }
             catch (error) {
                 if (error.response && error.response.status === 404) {
-                    (_b = this.logger) === null || _b === void 0 ? void 0 : _b.debug(`TitleId ${titleId} not found, skip deleting.`);
+                    this.logger?.debug(`TitleId ${titleId} not found, skip deleting.`);
                 }
                 else {
                     throw error;
                 }
             }
-            (_c = this.logger) === null || _c === void 0 ? void 0 : _c.verbose("Unacquiring done.");
+            this.logger?.verbose("Unacquiring done.");
         }
         catch (error) {
             if (error.response) {
@@ -396,10 +393,9 @@ class PackageService {
         }
     }
     async getLaunchInfoByTitleId(token, titleId) {
-        var _a, _b;
         try {
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Getting LaunchInfo with TitleId ${titleId} ...`);
+            this.logger?.verbose(`Getting LaunchInfo with TitleId ${titleId} ...`);
             const launchInfo = await this.axiosInstance.get(`/catalog/v1/users/titles/${titleId}/launchInfo`, {
                 baseURL: serviceUrl,
                 params: {
@@ -411,7 +407,7 @@ class PackageService {
                     Authorization: `Bearer ${token}`,
                 },
             });
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.info(JSON.stringify(launchInfo.data));
+            this.logger?.info(JSON.stringify(launchInfo.data));
             return launchInfo.data;
         }
         catch (error) {
@@ -422,10 +418,9 @@ class PackageService {
         }
     }
     async getActiveExperiences(token, ensureUpToDate = false) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
         try {
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`Get active experiences from service URL ${serviceUrl} ...`);
+            this.logger?.debug(`Get active experiences from service URL ${serviceUrl} ...`);
             // users/experiences is deprecating, using users/uitypes instead
             let response = await this.axiosInstance.get("/catalog/v1/users/uitypes", {
                 baseURL: serviceUrl,
@@ -434,12 +429,12 @@ class PackageService {
                 },
             });
             let status = response.status;
-            let activeExperiences = (_b = response.data) === null || _b === void 0 ? void 0 : _b.activeExperiences;
-            const nextInterval = (_d = (_c = response.data) === null || _c === void 0 ? void 0 : _c.nextInterval) !== null && _d !== void 0 ? _d : -1;
-            (_e = this.logger) === null || _e === void 0 ? void 0 : _e.debug(`(${status}) Active experiences: ${JSON.stringify(activeExperiences)}`);
+            let activeExperiences = response.data?.activeExperiences;
+            const nextInterval = response.data?.nextInterval ?? -1;
+            this.logger?.debug(`(${status}) Active experiences: ${JSON.stringify(activeExperiences)}`);
             // Short nextInterval means cache is refreshing
             if (ensureUpToDate && nextInterval > 0 && nextInterval < 10) {
-                (_f = this.logger) === null || _f === void 0 ? void 0 : _f.debug(`Active experiences is refreshing, wait for ${nextInterval} seconds.`);
+                this.logger?.debug(`Active experiences is refreshing, wait for ${nextInterval} seconds.`);
                 await (0, utils_1.waitSeconds)(nextInterval);
                 response = await this.axiosInstance.get("/catalog/v1/users/uitypes", {
                     baseURL: serviceUrl,
@@ -448,8 +443,8 @@ class PackageService {
                     },
                 });
                 status = response.status;
-                activeExperiences = (_g = response.data) === null || _g === void 0 ? void 0 : _g.activeExperiences;
-                (_h = this.logger) === null || _h === void 0 ? void 0 : _h.debug(`(${status}) Active experiences: ${JSON.stringify(activeExperiences)}`);
+                activeExperiences = response.data?.activeExperiences;
+                this.logger?.debug(`(${status}) Active experiences: ${JSON.stringify(activeExperiences)}`);
             }
             return activeExperiences;
         }
@@ -461,7 +456,6 @@ class PackageService {
         }
     }
     async removePermission(token, titleId, user) {
-        var _a;
         try {
             const appRes = await this.previewApp(token, titleId);
             if (appRes.isErr()) {
@@ -473,7 +467,7 @@ class PackageService {
             }
             const newOwners = owners.filter((owner) => owner.entityId !== user.aadId);
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Removing permission to user ${user.displayName} ...`);
+            this.logger?.verbose(`Removing permission to user ${user.displayName} ...`);
             await this.axiosInstance.put(`/builder/v1/users/titles/${titleId}/owners?idType=TitleId`, {
                 Owners: newOwners,
             }, {
@@ -493,7 +487,6 @@ class PackageService {
         }
     }
     async addOwner(token, titleId, user) {
-        var _a;
         try {
             const appRes = await this.previewApp(token, titleId);
             if (appRes.isErr()) {
@@ -514,7 +507,7 @@ class PackageService {
                 EntityType: "User",
             });
             const serviceUrl = await this.getTitleServiceUrl(token);
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Granting permission to user ${user.displayName} ...`);
+            this.logger?.verbose(`Granting permission to user ${user.displayName} ...`);
             await this.axiosInstance.put(`/builder/v1/users/titles/${titleId}/owners?idType=TitleId`, {
                 Owners: newOwners,
             }, {
@@ -534,9 +527,8 @@ class PackageService {
         }
     }
     async shareWithTenant(token, titleId) {
-        var _a;
         try {
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Change shared scope of agent to tenant with titleId: ${titleId} ...`);
+            this.logger?.verbose(`Change shared scope of agent to tenant with titleId: ${titleId} ...`);
             const serviceUrl = await this.getTitleServiceUrl(token);
             await this.axiosInstance.post(`/builder/v1/users/titles/${titleId}/allowed?idType=TitleId`, {
                 EntityCollection: {
@@ -560,9 +552,8 @@ class PackageService {
         }
     }
     async getSharedUsers(token, titleId) {
-        var _a;
         try {
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Getting shared users with titleId: ${titleId} ...`);
+            this.logger?.verbose(`Getting shared users with titleId: ${titleId} ...`);
             const serviceUrl = await this.getTitleServiceUrl(token);
             const response = await this.axiosInstance.get(`/builder/v1/users/titles/${titleId}/allowed?idType=TitleId`, {
                 baseURL: serviceUrl,
@@ -585,11 +576,10 @@ class PackageService {
     }
     // This will overwrite existing entity list
     async shareWithUsers(token, entities, titleId, appId) {
-        var _a;
         try {
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Adding shared users to app with titleId: ${titleId} ...`);
+            this.logger?.verbose(`Adding shared users to app with titleId: ${titleId} ...`);
             const serviceUrl = await this.getTitleServiceUrl(token);
-            await this.axiosInstance.post(`/builder/v1/users/titles/${appId !== null && appId !== void 0 ? appId : titleId}/allowed?idType=${appId ? "AppId" : "TitleId"}`, {
+            await this.axiosInstance.post(`/builder/v1/users/titles/${appId ?? titleId}/allowed?idType=${appId ? "AppId" : "TitleId"}`, {
                 EntityCollection: {
                     ForAllUsers: false,
                     Entities: entities,
@@ -611,9 +601,8 @@ class PackageService {
         }
     }
     async unshare(token, titleId) {
-        var _a;
         try {
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.verbose(`Removing shared users from app with titleId: ${titleId} ...`);
+            this.logger?.verbose(`Removing shared users from app with titleId: ${titleId} ...`);
             const serviceUrl = await this.getTitleServiceUrl(token);
             await this.axiosInstance.delete(`/builder/v1/users/titles/${titleId}/allowed?idType=TitleId`, {
                 baseURL: serviceUrl,
@@ -650,12 +639,11 @@ class PackageService {
         }
     }
     async getCopilotStatus(token, ensureUpToDate = false) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         try {
             const activeExperiences = await this.getActiveExperiences(token, ensureUpToDate);
             const copilotAllowed = activeExperiences == undefined ? undefined : activeExperiences.includes("CopilotTeams");
             (0, telemetry_1.sendTelemetryEvent)(telemetry_1.Component.core, telemetry_1.TelemetryEvent.CheckCopilot, {
-                [telemetry_1.TelemetryProperty.IsCopilotAllowed]: (_a = copilotAllowed === null || copilotAllowed === void 0 ? void 0 : copilotAllowed.toString()) !== null && _a !== void 0 ? _a : "undefined",
+                [telemetry_1.TelemetryProperty.IsCopilotAllowed]: copilotAllowed?.toString() ?? "undefined",
             });
             return copilotAllowed;
         }
@@ -663,12 +651,12 @@ class PackageService {
             (0, telemetry_1.sendTelemetryErrorEvent)(telemetry_1.Component.core, telemetry_1.TelemetryEvent.CheckCopilot, new teamsfx_api_1.SystemError({
                 error,
                 source: M365ErrorSource,
-                message: (_b = error.message) !== null && _b !== void 0 ? _b : "Failed to get copilot status.",
+                message: error.message ?? "Failed to get copilot status.",
                 categories: [types_1.ErrorCategory.External],
             }), {
-                [telemetry_1.TelemetryProperty.CheckCopilotTracingId]: `${
-                // eslint-disable-next-line @typescript-eslint/restrict-template-expressions
-                (_j = (_e = (_d = (_c = error.response) === null || _c === void 0 ? void 0 : _c.headers) === null || _d === void 0 ? void 0 : _d.traceresponse) !== null && _e !== void 0 ? _e : (_h = (_g = (_f = error.innerError) === null || _f === void 0 ? void 0 : _f.response) === null || _g === void 0 ? void 0 : _g.headers) === null || _h === void 0 ? void 0 : _h.traceresponse) !== null && _j !== void 0 ? _j : ""}`,
+                [telemetry_1.TelemetryProperty.CheckCopilotTracingId]: `${error.response?.headers?.traceresponse ??
+                    error.innerError?.response?.headers?.traceresponse ??
+                    ""}`,
             });
             return undefined;
         }
@@ -686,16 +674,15 @@ class PackageService {
         return false;
     }
     traceError(error) {
-        var _a, _b, _c, _d;
         // add error details and trace to message
-        const tracingId = ((_b = (_a = error.response.headers) === null || _a === void 0 ? void 0 : _a.traceresponse) !== null && _b !== void 0 ? _b : "");
+        const tracingId = (error.response.headers?.traceresponse ?? "");
         const originalMessage = error.message;
-        const innerError = ((_c = error.response.data) === null || _c === void 0 ? void 0 : _c.error) ||
+        const innerError = error.response.data?.error ||
             error.response.data.Error || { code: "", message: "" };
         const finalMessage = `${originalMessage} (tracingId: ${tracingId}) ${innerError.Code}: ${innerError.Message} `;
         error.message = finalMessage;
         // HTTP 400 as user error due to invalid input
-        if (((_d = error.response) === null || _d === void 0 ? void 0 : _d.status) === 400) {
+        if (error.response?.status === 400) {
             error = new teamsfx_api_1.UserError({
                 name: "PackageServiceError",
                 error,
@@ -717,14 +704,13 @@ class PackageService {
         return error;
     }
     checkZip(path) {
-        var _a, _b;
         try {
             const zip = new adm_zip_1.default(path, {});
             zip.getEntries();
         }
         catch (error) {
-            (_a = this.logger) === null || _a === void 0 ? void 0 : _a.debug(`Invalid input zip ${path}. ${error.message}`);
-            (_b = this.logger) === null || _b === void 0 ? void 0 : _b.warning(`Please make sure input path is a valid app package zip. ${path}`);
+            this.logger?.debug(`Invalid input zip ${path}. ${error.message}`);
+            this.logger?.warning(`Please make sure input path is a valid app package zip. ${path}`);
         }
     }
     getManifestFromZip(path) {
@@ -738,6 +724,7 @@ class PackageService {
         return JSON.parse(manifestContent);
     }
 }
+exports.PackageService = PackageService;
 tslib_1.__decorate([
     (0, hooks_1.hooks)([(0, globalVars_1.ErrorContextMW)({ source: M365ErrorSource, component: M365ErrorComponent })]),
     tslib_1.__metadata("design:type", Function),
@@ -846,5 +833,4 @@ tslib_1.__decorate([
     tslib_1.__metadata("design:paramtypes", [String, String]),
     tslib_1.__metadata("design:returntype", Promise)
 ], PackageService.prototype, "previewApp", null);
-exports.PackageService = PackageService;
 //# sourceMappingURL=packageService.js.map