npm - @microsoft/teamsfx-core - Versions diffs - 1.11.0 → 1.11.1-alpha.10d9b00a6.0 - Mend

@microsoft/teamsfx-core 1.11.0 → 1.11.1-alpha.10d9b00a6.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (549) hide show

package/build/core/middleware/questionModelV3.js CHANGED Viewed

@@ -3,10 +3,19 @@
 // Licensed under the MIT license.
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuestionModelMW_V3 = void 0;
+const tslib_1 = require("tslib");
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const path = tslib_1.__importStar(require("path"));
+const constants_1 = require("../../common/constants");
 const localizeUtils_1 = require("../../common/localizeUtils");
+const projectSettingsHelperV3_1 = require("../../common/projectSettingsHelperV3");
+const tools_1 = require("../../common/tools");
+const constants_2 = require("../../plugins/resource/appstudio/constants");
 const question_1 = require("../../plugins/resource/bot/question");
 const question_2 = require("../../plugins/solution/fx-solution/question");
+const utils_1 = require("../../plugins/solution/fx-solution/v2/utils");
+const error_1 = require("../error");
 const globalVars_1 = require("../globalVars");
 const question_3 = require("../question");
 const envInfoLoader_1 = require("./envInfoLoader");
@@ -23,12 +32,15 @@ const QuestionModelMW_V3 = async (ctx, next) => {
     else if (method === "executeUserTaskV3") {
         const func = ctx.arguments[0];
         if (func.method === "addFeature") {
-            getQuestionRes = await getQuestionsForAddFeature(inputs);
+            getQuestionRes = await getQuestionsForAddFeature(ctx.contextV2, inputs);
         }
     }
     else if (method === "provisionResourcesV3") {
         getQuestionRes = await envInfoLoader_1.getQuestionsForTargetEnv(inputs);
     }
+    else if (method === "deployArtifactsV3") {
+        getQuestionRes = await getQuestionsForDeploy(ctx.contextV2, ctx.envInfoV3, inputs);
+    }
     if (getQuestionRes.isErr()) {
         globalVars_1.TOOLS === null || globalVars_1.TOOLS === void 0 ? void 0 : globalVars_1.TOOLS.logProvider.error(`[core] failed to get questions for ${method}: ${getQuestionRes.error.message}`);
         ctx.result = teamsfx_api_1.err(getQuestionRes.error);
@@ -74,14 +86,122 @@ async function createProjectQuestionV3(inputs) {
     sampleNode.addChild(new teamsfx_api_1.QTreeNode(question_3.QuestionRootFolder));
     return teamsfx_api_1.ok(node.trim());
 }
-// for demo only
-async function getQuestionsForAddFeature(inputs) {
+async function getQuestionsForDeploy(ctx, envInfo, inputs) {
+    const isDynamicQuestion = teamsfx_api_1.DynamicPlatforms.includes(inputs.platform);
+    const projectSetting = ctx.projectSetting;
+    if (isDynamicQuestion) {
+        const hasAzureResource = projectSettingsHelperV3_1.hasAzureResourceV3(projectSetting);
+        const provisioned = utils_1.checkWetherProvisionSucceeded(envInfo.state);
+        if (hasAzureResource && !provisioned) {
+            return teamsfx_api_1.err(new teamsfx_api_1.UserError({
+                source: "fx",
+                name: "CannotDeployBeforeProvision",
+                message: localizeUtils_1.getDefaultString("core.deploy.FailedToDeployBeforeProvision"),
+                displayMessage: localizeUtils_1.getLocalizedString("core.deploy.FailedToDeployBeforeProvision"),
+                helpLink: constants_1.HelpLinks.WhyNeedProvision,
+            }));
+        }
+        const selectComponentsQuestion = {
+            name: "deploy-plugin",
+            title: "Select component(s) to deploy",
+            type: "multiSelect",
+            skipSingleOption: false,
+            staticOptions: [],
+            default: [],
+        };
+        selectComponentsQuestion.staticOptions = projectSetting.components
+            .filter((component) => component.build && component.hosting)
+            .map((component) => {
+            const item = {
+                id: component.name,
+                label: component.name,
+                cliName: component.name,
+            };
+            return item;
+        });
+        if (selectComponentsQuestion.staticOptions.length === 0) {
+            return teamsfx_api_1.err(new error_1.NoCapabilityFoundError(teamsfx_api_1.Stage.deploy));
+        }
+        return teamsfx_api_1.ok(new teamsfx_api_1.QTreeNode(selectComponentsQuestion));
+    }
+    return teamsfx_api_1.ok(undefined);
+}
+async function getQuestionsForAddFeature(ctx, inputs) {
     const question = {
         name: "feature",
         title: localizeUtils_1.getLocalizedString("core.addFeatureQuestion.title"),
         type: "singleSelect",
-        staticOptions: [question_2.AzureResourceSQLNewUI, question_2.BotOptionItem],
+        staticOptions: [],
     };
-    return teamsfx_api_1.ok(new teamsfx_api_1.QTreeNode(question));
+    const options = [];
+    // check capability options
+    const appDir = await tools_1.getAppDirectory(inputs.projectPath);
+    const manifestPath = path.resolve(appDir, constants_2.MANIFEST_TEMPLATE_CONSOLIDATE);
+    const manifest = (await fs_extra_1.default.readJson(manifestPath));
+    const canAddTab = manifest.staticTabs.length < constants_2.STATIC_TABS_MAX_ITEMS;
+    const canAddBot = manifest.bots.length < 1;
+    const canAddME = manifest.composeExtensions.length < 1;
+    const projectSettingsV3 = ctx.projectSetting;
+    if (canAddBot) {
+        options.push(question_2.NotificationOptionItem);
+        options.push(question_2.CommandAndResponseOptionItem);
+    }
+    if (canAddTab) {
+        if (projectSettingsHelperV3_1.hasTab(projectSettingsV3)) {
+            options.push(question_2.TabNewUIOptionItem, question_2.TabNonSsoItem);
+        }
+        else {
+            //if aad is added, display name is SsoTab, otherwise the display name is NonSsoTab
+            if (projectSettingsHelperV3_1.hasAAD(projectSettingsV3)) {
+                options.push(question_2.TabNewUIOptionItem);
+            }
+            else {
+                options.push(question_2.TabNonSsoItem);
+            }
+        }
+    }
+    if (canAddBot) {
+        options.push(question_2.BotNewUIOptionItem);
+    }
+    if (canAddME) {
+        options.push(question_2.MessageExtensionNewUIItem);
+    }
+    // check cloud resource options
+    if (!projectSettingsHelperV3_1.hasAPIM(projectSettingsV3)) {
+        options.push(question_2.AzureResourceApimNewUI);
+    }
+    options.push(question_2.AzureResourceSQLNewUI);
+    if (!projectSettingsHelperV3_1.hasKeyVault(projectSettingsV3)) {
+        options.push(question_2.AzureResourceKeyVaultNewUI);
+    }
+    if (!projectSettingsHelperV3_1.hasAAD(projectSettingsV3)) {
+        options.push(question_2.SingleSignOnOptionItem);
+    }
+    if (projectSettingsHelperV3_1.hasBot(projectSettingsV3) || projectSettingsHelperV3_1.hasFunction(projectSettingsV3)) {
+        options.push(question_2.ApiConnectionOptionItem);
+    }
+    const isCicdAddable = await tools_1.canAddCICDWorkflows(inputs, ctx);
+    if (isCicdAddable) {
+        options.push(question_2.CicdOptionItem);
+    }
+    question.staticOptions = options;
+    const addFeatureNode = new teamsfx_api_1.QTreeNode(question);
+    if (!ctx.projectSetting.programmingLanguage) {
+        // Language
+        const programmingLanguage = new teamsfx_api_1.QTreeNode(question_3.ProgrammingLanguageQuestion);
+        programmingLanguage.condition = {
+            enum: [
+                question_2.NotificationOptionItem.id,
+                question_2.CommandAndResponseOptionItem.id,
+                question_2.TabNewUIOptionItem.id,
+                question_2.TabNonSsoItem.id,
+                question_2.BotNewUIOptionItem.id,
+                question_2.MessageExtensionItem.id,
+                question_2.SingleSignOnOptionItem.id, // adding sso means adding sample codes
+            ],
+        };
+        addFeatureNode.addChild(programmingLanguage);
+    }
+    return teamsfx_api_1.ok(addFeatureNode);
 }
 //# sourceMappingURL=questionModelV3.js.map

package/build/core/middleware/questionModelV3.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"questionModelV3.js","sourceRoot":"","sources":["../../../src/core/middleware/questionModelV3.ts"],"names":[],"mappings":";AAAA,uCAAuC;AACvC,kCAAkC~~;;;~~AAGlC,~~wDAUgC~~;~~AAChC~~,~~8DAAgE~~;~~AAChE~~,kEAAoF;AACpF,~~0EAKqD~~;AACrD,8CAAsC;AACtC,0CASqB;AAErB,mDAA2D;AAE3D;;GAEG;AACI,MAAM,kBAAkB,GAAe,KAAK,EAAE,GAAoB,EAAE,IAAkB,EAAE,EAAE;IAC/F,MAAM,MAAM,GAAW,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,SAAS,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC/D,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAE1B,IAAI,cAAc,GAA2C,gBAAE,CAAC,SAAS,CAAC,CAAC;IAC3E,IAAI,MAAM,KAAK,iBAAiB,EAAE;QAChC,cAAc,GAAG,MAAM,uBAAuB,CAAC,MAAM,CAAC,CAAC;KACxD;SAAM,IAAI,MAAM,KAAK,mBAAmB,EAAE;QACzC,MAAM,IAAI,GAAG,GAAG,CAAC,SAAS,CAAC,CAAC,CAAS,CAAC;QACtC,IAAI,IAAI,CAAC,MAAM,KAAK,YAAY,EAAE;YAChC,cAAc,GAAG,MAAM,yBAAyB,CAAC,MAAM,CAAC,CAAC;~~SAC1D~~;KACF;SAAM,IAAI,MAAM,KAAK,sBAAsB,EAAE;QAC5C,cAAc,GAAG,MAAM,wCAAwB,CAAC,MAAM,CAAC,CAAC;KACzD;IACD,IAAI,cAAc,CAAC,KAAK,EAAE,EAAE;QAC1B,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,KAAK,CACtB,sCAAsC,MAAM,KAAK,cAAc,CAAC,KAAK,CAAC,OAAO,EAAE,CAChF,CAAC;QACF,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC;QACvC,OAAO;KACR;IAED,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,KAAK,CAAC,uCAAuC,MAAM,EAAE,CAAC,CAAC;IAE1E,MAAM,IAAI,GAAG,cAAc,CAAC,KAAK,CAAC;IAClC,IAAI,IAAI,EAAE;QACR,MAAM,GAAG,GAAG,MAAM,sBAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,kBAAK,CAAC,EAAE,EAAE,kBAAK,CAAC,iBAAiB,CAAC,CAAC;QAC5E,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,KAAK,CAAC,2CAA2C,MAAM,EAAE,CAAC,CAAC;YAC9E,GAAG,CAAC,MAAM,GAAG,iBAAG,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;YAC5B,OAAO;SACR;QACD,kBAAK,aAAL,kBAAK,uBAAL,kBAAK,CAAE,WAAW,CAAC,IAAI,CACrB,4CAA4C,MAAM,aAAa,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CACxF,CAAC;KACH;IACD,MAAM,IAAI,EAAE,CAAC;AACf,CAAC,CAAC;~~AAtCW~~,QAAA,kBAAkB,~~sBAsC7B~~;AAEF,KAAK,UAAU,uBAAuB,CACpC,MAAc;IAEd,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,2CAAgC,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC;IAE9E,aAAa;IACb,MAAM,IAAI,GAAG,IAAI,uBAAS,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;IACpB,IAAI,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,2BAAgB,CAAC,EAAE,EAAE,CAAC;IAEjD,eAAe;IACf,MAAM,WAAW,GAAG,0CAA+B,EAAE,CAAC;IACtD,MAAM,OAAO,GAAG,IAAI,uBAAS,CAAC,WAAW,CAAC,CAAC;IAC3C,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAEvB,MAAM,eAAe,GAAG,wCAA6B,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;IACvE,MAAM,WAAW,GAAG,IAAI,uBAAS,CAAC,eAAe,CAAC,CAAC;IACnD,WAAW,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,iCAAsB,CAAC,EAAE,EAAE,CAAC;IAC9D,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,CAAC;IAE9B,WAAW;IACX,MAAM,mBAAmB,GAAG,IAAI,uBAAS,CAAC,sCAA2B,CAAC,CAAC;IACvE,OAAO,CAAC,QAAQ,CAAC,mBAAmB,CAAC,CAAC;IAEtC,IAAI,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,CAAC,CAAC,CAAC;IACjD,IAAI,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,gCAAqB,EAAE,CAAC,CAAC,CAAC;IAEtD,qBAAqB;IACrB,MAAM,UAAU,GAAG,IAAI,uBAAS,CAAC,uBAAY,CAAC,CAAC;IAC/C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,CAAC;IAC1B,UAAU,CAAC,SAAS,GAAG,EAAE,MAAM,EAAE,0BAAe,CAAC,EAAE,EAAE,CAAC;IACtD,UAAU,CAAC,QAAQ,CAAC,IAAI,uBAAS,CAAC,6BAAkB,CAAC,CAAC,CAAC;IACvD,OAAO,gBAAE,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;AACzB,CAAC;AAED,gBAAgB;~~AAChB~~,KAAK,UAAU,yBAAyB,CACtC,MAAc;IAEd,MAAM,QAAQ,GAAyB;QACrC,IAAI,EAAE,SAAS;QACf,KAAK,EAAE,kCAAkB,CAAC,+BAA+B,CAAC;QAC1D,IAAI,EAAE,cAAc;QACpB,aAAa,EAAE,CAAC,~~gCAAqB~~,EAAE,wBAAa,CAAC;~~KACtD~~,CAAC;~~IACF~~,OAAO,~~gBAAE~~,CAAC,IAAI,uBAAS,CAAC,QAAQ,CAAC,CAAC,CAAC;~~AACrC~~,CAAC"}
1	+ {"version":3,"file":"questionModelV3.js","sourceRoot":"","sources":["../../../src/core/middleware/questionModelV3.ts"],"names":[],"mappings":"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"}

package/build/core/question.d.ts CHANGED Viewed

@@ -19,9 +19,10 @@ export declare enum CoreQuestionNames {
     NewResourceGroupName = "newResourceGroupName",
     NewResourceGroupLocation = "newResourceGroupLocation",
     NewTargetEnvName = "newTargetEnvName",
-    ExistingTabEndpoint = "existing-tab-endpoint"
+    ExistingTabEndpoint = "existing-tab-endpoint",
+    SafeProjectName = "safeProjectName"
 }
-export declare const ProjectNamePattern = "^[a-zA-Z][\\da-zA-Z]+$";
+export declare const ProjectNamePattern = "^(?=(.*[\\da-zA-Z]){2})[a-zA-Z][^\"<>:\\?/*|\0-\u001F]*[^\"\\s.<>:\\?/*|\0-\u001F]$";
 export declare function createAppNameQuestion(validateProjectPathExistence?: boolean): TextInputQuestion;
 export declare const DefaultAppNameFunc: FuncQuestion;
 export declare const QuestionRootFolder: FolderQuestion;

package/build/core/question.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../src/core/question.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,cAAc,EACd,UAAU,EACV,QAAQ,EACR,oBAAoB,EACpB,iBAAiB,EACjB,YAAY,EAIZ,mBAAmB,EACpB,MAAM,wBAAwB,CAAC;AA2BhC,oBAAY,iBAAiB;IAC3B,OAAO,aAAa;IACpB,kBAAkB,0BAA0B;IAC5C,MAAM,WAAW;IACjB,WAAW,gBAAgB;IAC3B,mBAAmB,yBAAyB;IAC5C,YAAY,iBAAiB;IAC7B,QAAQ,aAAa;IACrB,QAAQ,aAAa;IACrB,iBAAiB,YAAY;IAC7B,OAAO,YAAY;IACnB,OAAO,YAAY;IACnB,KAAK,UAAU;IACf,QAAQ,aAAa;IACrB,aAAa,kBAAkB;IAC/B,aAAa,kBAAkB;IAC/B,uBAAuB,4BAA4B;IACnD,oBAAoB,yBAAyB;IAC7C,wBAAwB,6BAA6B;IACrD,gBAAgB,qBAAqB;IACrC,mBAAmB,0BAA0B;~~CAC9C~~;AAED,eAAO,MAAM,kBAAkB,~~2BAA2B~~,CAAC;~~AAE3D~~,wBAAgB,qBAAqB,CAAC,4BAA4B,UAAO,GAAG,iBAAiB,CAoC5F;AAED,eAAO,MAAM,kBAAkB,EAAE,YAgBhC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,cAIhC,CAAC;AAEF,eAAO,MAAM,oCAAoC,EAAE,oBAMlD,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,oBAuDzC,CAAC;AAwBF,wBAAgB,uBAAuB,CAAC,CAAC,EACvC,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EACd,QAAQ,EAAE,GAAG,CAAC,CAAC,CAAC,EAChB,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,GACd,GAAG,CAAC,CAAC,CAAC,CAYR;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,OAAO,EAAE,GAAG,CAAC,CAAC,CAAC,GAAG,MAAM,GAAG,SAAS,CAkBvF;AAED,wBAAgB,wBAAwB,IAAI,mBAAmB,CAiC9D;AAED,wBAAgB,yBAAyB,IAAI,oBAAoB,CAchE;AAED,wBAAgB,+BAA+B,IAAI,oBAAoB,CAyBtE;AAED,wBAAgB,oBAAoB,CAAC,MAAM,EAAE,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAkDzE;AAED,wBAAsB,gCAAgC,CACpD,kBAAkB,EAAE,GAAG,CAAC,MAAM,CAAC,EAC/B,mBAAmB,EAAE,GAAG,CAAC,MAAM,CAAC,GAC/B,OAAO,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAkCtB;AACD,eAAO,MAAM,+BAA+B,EAAE,oBAO7C,CAAC;AAEF,wBAAgB,mCAAmC,CAAC,WAAW,EAAE,MAAM,GAAG,iBAAiB,CA+C1F;AAED,eAAO,MAAM,+BAA+B,EAAE,oBAO7C,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,oBAOzC,CAAC;AAEF,eAAO,MAAM,4BAA4B,EAAE,iBAmB1C,CAAC;AAEF,eAAO,MAAM,gCAAgC,EAAE,oBAK9C,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,UAIjC,CAAC;AAEF,eAAO,MAAM,kBAAkB,EAAE,UAIhC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,UAIjC,CAAC;AAEF,eAAO,MAAM,mBAAmB,EAAE,UAIjC,CAAC;AAEF,eAAO,MAAM,gBAAgB,EAAE,UAI9B,CAAC;AAEF,eAAO,MAAM,eAAe,EAAE,UAI7B,CAAC;AAGF,wBAAgB,kBAAkB,IAAI,oBAAoB,CASzD;AAED,wBAAgB,gCAAgC,CAAC,QAAQ,EAAE,QAAQ,GAAG,oBAAoB,CAkBzF;AAED,eAAO,MAAM,YAAY,EAAE,oBAqB1B,CAAC;AAEF,eAAO,MAAM,2BAA2B,EAAE,iBAgBzC,CAAC"}
1	+ {"version":3,"file":"question.d.ts","sourceRoot":"","sources":["../../src/core/question.ts"],"names":[],"mappings":"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"}

package/build/core/question.js CHANGED Viewed

@@ -37,8 +37,9 @@ var CoreQuestionNames;
     CoreQuestionNames["NewResourceGroupLocation"] = "newResourceGroupLocation";
     CoreQuestionNames["NewTargetEnvName"] = "newTargetEnvName";
     CoreQuestionNames["ExistingTabEndpoint"] = "existing-tab-endpoint";
+    CoreQuestionNames["SafeProjectName"] = "safeProjectName";
 })(CoreQuestionNames = exports.CoreQuestionNames || (exports.CoreQuestionNames = {}));
