@microsoft/teamsfx-core 1.10.0 → 1.10.1-alpha.009656ebb.0

package/build/plugins/resource/appstudio/interfaces/togetherModeSceneItem.d.ts

@@ -0,0 +1,9 @@
+export interface TogetherModeSceneItem {
+    id: string;
+    name: string;
+    file: string;
+    preview: string;
+    maxAudience: number;
+    seatsReservedForOrganizersOrPresenters: number;
+}
+//# sourceMappingURL=togetherModeSceneItem.d.ts.map

package/build/plugins/resource/appstudio/interfaces/togetherModeSceneItem.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"togetherModeSceneItem.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/appstudio/interfaces/togetherModeSceneItem.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,qBAAqB;IACpC,EAAE,EAAE,MAAM,CAAC;IACX,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,EAAE,MAAM,CAAC;IACpB,sCAAsC,EAAE,MAAM,CAAC;CAChD"}

package/build/plugins/resource/appstudio/interfaces/togetherModeSceneItem.js

@@ -0,0 +1,5 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=togetherModeSceneItem.js.map

package/build/plugins/resource/appstudio/interfaces/togetherModeSceneItem.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"togetherModeSceneItem.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/appstudio/interfaces/togetherModeSceneItem.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC"}

package/build/plugins/resource/appstudio/interfaces/webApplicationInfoItem.d.ts

@@ -0,0 +1,7 @@
+export interface WebApplicationInfoItem {
+    id: string;
+    resource: string;
+    scopes: string[];
+    applicationPermissions: string[];
+}
+//# sourceMappingURL=webApplicationInfoItem.d.ts.map

package/build/plugins/resource/appstudio/interfaces/webApplicationInfoItem.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"webApplicationInfoItem.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/resource/appstudio/interfaces/webApplicationInfoItem.ts"],"names":[],"mappings":"AAGA,MAAM,WAAW,sBAAsB;IACrC,EAAE,EAAE,MAAM,CAAC;IACX,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,sBAAsB,EAAE,MAAM,EAAE,CAAC;CAClC"}

package/build/plugins/resource/appstudio/interfaces/webApplicationInfoItem.js

@@ -0,0 +1,5 @@
+"use strict";
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=webApplicationInfoItem.js.map

package/build/plugins/resource/appstudio/interfaces/webApplicationInfoItem.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"webApplicationInfoItem.js","sourceRoot":"","sources":["../../../../../src/plugins/resource/appstudio/interfaces/webApplicationInfoItem.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC"}

package/build/plugins/resource/appstudio/plugin.d.ts

@@ -1,5 +1,5 @@
 import { FxError, Result, PluginContext, TeamsAppManifest } from "@microsoft/teamsfx-api";