-exports.ProjectNamePattern = "^[a-zA-Z][\\da-zA-Z]+$";
+exports.ProjectNamePattern = '^(?=(.*[\\da-zA-Z]){2})[a-zA-Z][^"<>:\\?/*|\u0000-\u001F]*[^"\\s.<>:\\?/*|\u0000-\u001F]$';
 function createAppNameQuestion(validateProjectPathExistence = true) {
     const question = {
         type: "text",
@@ -454,7 +455,7 @@ exports.ScratchOptionNoVSC = {
     detail: localizeUtils_1.getLocalizedString("core.ScratchOptionNoVSC.detail"),
 };
 exports.RuntimeOptionNodeJs = {
-    id: "nodejs",
+    id: "node",
     label: "Node.js",
     detail: localizeUtils_1.getLocalizedString("core.RuntimeOptionNodeJS.detail"),
 };

package/build/core/question.js.map CHANGED Viewed

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

package/build/plugins/resource/aad/aadAppClient.d.ts CHANGED Viewed

@@ -1,4 +1,4 @@
-import { GraphTokenProvider, PluginContext, v2 } from "@microsoft/teamsfx-api";
+import { M365TokenProvider, PluginContext, v2 } from "@microsoft/teamsfx-api";
 import { AadOwner } from "../../../common/permissionInterface";
 import { IAADDefinition, RequiredResourceAccess } from "./interfaces/IAADDefinition";
 import { ProvisionConfig } from "./utils/configs";
@@ -11,8 +11,8 @@ export declare class AadAppClient {
     static updateAadAppRedirectUri(stage: string, objectId: string, redirectUris: IAADDefinition, skip?: boolean): Promise<void>;
     static updateAadAppIdUri(stage: string, objectId: string, applicationIdUri: string, skip?: boolean): Promise<void>;
     static updateAadAppPermission(stage: string, objectId: string, permissions: RequiredResourceAccess[], skip?: boolean): Promise<void>;
-    static getAadAppUsingManifest(stage: string, objectId: string, clientSecret: string | undefined, oauth2PermissionScopeId: string | undefined, graphTokenProvider?: GraphTokenProvider, envName?: string): Promise<ProvisionConfig>;
-    static getAadApp(stage: string, objectId: string, clientSecret: string | undefined, graphTokenProvider?: GraphTokenProvider, envName?: string, skip?: boolean): Promise<ProvisionConfig>;
+    static getAadAppUsingManifest(stage: string, objectId: string, clientSecret: string | undefined, oauth2PermissionScopeId: string | undefined, m365TokenProvider?: M365TokenProvider, envName?: string): Promise<ProvisionConfig>;
+    static getAadApp(stage: string, objectId: string, clientSecret: string | undefined, m365TokenProvider?: M365TokenProvider, envName?: string, skip?: boolean): Promise<ProvisionConfig>;
     static checkPermission(stage: string, objectId: string, userObjectId: string): Promise<boolean>;
     static grantPermission(ctx: PluginContext | v2.Context, objectId: string, userObjectId: string): Promise<void>;
     static listCollaborator(stage: string, objectId: string): Promise<AadOwner[] | undefined>;

package/build/plugins/resource/aad/aadAppClient.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"aadAppClient.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/aadAppClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,~~kBAAkB~~,EAAE,aAAa,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;~~AACxF~~,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAqB/D,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErF,OAAO,EAAE,eAAe,EAAS,MAAM,iBAAiB,CAAC;AAMzD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AASvD,qBAAa,YAAY;WACH,yBAAyB,CAC3C,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,WAAW,EACrB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC;WAaI,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;WAwBnE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;WAkBzE,yBAAyB,CAC3C,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,WAAW,EACrB,IAAI,UAAQ,GACX,OAAO,CAAC,IAAI,CAAC;WAuBI,uBAAuB,CACzC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,cAAc,EAC5B,IAAI,UAAQ,GACX,OAAO,CAAC,IAAI,CAAC;WAyBI,iBAAiB,CACnC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,IAAI,UAAQ,GACX,OAAO,CAAC,IAAI,CAAC;WAiCI,sBAAsB,CACxC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,sBAAsB,EAAE,EACrC,IAAI,UAAQ,GACX,OAAO,CAAC,IAAI,CAAC;WAkCI,sBAAsB,CACxC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,uBAAuB,EAAE,MAAM,GAAG,SAAS,EAC3C,~~kBAAkB~~,CAAC,EAAE,~~kBAAkB~~,~~EACvC~~,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC;WAgCP,SAAS,CAC3B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,~~kBAAkB~~,CAAC,EAAE,~~kBAAkB~~,~~EACvC~~,OAAO,CAAC,EAAE,MAAM,EAChB,IAAI,UAAQ,GACX,OAAO,CAAC,eAAe,CAAC;WAsCP,eAAe,CACjC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC;WAWC,eAAe,CACjC,GAAG,EAAE,aAAa,GAAG,EAAE,CAAC,OAAO,EAC/B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;WAmBI,gBAAgB,CAClC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC;WAWd,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAwBrF,OAAO,CAAC,MAAM,CAAC,wBAAwB;IA0CvC,OAAO,CAAC,MAAM,CAAC,WAAW;IAsB1B,OAAO,CAAC,MAAM,CAAC,eAAe;IAQ9B,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAMxC,OAAO,CAAC,MAAM,CAAC,sBAAsB;CAKtC"}
1	+ {"version":3,"file":"aadAppClient.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/aadAppClient.ts"],"names":[],"mappings":"AAGA,OAAO,EAAW,iBAAiB,EAAE,aAAa,EAAE,EAAE,EAAE,MAAM,wBAAwB,CAAC;AACvF,OAAO,EAAE,QAAQ,EAAE,MAAM,qCAAqC,CAAC;AAqB/D,OAAO,EAAE,cAAc,EAAE,sBAAsB,EAAE,MAAM,6BAA6B,CAAC;AAErF,OAAO,EAAE,eAAe,EAAS,MAAM,iBAAiB,CAAC;AAMzD,OAAO,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAC;AASvD,qBAAa,YAAY;WACH,yBAAyB,CAC3C,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,WAAW,EACrB,MAAM,EAAE,eAAe,GACtB,OAAO,CAAC,IAAI,CAAC;WAaI,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;WAwBnE,kBAAkB,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,eAAe,GAAG,OAAO,CAAC,IAAI,CAAC;WAkBzE,yBAAyB,CAC3C,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,WAAW,EACrB,IAAI,UAAQ,GACX,OAAO,CAAC,IAAI,CAAC;WAuBI,uBAAuB,CACzC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,cAAc,EAC5B,IAAI,UAAQ,GACX,OAAO,CAAC,IAAI,CAAC;WAyBI,iBAAiB,CACnC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,gBAAgB,EAAE,MAAM,EACxB,IAAI,UAAQ,GACX,OAAO,CAAC,IAAI,CAAC;WAiCI,sBAAsB,CACxC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,WAAW,EAAE,sBAAsB,EAAE,EACrC,IAAI,UAAQ,GACX,OAAO,CAAC,IAAI,CAAC;WAkCI,sBAAsB,CACxC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,uBAAuB,EAAE,MAAM,GAAG,SAAS,EAC3C,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,OAAO,CAAC,EAAE,MAAM,GACf,OAAO,CAAC,eAAe,CAAC;WAgCP,SAAS,CAC3B,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GAAG,SAAS,EAChC,iBAAiB,CAAC,EAAE,iBAAiB,EACrC,OAAO,CAAC,EAAE,MAAM,EAChB,IAAI,UAAQ,GACX,OAAO,CAAC,eAAe,CAAC;WAsCP,eAAe,CACjC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,OAAO,CAAC;WAWC,eAAe,CACjC,GAAG,EAAE,aAAa,GAAG,EAAE,CAAC,OAAO,EAC/B,QAAQ,EAAE,MAAM,EAChB,YAAY,EAAE,MAAM,GACnB,OAAO,CAAC,IAAI,CAAC;WAmBI,gBAAgB,CAClC,KAAK,EAAE,MAAM,EACb,QAAQ,EAAE,MAAM,GACf,OAAO,CAAC,QAAQ,EAAE,GAAG,SAAS,CAAC;WAWd,YAAY,CAAC,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,OAAO,CAAC,GAAG,CAAC,GAAG,OAAO,CAAC,GAAG,CAAC;IAwBrF,OAAO,CAAC,MAAM,CAAC,wBAAwB;IA0CvC,OAAO,CAAC,MAAM,CAAC,WAAW;IAsB1B,OAAO,CAAC,MAAM,CAAC,eAAe;IAQ9B,OAAO,CAAC,MAAM,CAAC,yBAAyB;IAMxC,OAAO,CAAC,MAAM,CAAC,sBAAsB;CAKtC"}

package/build/plugins/resource/aad/aadAppClient.js CHANGED Viewed

@@ -151,14 +151,14 @@ class AadAppClient {
             }
         }
     }