-import { IUserList } from "./interfaces/IAppDefinition";
+import { AppUser } from "./interfaces/appUser";
 import { ResourcePermission, TeamsAppAdmin } from "../../../common/permissionInterface";
 export declare class AppStudioPluginImpl {
     commonProperties: {
@@ -21,9 +21,9 @@ export declare class AppStudioPluginImpl {
         update: boolean;
     }>;
     postLocalDebug(ctx: PluginContext): Promise<Result<string, FxError>>;
-    checkPermission(ctx: PluginContext, userInfo: IUserList): Promise<ResourcePermission[]>;
+    checkPermission(ctx: PluginContext, userInfo: AppUser): Promise<ResourcePermission[]>;
     listCollaborator(ctx: PluginContext): Promise<TeamsAppAdmin[]>;
-    grantPermission(ctx: PluginContext, userInfo: IUserList): Promise<ResourcePermission[]>;
+    grantPermission(ctx: PluginContext, userInfo: AppUser): Promise<ResourcePermission[]>;
     private beforePublish;
     private getConfigForCreatingManifest;
     private getTabEndpoint;

package/build/plugins/resource/appstudio/plugin.d.ts.map

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

package/build/plugins/resource/appstudio/plugin.js

@@ -6,6 +6,7 @@ exports.createManifest = exports.createLocalManifest = exports.AppStudioPluginIm
 const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const appStudio_1 = require("./appStudio");
+const appPermissionNodeItemType_1 = require("./interfaces/appPermissionNodeItemType");
 const question_1 = require("../../solution/fx-solution/question");
 const constants_1 = require("../../solution/fx-solution/constants");
 const errors_1 = require("./errors");
@@ -28,15 +29,22 @@ const constants_3 = require("../../../common/constants");
 const manifestTemplate_1 = require("./manifestTemplate");
 const environment_1 = require("../../../core/environment");
 const localizeUtils_1 = require("../../../common/localizeUtils");
+const utils_2 = require("../../../common/utils");
+const utils_3 = require("./utils/utils");
 class AppStudioPluginImpl {
     constructor() {
         this.commonProperties = {};
     }
     async getAppDefinitionAndUpdate(ctx, isLocalDebug, manifest) {
-        var _a, _b;
         let teamsAppId;
         const appDirectory = await common_1.getAppDirectory(ctx.root);
-        const appStudioToken = await ((_a = ctx.appStudioToken) === null || _a === void 0 ? void 0 : _a.getAccessToken());
+        const appStudioTokenRes = await ctx.m365TokenProvider.getAccessToken({
+            scopes: common_1.AppStudioScopes,
+        });
+        if (appStudioTokenRes.isErr()) {
+            return teamsfx_api_1.err(appStudioTokenRes.error);
+        }
+        const appStudioToken = appStudioTokenRes.value;
         if (isLocalDebug) {
             const appDefinitionAndManifest = await this.getAppDefinitionAndManifest(ctx, true);
             if (appDefinitionAndManifest.isErr()) {
@@ -48,7 +56,6 @@ class AppStudioPluginImpl {
                 createIfNotExist = true;
             }
             else {
-                const appStudioToken = await ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.appStudioToken) === null || _b === void 0 ? void 0 : _b.getAccessToken());
                 try {
                     await appStudio_1.AppStudioClient.getApp(localTeamsAppID, appStudioToken, ctx.logProvider);
                 }
@@ -69,9 +76,14 @@ class AppStudioPluginImpl {
         }
     }
     async getSPFxLocalDebugAppDefinitionAndUpdate(ctx, manifest) {
-        var _a;
         const appDirectory = await common_1.getAppDirectory(ctx.root);
-        const appStudioToken = await ((_a = ctx.appStudioToken) === null || _a === void 0 ? void 0 : _a.getAccessToken());
+        const appStudioTokenRes = await ctx.m365TokenProvider.getAccessToken({
+            scopes: common_1.AppStudioScopes,
+        });
+        if (appStudioTokenRes.isErr()) {
+            return teamsfx_api_1.err(appStudioTokenRes.error);
+        }
+        const appStudioToken = appStudioTokenRes.value;
         const localTeamsAppID = await this.getTeamsAppId(ctx, true);
         let create = !localTeamsAppID;
         if (localTeamsAppID) {
@@ -90,8 +102,7 @@ class AppStudioPluginImpl {
                 },
             },
         };
-        mustache_1.default.escape = (value) => value;
-        const manifestString = mustache_1.default.render(JSON.stringify(manifest), view);
+        const manifestString = utils_3.renderTemplate(JSON.stringify(manifest), view);
         manifest = JSON.parse(manifestString);
         const appDefinition = await this.convertToAppDefinition(ctx, manifest, false);
         if (appDefinition.isErr()) {
@@ -101,7 +112,7 @@ class AppStudioPluginImpl {
         return teamsAppId;
     }
     async provision(ctx) {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const provisionProgress = (_a = ctx.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(localizeUtils_1.getLocalizedString("plugins.appstudio.provisionTitle"), 1);
         await (provisionProgress === null || provisionProgress === void 0 ? void 0 : provisionProgress.start());
         await (provisionProgress === null || provisionProgress === void 0 ? void 0 : provisionProgress.next(localizeUtils_1.getLocalizedString("plugins.appstudio.provisionProgress", ctx.projectSettings.appName)));
@@ -111,7 +122,13 @@ class AppStudioPluginImpl {
             create = true;
         }
         else {
-            const appStudioToken = await ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.appStudioToken) === null || _b === void 0 ? void 0 : _b.getAccessToken());
+            const appStudioTokenRes = await (ctx === null || ctx === void 0 ? void 0 : ctx.m365TokenProvider.getAccessToken({
+                scopes: common_1.AppStudioScopes,
+            }));
+            if (appStudioTokenRes.isErr()) {
+                return teamsfx_api_1.err(appStudioTokenRes.error);
+            }
+            const appStudioToken = appStudioTokenRes.value;
             try {
                 await appStudio_1.AppStudioClient.getApp(remoteTeamsAppId, appStudioToken, ctx.logProvider);
             }
@@ -126,14 +143,14 @@ class AppStudioPluginImpl {
                 return teamsfx_api_1.err(result.error);
             }
             remoteTeamsAppId = result.value.teamsAppId;
-            (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppCreatedNotice", remoteTeamsAppId));
+            (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppCreatedNotice", remoteTeamsAppId));
         }
-        (_d = ctx.envInfo.state.get(constants_1.PluginNames.APPST)) === null || _d === void 0 ? void 0 : _d.set(constants_2.Constants.TEAMS_APP_ID, remoteTeamsAppId);
+        (_c = ctx.envInfo.state.get(constants_1.PluginNames.APPST)) === null || _c === void 0 ? void 0 : _c.set(constants_2.Constants.TEAMS_APP_ID, remoteTeamsAppId);
         await (provisionProgress === null || provisionProgress === void 0 ? void 0 : provisionProgress.end(true));
         return teamsfx_api_1.ok(remoteTeamsAppId);
     }
     async postProvision(ctx) {
-        var _a, _b, _c;
+        var _a, _b;
         const postProvisionProgress = (_a = ctx.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(localizeUtils_1.getLocalizedString("plugins.appstudio.provisionTitle"), 1);
         await (postProvisionProgress === null || postProvisionProgress === void 0 ? void 0 : postProvisionProgress.start(localizeUtils_1.getLocalizedString("plugins.appstudio.postProvisionProgress", ctx.projectSettings.appName)));
         await (postProvisionProgress === null || postProvisionProgress === void 0 ? void 0 : postProvisionProgress.next());
@@ -166,13 +183,19 @@ class AppStudioPluginImpl {
             [appDefinition] = remoteManifest.value;
         }
         const appDirectory = await common_1.getAppDirectory(ctx.root);
-        const appStudioToken = await ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.appStudioToken) === null || _b === void 0 ? void 0 : _b.getAccessToken());
+        const appStudioTokenRes = await (ctx === null || ctx === void 0 ? void 0 : ctx.m365TokenProvider.getAccessToken({
+            scopes: common_1.AppStudioScopes,
+        }));
+        if (appStudioTokenRes.isErr()) {
+            return teamsfx_api_1.err(appStudioTokenRes.error);
+        }
+        const appStudioToken = appStudioTokenRes.value;
         const result = await this.updateApp(ctx, appDefinition, appStudioToken, false, false, appDirectory, remoteTeamsAppId, ctx.logProvider);
         if (result.isErr()) {
             await (postProvisionProgress === null || postProvisionProgress === void 0 ? void 0 : postProvisionProgress.end(false));
             return teamsfx_api_1.err(result.error);
         }
-        (_c = ctx.logProvider) === null || _c === void 0 ? void 0 : _c.info(localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppUpdatedLog", remoteTeamsAppId));
+        (_b = ctx.logProvider) === null || _b === void 0 ? void 0 : _b.info(localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppUpdatedLog", remoteTeamsAppId));
         await (postProvisionProgress === null || postProvisionProgress === void 0 ? void 0 : postProvisionProgress.end(true));
         return teamsfx_api_1.ok(remoteTeamsAppId);
     }
@@ -237,7 +260,7 @@ class AppStudioPluginImpl {
         return this.updateManifest(ctx, false);
     }
     async updateManifest(ctx, isLocalDebug) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         const teamsAppId = await this.getTeamsAppId(ctx, isLocalDebug);
         let manifest;
         let manifestString;
@@ -307,16 +330,22 @@ class AppStudioPluginImpl {
                 return teamsfx_api_1.err(error);
             }
         }
-        const appStudioToken = await ((_e = ctx === null || ctx === void 0 ? void 0 : ctx.appStudioToken) === null || _e === void 0 ? void 0 : _e.getAccessToken());
+        const appStudioTokenRes = await (ctx === null || ctx === void 0 ? void 0 : ctx.m365TokenProvider.getAccessToken({
+            scopes: common_1.AppStudioScopes,
+        }));
+        if (appStudioTokenRes.isErr()) {
+            return teamsfx_api_1.err(appStudioTokenRes.error);
+        }
+        const appStudioToken = appStudioTokenRes.value;
         try {
             const localUpdateTime = isLocalDebug
                 ? undefined
-                : (_f = ctx.envInfo.state.get(constants_1.PluginNames.APPST)) === null || _f === void 0 ? void 0 : _f.get(constants_2.Constants.TEAMS_APP_UPDATED_AT);
+                : (_e = ctx.envInfo.state.get(constants_1.PluginNames.APPST)) === null || _e === void 0 ? void 0 : _e.get(constants_2.Constants.TEAMS_APP_UPDATED_AT);
             if (localUpdateTime) {
                 const app = await appStudio_1.AppStudioClient.getApp(teamsAppId, appStudioToken, ctx.logProvider);
-                const devPortalUpdateTime = (_h = (_g = new Date(app.updatedAt)) === null || _g === void 0 ? void 0 : _g.getTime()) !== null && _h !== void 0 ? _h : -1;
+                const devPortalUpdateTime = (_g = (_f = new Date(app.updatedAt)) === null || _f === void 0 ? void 0 : _f.getTime()) !== null && _g !== void 0 ? _g : -1;
                 if (localUpdateTime < devPortalUpdateTime) {
-                    const res = await ((_j = ctx.ui) === null || _j === void 0 ? void 0 : _j.showMessage("warn", localizeUtils_1.getLocalizedString("plugins.appstudio.updateOverwriteTip"), true, "Overwrite and update"));
+                    const res = await ((_h = ctx.ui) === null || _h === void 0 ? void 0 : _h.showMessage("warn", localizeUtils_1.getLocalizedString("plugins.appstudio.updateOverwriteTip"), true, "Overwrite and update"));
                     if (!((res === null || res === void 0 ? void 0 : res.isOk()) && res.value === "Overwrite and update")) {
                         const error = results_1.AppStudioResultFactory.UserError(errors_1.AppStudioError.UpdateManifestCancelError.name, errors_1.AppStudioError.UpdateManifestCancelError.message(manifest.name.short));
                         return teamsfx_api_1.err(error);
@@ -328,8 +357,8 @@ class AppStudioPluginImpl {
             if (result.isErr()) {
                 return teamsfx_api_1.err(result.error);
             }
-            (_k = ctx.logProvider) === null || _k === void 0 ? void 0 : _k.info(localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppUpdatedLog", teamsAppId));
-            (_l = ctx.ui) === null || _l === void 0 ? void 0 : _l.showMessage("info", localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppUpdatedNotice"), false, constants_2.Constants.VIEW_DEVELOPER_PORTAL).then((res) => {
+            (_j = ctx.logProvider) === null || _j === void 0 ? void 0 : _j.info(localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppUpdatedLog", teamsAppId));
+            (_k = ctx.ui) === null || _k === void 0 ? void 0 : _k.showMessage("info", localizeUtils_1.getLocalizedString("plugins.appstudio.teamsAppUpdatedNotice"), false, constants_2.Constants.VIEW_DEVELOPER_PORTAL).then((res) => {
                 var _a;
                 if ((res === null || res === void 0 ? void 0 : res.isOk()) && res.value === constants_2.Constants.VIEW_DEVELOPER_PORTAL) {
                     (_a = ctx.ui) === null || _a === void 0 ? void 0 : _a.openUrl(util.format(constants_2.Constants.DEVELOPER_PORTAL_APP_PACKAGE_URL, result.value));
@@ -351,7 +380,7 @@ class AppStudioPluginImpl {
         let manifest;
         const templatesFolder = folder_1.getTemplatesFolder();
         // cannot use getAppDirectory before creating the manifest file
-        const appDir = `${ctx.root}/${constants_2.APP_PACKAGE_FOLDER_FOR_MULTI_ENV}`;
+        const appDir = path_1.default.join(await utils_2.getProjectTemplatesFolderPath(ctx.root), "appPackage");
         if (common_1.isSPFxProject(ctx.projectSettings)) {
             const templateManifestFolder = path_1.default.join(templatesFolder, "plugins", "resource", "spfx");
             const manifestFile = path_1.default.resolve(templateManifestFolder, "./solution/manifest_multi_env.json");
@@ -385,8 +414,8 @@ class AppStudioPluginImpl {
         const defaultOutlinePath = path_1.default.join(templatesFolder, constants_2.OUTLINE_TEMPLATE);
         const resourcesDir = path_1.default.join(appDir, constants_2.MANIFEST_RESOURCES);
         await fs.ensureDir(resourcesDir);
-        await fs.copy(defaultColorPath, `${resourcesDir}/${constants_2.DEFAULT_COLOR_PNG_FILENAME}`);
-        await fs.copy(defaultOutlinePath, `${resourcesDir}/${constants_2.DEFAULT_OUTLINE_PNG_FILENAME}`);
+        await fs.copy(defaultColorPath, path_1.default.join(resourcesDir, constants_2.DEFAULT_COLOR_PNG_FILENAME));
+        await fs.copy(defaultOutlinePath, path_1.default.join(resourcesDir, constants_2.DEFAULT_OUTLINE_PNG_FILENAME));
         return undefined;
     }
     async buildTeamsAppPackage(ctx, isLocalDebug) {
@@ -510,20 +539,21 @@ class AppStudioPluginImpl {
                 }
             }
         }
-        if (appDirectory === `${ctx.root}/.${teamsfx_api_1.ConfigFolderName}`) {
+        if (appDirectory === path_1.default.join(ctx.root, `.${teamsfx_api_1.ConfigFolderName}`)) {
             await fs.ensureDir(path_1.default.join(ctx.root, `${teamsfx_api_1.AppPackageFolderName}`));
             const formerZipFileName = `${appDirectory}/appPackage.zip`;
             if (await fs.pathExists(formerZipFileName)) {
                 await fs.remove(formerZipFileName);
             }
-            await fs.move(`${appDirectory}/${manifest.icons.color}`, `${ctx.root}/${constants_2.APP_PACKAGE_FOLDER_FOR_MULTI_ENV}/${constants_2.MANIFEST_RESOURCES}/${manifest.icons.color}`);
-            await fs.move(`${appDirectory}/${manifest.icons.outline}`, `${ctx.root}/${constants_2.APP_PACKAGE_FOLDER_FOR_MULTI_ENV}/${constants_2.MANIFEST_RESOURCES}/${manifest.icons.outline}`);
-            await fs.move(`${appDirectory}/${constants_2.REMOTE_MANIFEST}`, `${ctx.root}/${constants_2.APP_PACKAGE_FOLDER_FOR_MULTI_ENV}/${constants_2.MANIFEST_TEMPLATE}`);
+            const projectTemplatesFolderPath = await utils_2.getProjectTemplatesFolderPath(ctx.root);
+            await fs.move(path_1.default.join(appDirectory, "manifest.icons.color"), path_1.default.join(projectTemplatesFolderPath, "appPackage", constants_2.MANIFEST_RESOURCES, manifest.icons.color));
+            await fs.move(path_1.default.join(appDirectory, "manifest.icons.outline"), path_1.default.join(projectTemplatesFolderPath, "appPackage", constants_2.MANIFEST_RESOURCES, manifest.icons.outline));
+            await fs.move(path_1.default.join(appDirectory, constants_2.REMOTE_MANIFEST), path_1.default.join(projectTemplatesFolderPath, "appPackage", constants_2.MANIFEST_TEMPLATE));
         }
         return zipFileName;
     }
     async publish(ctx) {
-        var _a, _b, _c;
+        var _a, _b;
         let manifest;
         const appDirectory = await common_1.getAppDirectory(ctx.root);
         if (common_1.isSPFxProject(ctx.projectSettings)) {
@@ -543,7 +573,13 @@ class AppStudioPluginImpl {
             throw results_1.AppStudioResultFactory.SystemError(errors_1.AppStudioError.ManifestLoadFailedError.name, errors_1.AppStudioError.ManifestLoadFailedError.message(""));
         }
         // manifest.id === externalID
-        const appStudioToken = await ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.appStudioToken) === null || _a === void 0 ? void 0 : _a.getAccessToken());
+        const appStudioTokenRes = await (ctx === null || ctx === void 0 ? void 0 : ctx.m365TokenProvider.getAccessToken({
+            scopes: common_1.AppStudioScopes,
+        }));
+        if (appStudioTokenRes.isErr()) {
+            throw appStudioTokenRes.error;
+        }
+        const appStudioToken = appStudioTokenRes.value;
         const existApp = await appStudio_1.AppStudioClient.getAppByTeamsAppId(manifest.id, appStudioToken);
         if (existApp) {
             let executePublishUpdate = false;
@@ -551,10 +587,10 @@ class AppStudioPluginImpl {
             if (existApp.lastModifiedDateTime) {
                 description =
                     description +
-                        localizeUtils_1.getLocalizedString("plugins.appstudio.lastModifiedTip", (_b = existApp.lastModifiedDateTime) === null || _b === void 0 ? void 0 : _b.toLocaleString());
+                        localizeUtils_1.getLocalizedString("plugins.appstudio.lastModifiedTip", (_a = existApp.lastModifiedDateTime) === null || _a === void 0 ? void 0 : _a.toLocaleString());
             }
             description = description + localizeUtils_1.getLocalizedString("plugins.appstudio.updatePublihsedAppConfirm");
-            const res = await ((_c = ctx.ui) === null || _c === void 0 ? void 0 : _c.showMessage("warn", description, true, "Confirm"));
+            const res = await ((_b = ctx.ui) === null || _b === void 0 ? void 0 : _b.showMessage("warn", description, true, "Confirm"));
             if ((res === null || res === void 0 ? void 0 : res.isOk()) && res.value === "Confirm")
                 executePublishUpdate = true;
             if (executePublishUpdate) {
@@ -597,8 +633,13 @@ class AppStudioPluginImpl {
         return teamsfx_api_1.ok(teamsAppId.value);
     }
     async checkPermission(ctx, userInfo) {
-        var _a;
-        const appStudioToken = await ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.appStudioToken) === null || _a === void 0 ? void 0 : _a.getAccessToken());
+        const appStudioTokenRes = await (ctx === null || ctx === void 0 ? void 0 : ctx.m365TokenProvider.getAccessToken({
+            scopes: common_1.AppStudioScopes,
+        }));
+        if (appStudioTokenRes.isErr()) {
+            throw appStudioTokenRes.error;
+        }
+        const appStudioToken = appStudioTokenRes.value;
         const teamsAppId = await this.getTeamsAppId(ctx, false);
         if (!teamsAppId) {
             throw new Error(constants_2.ErrorMessages.GetConfigError(constants_2.Constants.TEAMS_APP_ID, constants_1.PluginNames.APPST));
@@ -615,8 +656,13 @@ class AppStudioPluginImpl {
         return result;
     }
     async listCollaborator(ctx) {
-        var _a;
-        const appStudioToken = await ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.appStudioToken) === null || _a === void 0 ? void 0 : _a.getAccessToken());
+        const appStudioTokenRes = await (ctx === null || ctx === void 0 ? void 0 : ctx.m365TokenProvider.getAccessToken({
+            scopes: common_1.AppStudioScopes,
+        }));
+        if (appStudioTokenRes.isErr()) {
+            throw appStudioTokenRes.error;
+        }
+        const appStudioToken = appStudioTokenRes.value;
         const teamsAppId = await this.getTeamsAppId(ctx, false);
         if (!teamsAppId) {
             throw new Error(constants_2.ErrorMessages.GetConfigError(constants_2.Constants.TEAMS_APP_ID, constants_1.PluginNames.APPST));
@@ -649,8 +695,13 @@ class AppStudioPluginImpl {
         return teamsAppAdmin;
     }
     async grantPermission(ctx, userInfo) {
-        var _a;
-        const appStudioToken = await ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.appStudioToken) === null || _a === void 0 ? void 0 : _a.getAccessToken());
+        const appStudioTokenRes = await (ctx === null || ctx === void 0 ? void 0 : ctx.m365TokenProvider.getAccessToken({
+            scopes: common_1.AppStudioScopes,
+        }));
+        if (appStudioTokenRes.isErr()) {
+            throw appStudioTokenRes.error;
+        }
+        const appStudioToken = appStudioTokenRes.value;
         const teamsAppId = await this.getTeamsAppId(ctx, false);
         if (!teamsAppId) {
             const msgs = errors_1.AppStudioError.GrantPermissionFailedError.message(constants_2.ErrorMessages.GetConfigError(constants_2.Constants.TEAMS_APP_ID, constants_1.PluginNames.APPST));
@@ -674,7 +725,7 @@ class AppStudioPluginImpl {
         return result;
     }
     async beforePublish(ctx, appDirectory, manifestString, update) {
-        var _a, _b, _c, _d;
+        var _a, _b;
         const manifest = JSON.parse(manifestString);
         const publishProgress = (_a = ctx.ui) === null || _a === void 0 ? void 0 : _a.createProgressBar(`Publishing ${manifest.name.short}`, 3);
         try {
@@ -694,7 +745,13 @@ class AppStudioPluginImpl {
             if (appDefinitionRes.isErr()) {
                 throw appDefinitionRes.error;
             }
-            let appStudioToken = await ((_b = ctx === null || ctx === void 0 ? void 0 : ctx.appStudioToken) === null || _b === void 0 ? void 0 : _b.getAccessToken());
+            const appStudioTokenRes = await (ctx === null || ctx === void 0 ? void 0 : ctx.m365TokenProvider.getAccessToken({
+                scopes: common_1.AppStudioScopes,
+            }));
+            if (appStudioTokenRes.isErr()) {
+                throw appStudioTokenRes.error;
+            }
+            const appStudioToken = appStudioTokenRes.value;
             const colorIconContent = manifest.icons.color
                 ? (await fs.readFile(`${appDirectory}/${manifest.icons.color}`)).toString("base64")
                 : undefined;
@@ -704,8 +761,8 @@ class AppStudioPluginImpl {
             try {
                 const app = await appStudio_1.AppStudioClient.updateApp(remoteTeamsAppId, appDefinitionRes.value, appStudioToken, undefined, colorIconContent, outlineIconContent);
                 if (app.updatedAt) {
-                    (_c = ctx.envInfo.state
-                        .get(constants_1.PluginNames.APPST)) === null || _c === void 0 ? void 0 : _c.set(constants_2.Constants.TEAMS_APP_UPDATED_AT, new Date(app.updatedAt).getTime());
+                    (_b = ctx.envInfo.state
+                        .get(constants_1.PluginNames.APPST)) === null || _b === void 0 ? void 0 : _b.set(constants_2.Constants.TEAMS_APP_UPDATED_AT, new Date(app.updatedAt).getTime());
                 }
             }
             catch (e) {
@@ -718,7 +775,6 @@ class AppStudioPluginImpl {
             await (publishProgress === null || publishProgress === void 0 ? void 0 : publishProgress.next(localizeUtils_1.getLocalizedString("plugins.appstudio.publishProgressBuild", appDirectory)));
             const appPackage = await this.buildTeamsAppPackage(ctx, false);
             const appContent = await fs.readFile(appPackage);
-            appStudioToken = await ((_d = ctx.appStudioToken) === null || _d === void 0 ? void 0 : _d.getAccessToken());
             await (publishProgress === null || publishProgress === void 0 ? void 0 : publishProgress.next(localizeUtils_1.getLocalizedString("plugins.appstudio.publishProgressPublish", manifest.name.short)));
             if (update) {
                 // Update existing app in App Catalog
@@ -826,9 +882,10 @@ class AppStudioPluginImpl {
      * Refer to AppDefinitionProfile.cs
      */
     async convertToAppDefinition(ctx, appManifest, ignoreIcon) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
         const appDefinition = {
             appName: appManifest.name.short,
-            validDomains: appManifest.validDomains,
+            validDomains: appManifest.validDomains || [],
         };
         appDefinition.showLoadingIndicator = appManifest.showLoadingIndicator;
         appDefinition.isFullScreen = appManifest.isFullScreen;
@@ -847,11 +904,43 @@ class AppStudioPluginImpl {
         appDefinition.termsOfUseUrl = appManifest.developer.termsOfUseUrl;
         appDefinition.shortDescription = appManifest.description.short;
         appDefinition.longDescription = appManifest.description.full;
-        appDefinition.staticTabs = appManifest.staticTabs;
-        appDefinition.configurableTabs = appManifest.configurableTabs;
+        appDefinition.staticTabs = (_a = appManifest.staticTabs) === null || _a === void 0 ? void 0 : _a.map((x) => {
+            var _a, _b, _c, _d;
+            return {
+                objectId: x.objectId,
+                entityId: x.entityId,
+                name: (_a = x.name) !== null && _a !== void 0 ? _a : "",
+                contentUrl: (_b = x.contentUrl) !== null && _b !== void 0 ? _b : "",
+                websiteUrl: (_c = x.websiteUrl) !== null && _c !== void 0 ? _c : "",
+                scopes: x.scopes,
+                context: (_d = x.context) !== null && _d !== void 0 ? _d : [],
+            };
+        });
+        appDefinition.configurableTabs = (_b = appManifest.configurableTabs) === null || _b === void 0 ? void 0 : _b.map((x) => {
+            var _a, _b, _c, _d;
+            return {
+                objectId: x.objectId,
+                configurationUrl: x.configurationUrl,
+                canUpdateConfiguration: (_a = x.canUpdateConfiguration) !== null && _a !== void 0 ? _a : false,
+                scopes: x.scopes,
+                context: (_b = x.context) !== null && _b !== void 0 ? _b : [],
+                sharePointPreviewImage: (_c = x.sharePointPreviewImage) !== null && _c !== void 0 ? _c : "",
+                supportedSharePointHosts: (_d = x.supportedSharePointHosts) !== null && _d !== void 0 ? _d : [],
+            };
+        });
         appDefinition.bots = utils_1.convertToAppDefinitionBots(appManifest);
         appDefinition.messagingExtensions = utils_1.convertToAppDefinitionMessagingExtensions(appManifest);
-        appDefinition.connectors = appManifest.connectors;
+        appDefinition.connectors = (_c = appManifest.connectors) === null || _c === void 0 ? void 0 : _c.map((x) => {
+            var _a;
+            return {
+                connectorId: x.connectorId,
+                configurationUrl: (_a = x.configurationUrl) !== null && _a !== void 0 ? _a : "",
+                name: "",
+                scopes: x.scopes,
+            };
+        });
+        appDefinition.subscriptionOffer = appManifest.subscriptionOffer;
+        appDefinition.graphConnector = appManifest.graphConnector;
         appDefinition.devicePermissions = appManifest.devicePermissions;
         if (appManifest.localizationInfo) {
             let languages = [];
@@ -883,17 +972,47 @@ class AppStudioPluginImpl {
             appDefinition.webApplicationInfoId = appManifest.webApplicationInfo.id;
             appDefinition.webApplicationInfoResource = appManifest.webApplicationInfo.resource;
         }
-        appDefinition.activities = appManifest.activities;
+        appDefinition.activities = {
+            activityTypes: (_e = (_d = appManifest.activities) === null || _d === void 0 ? void 0 : _d.activityTypes) !== null && _e !== void 0 ? _e : [],
+        };
         if (!ignoreIcon && appManifest.icons.color) {
             appDefinition.colorIcon = appManifest.icons.color;
         }
         if (!ignoreIcon && appManifest.icons.outline) {
             appDefinition.outlineIcon = appManifest.icons.outline;
         }
+        appDefinition.configurableProperties = appManifest.configurableProperties;
+        appDefinition.defaultBlockUntilAdminAction = appManifest.defaultBlockUntilAdminAction;
+        appDefinition.defaultInstallScope = appManifest.defaultInstallScope;
+        appDefinition.defaultGroupCapability = appManifest.defaultGroupCapability;
+        appDefinition.meetingExtensionDefinition = {
+            scenes: (_g = (_f = appManifest.meetingExtensionDefinition) === null || _f === void 0 ? void 0 : _f.scenes) !== null && _g !== void 0 ? _g : [],
+        };
+        appDefinition.publisherDocsUrl = appManifest.publisherDocsUrl;
+        if ((_j = (_h = appManifest.authorization) === null || _h === void 0 ? void 0 : _h.permissions) === null || _j === void 0 ? void 0 : _j.resourceSpecific) {
+            appDefinition.authorization = {
+                permissions: {
+                    resourceSpecific: appManifest.authorization.permissions.resourceSpecific.map((x) => {
+                        let type;
+                        switch (x.type) {
+                            case "Application":
+                                type = appPermissionNodeItemType_1.AppPermissionNodeItemType.Application;
+                                break;
+                            case "Delegated":
+                                type = appPermissionNodeItemType_1.AppPermissionNodeItemType.Delegated;
+                        }
+                        return {
+                            name: x.name,
+                            type: type,
+                        };
+                    }),
+                    orgWide: [],
+                },
+            };
+        }
         return teamsfx_api_1.ok(appDefinition);
     }
     async createApp(ctx, isLocalDebug) {
-        var _a;
         const appDirectory = await common_1.getAppDirectory(ctx.root);
         const status = await fs.lstat(appDirectory);
         if (!status.isDirectory()) {
@@ -922,7 +1041,13 @@ class AppStudioPluginImpl {
         zip.addLocalFile(colorFile);
         zip.addLocalFile(outlineFile);
         const archivedFile = zip.toBuffer();
-        const appStudioToken = await ((_a = ctx === null || ctx === void 0 ? void 0 : ctx.appStudioToken) === null || _a === void 0 ? void 0 : _a.getAccessToken());
+        const appStudioTokenRes = await (ctx === null || ctx === void 0 ? void 0 : ctx.m365TokenProvider.getAccessToken({
+            scopes: common_1.AppStudioScopes,
+        }));
+        if (appStudioTokenRes.isErr()) {
+            return teamsfx_api_1.err(appStudioTokenRes.error);
+        }
+        const appStudioToken = appStudioTokenRes.value;
         try {
             const appDefinition = await appStudio_1.AppStudioClient.createApp(archivedFile, appStudioToken, ctx.logProvider);
             return teamsfx_api_1.ok(appDefinition);
@@ -1102,8 +1227,7 @@ class AppStudioPluginImpl {
                 },
             },
         };
-        mustache_1.default.escape = (value) => value;
-        manifestString = mustache_1.default.render(manifestString, view);
+        manifestString = utils_3.renderTemplate(manifestString, view);
         const tokens = [
             ...new Set(mustache_1.default.parse(manifestString)
                 .filter((x) => {
@@ -1175,8 +1299,7 @@ class AppStudioPluginImpl {
                 },
             },
         };
-        mustache_1.default.escape = (value) => value;
-        manifestString = mustache_1.default.render(manifestString, view);
+        manifestString = utils_3.renderTemplate(manifestString, view);
         return manifestString;
     }
 }