-    static async getAadAppUsingManifest(stage, objectId, clientSecret, oauth2PermissionScopeId, graphTokenProvider, envName) {
+    static async getAadAppUsingManifest(stage, objectId, clientSecret, oauth2PermissionScopeId, m365TokenProvider, envName) {
         var _a;
         let manifest;
         try {
             manifest = (await this.retryHanlder(stage, () => aadAppManifestManager_1.AadAppManifestManager.getAadAppManifest(tokenProvider_1.TokenProvider.token, objectId)));
         }
         catch (error) {
-            const tenantId = await configs_1.Utils.getCurrentTenantId(graphTokenProvider);
+            const tenantId = await configs_1.Utils.getCurrentTenantId(m365TokenProvider);
             const fileName = configs_1.Utils.getConfigFileName(envName);
             throw AadAppClient.handleError(error, errors_1.GetAppError, objectId, tenantId, fileName);
         }
@@ -178,7 +178,7 @@ class AadAppClient {
         config.password = clientSecret;
         return config;
     }
-    static async getAadApp(stage, objectId, clientSecret, graphTokenProvider, envName, skip = false) {
+    static async getAadApp(stage, objectId, clientSecret, m365TokenProvider, envName, skip = false) {
         var _a, _b, _c, _d;
         let getAppObject;
         try {
@@ -190,7 +190,7 @@ class AadAppClient {
             }
         }
         catch (error) {
-            const tenantId = await configs_1.Utils.getCurrentTenantId(graphTokenProvider);
+            const tenantId = await configs_1.Utils.getCurrentTenantId(m365TokenProvider);
             const fileName = configs_1.Utils.getConfigFileName(envName);
             throw AadAppClient.handleError(error, errors_1.GetAppError, objectId, tenantId, fileName);
         }

package/build/plugins/resource/aad/aadAppClient.js.map CHANGED Viewed

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

package/build/plugins/resource/aad/plugin.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,OAAO,EACP,WAAW,EACX,aAAa,EACb,MAAM,EACP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAiB,MAAM,WAAW,CAAC;AA0CrD,OAAO,EACL,cAAc,EACd,sBAAsB,EAEvB,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAI1D,OAAO,EAAE,WAAW,EAAqB,MAAM,0BAA0B,CAAC;AAU1E,qBAAa,kBAAkB;IAChB,SAAS,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAsFvE,sBAAsB,CACjC,GAAG,EAAE,aAAa,EAClB,YAAY,UAAQ,GACnB,OAAO,CAAC,SAAS,CAAC;IAyErB,OAAO,CAAC,kBAAkB;IAoBnB,uBAAuB,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,SAAS;IA4CtE,aAAa,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IA4D3E,0BAA0B,CACrC,GAAG,EAAE,aAAa,EAClB,YAAY,UAAQ,GACnB,OAAO,CAAC,SAAS,CAAC;IA2CR,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAwCxD,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IA+B5D,eAAe,CAC1B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;~~IA8BpC~~,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;~~IAyB1E~~,eAAe,CAC1B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;~~WA0BnC~~,eAAe,CAC3B,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,QAAQ,EAAE,MAAM;mBAyBG,0BAA0B;WA8CjC,eAAe,CAC3B,iBAAiB,EAAE,MAAM,EACzB,WAAW,CAAC,EAAE,WAAW,GACxB,sBAAsB,EAAE;IA6B3B,OAAO,CAAC,MAAM,CAAC,8BAA8B;IAyHhC,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAUhD,MAAM,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAiCzD,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC;YAgC7D,8BAA8B;IAU5C,OAAO,CAAC,sBAAsB;CAmB/B"}
1	+ {"version":3,"file":"plugin.d.ts","sourceRoot":"","sources":["../../../../src/plugins/resource/aad/plugin.ts"],"names":[],"mappings":"AAGA,OAAO,EAIL,OAAO,EACP,WAAW,EACX,aAAa,EACb,MAAM,EACP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,SAAS,EAAiB,MAAM,WAAW,CAAC;AA0CrD,OAAO,EACL,cAAc,EACd,sBAAsB,EAEvB,MAAM,6BAA6B,CAAC;AAQrC,OAAO,EAAE,QAAQ,EAAE,kBAAkB,EAAE,MAAM,qCAAqC,CAAC;AACnF,OAAO,EAAE,OAAO,EAAE,MAAM,iCAAiC,CAAC;AAI1D,OAAO,EAAE,WAAW,EAAqB,MAAM,0BAA0B,CAAC;AAU1E,qBAAa,kBAAkB;IAChB,SAAS,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IAsFvE,sBAAsB,CACjC,GAAG,EAAE,aAAa,EAClB,YAAY,UAAQ,GACnB,OAAO,CAAC,SAAS,CAAC;IAyErB,OAAO,CAAC,kBAAkB;IAoBnB,uBAAuB,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,SAAS;IA4CtE,aAAa,CAAC,GAAG,EAAE,aAAa,EAAE,YAAY,UAAQ,GAAG,OAAO,CAAC,SAAS,CAAC;IA4D3E,0BAA0B,CACrC,GAAG,EAAE,aAAa,EAClB,YAAY,UAAQ,GACnB,OAAO,CAAC,SAAS,CAAC;IA2CR,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAwCxD,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IA+B5D,eAAe,CAC1B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;IA2BpC,gBAAgB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAC;IAsB1E,eAAe,CAC1B,GAAG,EAAE,aAAa,EAClB,QAAQ,EAAE,OAAO,GAChB,OAAO,CAAC,MAAM,CAAC,kBAAkB,EAAE,EAAE,OAAO,CAAC,CAAC;WAuBnC,eAAe,CAC3B,gBAAgB,EAAE,MAAM,GAAG,SAAS,EACpC,WAAW,EAAE,MAAM,GAAG,SAAS,EAC/B,QAAQ,EAAE,MAAM;mBAyBG,0BAA0B;WA8CjC,eAAe,CAC3B,iBAAiB,EAAE,MAAM,EACzB,WAAW,CAAC,EAAE,WAAW,GACxB,sBAAsB,EAAE;IA6B3B,OAAO,CAAC,MAAM,CAAC,8BAA8B;IAyHhC,QAAQ,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,SAAS,CAAC;IAUhD,MAAM,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,MAAM,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;IAiCzD,oBAAoB,CAAC,GAAG,EAAE,aAAa,GAAG,OAAO,CAAC,WAAW,CAAC;YAgC7D,8BAA8B;IAU5C,OAAO,CAAC,sBAAsB;CAmB/B"}

package/build/plugins/resource/aad/plugin.js CHANGED Viewed

@@ -37,7 +37,7 @@ class AadAppForTeamsImpl {
         const telemetryMessage = isLocalDebug
             ? constants_1.Messages.EndLocalDebug.telemetry
             : constants_1.Messages.EndProvision.telemetry;
-        await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken });
+        await tokenProvider_1.TokenProvider.init({ m365: ctx.m365TokenProvider });
         // Move objectId etc. from input to output.
         const skip = configs_1.Utils.skipAADProvision(ctx, isLocalDebug ? (tools_1.isConfigUnifyEnabled() ? false : true) : false);
         dialog_1.DialogUtils.init(ctx.ui, constants_1.ProgressTitle.Provision, constants_1.ProgressTitle.ProvisionSteps);
@@ -48,7 +48,7 @@ class AadAppForTeamsImpl {
         if (config.objectId) {
             if (!skip) {
                 await ((_b = dialog_1.DialogUtils.progress) === null || _b === void 0 ? void 0 : _b.next(constants_1.ProgressDetail.GetAadApp));
-                config = await aadAppClient_1.AadAppClient.getAadApp(telemetryMessage, config.objectId, config.password, ctx.graphTokenProvider, isLocalDebug
+                config = await aadAppClient_1.AadAppClient.getAadApp(telemetryMessage, config.objectId, config.password, ctx.m365TokenProvider, isLocalDebug
                     ? tools_1.isConfigUnifyEnabled()
                         ? ctx.envInfo.envName
                         : undefined
@@ -82,7 +82,7 @@ class AadAppForTeamsImpl {
         const telemetryMessage = isLocalDebug
             ? constants_1.Messages.EndLocalDebug.telemetry
             : constants_1.Messages.EndProvision.telemetry;
-        await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken });
+        await tokenProvider_1.TokenProvider.init({ m365: ctx.m365TokenProvider });
         // Move objectId etc. from input to output.
         const skip = configs_1.Utils.skipAADProvision(ctx, false);
         dialog_1.DialogUtils.init(ctx.ui, constants_1.ProgressTitle.Provision, constants_1.ProgressTitle.ProvisionSteps);
@@ -94,7 +94,7 @@ class AadAppForTeamsImpl {
             const existingOauth2PermissionScopeId = (_b = ctx.envInfo.config.auth) === null || _b === void 0 ? void 0 : _b.accessAsUserScopeId;
             if (!skip || !existingOauth2PermissionScopeId) {
                 await ((_c = dialog_1.DialogUtils.progress) === null || _c === void 0 ? void 0 : _c.next(constants_1.ProgressDetail.GetAadApp));
-                config = await aadAppClient_1.AadAppClient.getAadAppUsingManifest(telemetryMessage, manifest.id, config.password, await this.getScopeIdForTeams(manifest), ctx.graphTokenProvider, ctx.envInfo.envName);
+                config = await aadAppClient_1.AadAppClient.getAadAppUsingManifest(telemetryMessage, manifest.id, config.password, await this.getScopeIdForTeams(manifest), ctx.m365TokenProvider, ctx.envInfo.envName);
                 (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(constants_1.Messages.getLog(constants_1.Messages.GetAadAppSuccess));
             }
         }
@@ -172,7 +172,7 @@ class AadAppForTeamsImpl {
         configs_1.Utils.addLogAndTelemetryWithLocalDebug(ctx.logProvider, constants_1.Messages.StartPostProvision, constants_1.Messages.StartPostLocalDebug, isLocalDebug);
         const skip = configs_1.Utils.skipAADProvision(ctx, isLocalDebug ? (tools_1.isConfigUnifyEnabled() ? false : true) : false);
         dialog_1.DialogUtils.init(ctx.ui, constants_1.ProgressTitle.PostProvision, constants_1.ProgressTitle.PostProvisionSteps);
-        await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken });
+        await tokenProvider_1.TokenProvider.init({ m365: ctx.m365TokenProvider });
         const config = new configs_1.PostProvisionConfig(isLocalDebug ? (tools_1.isConfigUnifyEnabled() ? false : true) : false);
         config.restoreConfigFromContext(ctx);
         await ((_a = dialog_1.DialogUtils.progress) === null || _a === void 0 ? void 0 : _a.start(constants_1.ProgressDetail.Starting));
@@ -193,7 +193,7 @@ class AadAppForTeamsImpl {
         configs_1.Utils.addLogAndTelemetryWithLocalDebug(ctx.logProvider, constants_1.Messages.StartPostProvision, constants_1.Messages.StartPostLocalDebug, isLocalDebug);
         const skip = configs_1.Utils.skipAADProvision(ctx, false);
         dialog_1.DialogUtils.init(ctx.ui, constants_1.ProgressTitle.PostProvisionUsingManifest, constants_1.ProgressTitle.PostProvisionUsingManifestSteps);
-        await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken });
+        await tokenProvider_1.TokenProvider.init({ m365: ctx.m365TokenProvider });
         await ((_a = dialog_1.DialogUtils.progress) === null || _a === void 0 ? void 0 : _a.start(constants_1.ProgressDetail.Starting));
         const manifest = await aadAppManifestManager_1.AadAppManifestManager.loadAadManifest(ctx);
         await aadAppClient_1.AadAppClient.updateAadAppUsingManifest(isLocalDebug ? constants_1.Messages.EndPostLocalDebug.telemetry : constants_1.Messages.EndPostProvision.telemetry, manifest, skip);
@@ -217,7 +217,7 @@ class AadAppForTeamsImpl {
         if (!configs) {
             return results_1.ResultFactory.Success();
         }
-        await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken });
+        await tokenProvider_1.TokenProvider.init({ m365: ctx.m365TokenProvider });
         const permissions = AadAppForTeamsImpl.parsePermission(configs[0].permissionRequest, ctx.logProvider);
         await ((_b = dialog_1.DialogUtils.progress) === null || _b === void 0 ? void 0 : _b.start(constants_1.ProgressDetail.Starting));
         await ((_c = dialog_1.DialogUtils.progress) === null || _c === void 0 ? void 0 : _c.next(constants_1.ProgressDetail.UpdatePermission));
@@ -249,7 +249,7 @@ class AadAppForTeamsImpl {
     async checkPermission(ctx, userInfo) {
         telemetry_1.TelemetryUtils.init(ctx);
         configs_1.Utils.addLogAndTelemetry(ctx.logProvider, constants_1.Messages.StartCheckPermission);
-        await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken }, tokenProvider_1.TokenAudience.Graph);
+        await tokenProvider_1.TokenProvider.init({ m365: ctx.m365TokenProvider }, tokenProvider_1.TokenAudience.Graph);
         const config = new configs_1.CheckGrantPermissionConfig();
         await config.restoreConfigFromContext(ctx);
         const userObjectId = userInfo.aadId;
@@ -268,7 +268,7 @@ class AadAppForTeamsImpl {
     async listCollaborator(ctx) {
         telemetry_1.TelemetryUtils.init(ctx);
         configs_1.Utils.addLogAndTelemetry(ctx.logProvider, constants_1.Messages.StartListCollaborator);
-        await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken }, tokenProvider_1.TokenAudience.Graph);
+        await tokenProvider_1.TokenProvider.init({ m365: ctx.m365TokenProvider }, tokenProvider_1.TokenAudience.Graph);
         const objectId = configs_1.ConfigUtils.getAadConfig(ctx, constants_1.ConfigKeys.objectId, false);
         if (!objectId) {
             throw results_1.ResultFactory.SystemError(errors_1.GetConfigError.name, errors_1.ConfigErrorMessages.GetConfigError(constants_1.ConfigKeys.objectId, constants_1.Plugins.pluginName));
@@ -280,7 +280,7 @@ class AadAppForTeamsImpl {
     async grantPermission(ctx, userInfo) {
         telemetry_1.TelemetryUtils.init(ctx);
         configs_1.Utils.addLogAndTelemetry(ctx.logProvider, constants_1.Messages.StartGrantPermission);
-        await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken }, tokenProvider_1.TokenAudience.Graph);
+        await tokenProvider_1.TokenProvider.init({ m365: ctx.m365TokenProvider }, tokenProvider_1.TokenAudience.Graph);
         const config = new configs_1.CheckGrantPermissionConfig(true);
         await config.restoreConfigFromContext(ctx);
         const userObjectId = userInfo.aadId;
@@ -459,7 +459,7 @@ class AadAppForTeamsImpl {
             configs_1.Utils.addLogAndTelemetry(ctx.logProvider, constants_1.Messages.StartDeploy);
             try {
                 dialog_1.DialogUtils.init(ctx.ui, constants_1.ProgressTitle.Deploy, constants_1.ProgressTitle.DeploySteps);
-                await tokenProvider_1.TokenProvider.init({ graph: ctx.graphTokenProvider, appStudio: ctx.appStudioToken });
+                await tokenProvider_1.TokenProvider.init({ m365: ctx.m365TokenProvider });
                 await ((_a = dialog_1.DialogUtils.progress) === null || _a === void 0 ? void 0 : _a.start(constants_1.ProgressDetail.Starting));
                 const skip = configs_1.Utils.skipAADProvision(ctx, false);
                 const manifest = await this.loadAndBuildManifest(ctx);