npm - @microsoft/teamsfx-core - Versions diffs - 1.0.0 → 1.0.1-alpha.389dbb3f.0 - Mend

@microsoft/teamsfx-core 1.0.0 → 1.0.1-alpha.389dbb3f.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 (191) hide show

package/build/plugins/solution/fx-solution/v2/listCollaborator.js ADDED Viewed

@@ -0,0 +1,202 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.listCollaborator = exports.executeListCollaboratorV1 = exports.executeListCollaboratorV2 = void 0;
+const teamsfx_api_1 = require("@microsoft/teamsfx-api");
+const common_1 = require("../../../../common");
+const constants_1 = require("../constants");
+const util_1 = require("../utils/util");
+const executor_1 = require("../executor");
+const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
+const executor_2 = require("./executor");
+const collaborationUtil_1 = require("./collaborationUtil");
+const utils_1 = require("./utils");
+const typedi_1 = require("typedi");
+const utils4v2_1 = require("../../../resource/utils4v2");
+const __1 = require("..");
+async function executeListCollaboratorV2(ctx, inputs, envInfo, tokenProvider, userInfo) {
+    const plugins = [
+        typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AppStudioPlugin),
+    ];
+    if (collaborationUtil_1.CollaborationUtil.AadResourcePluginsActivated(ctx)) {
+        plugins.push(typedi_1.Container.get(ResourcePluginContainer_1.ResourcePluginsV2.AadPlugin));
+    }
+    const thunks = plugins
+        .filter((plugin) => !!plugin.listCollaborator)
+        .map((plugin) => {
+        return {
+            pluginName: `${plugin.name}`,
+            taskName: "listCollaborator",
+            thunk: () =>
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+            plugin.listCollaborator(ctx, inputs, envInfo, tokenProvider, userInfo),
+        };
+    });
+    const results = await executor_2.executeThunks(thunks, ctx.logProvider);
+    const errors = [];
+    for (const r of results) {
+        if (r.isErr()) {
+            errors.push(r);
+        }
+    }
+    return [results, errors];
+}
+exports.executeListCollaboratorV2 = executeListCollaboratorV2;
+async function executeListCollaboratorV1(ctx, userInfo) {
+    const plugins = [typedi_1.Container.get(ResourcePluginContainer_1.ResourcePlugins.AppStudioPlugin)];
+    if (collaborationUtil_1.CollaborationUtil.AadResourcePluginsActivated(ctx)) {
+        plugins.push(typedi_1.Container.get(ResourcePluginContainer_1.ResourcePlugins.AadPlugin));
+    }
+    const pluginsWithCtx = utils_1.getPluginAndContextArray(ctx, plugins);
+    const listCollaboratorWithCtx = pluginsWithCtx.map(([plugin, context]) => {
+        return [
+            (plugin === null || plugin === void 0 ? void 0 : plugin.listCollaborator)
+                ? (ctx) => plugin.listCollaborator.bind(plugin)(ctx, userInfo)
+                : undefined,
+            context,
+            plugin.name,
+        ];
+    });
+    const results = await executor_1.executeConcurrently("", listCollaboratorWithCtx);
+    const errors = [];
+    for (const result of results) {
+        if (result.isErr()) {
+            errors.push(result);
+        }
+    }
+    return [results, errors];
+}
+exports.executeListCollaboratorV1 = executeListCollaboratorV1;
+async function listCollaboratorImpl(param, envState, envName, telemetryReporter, ui, graphTokenProvider, logProvider, platform) {
+    var _a, _b, _c, _d, _e, _f, _g;
+    telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.ListCollaboratorStart, {
+        [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+    });
+    const result = await collaborationUtil_1.CollaborationUtil.getCurrentUserInfo(graphTokenProvider);
+    if (result.isErr()) {
+        return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ListCollaborator, result.error, telemetryReporter));
+    }
+    const stateResult = collaborationUtil_1.CollaborationUtil.getCurrentCollaborationState(envState, result.value);
+    if (stateResult.state != common_1.CollaborationState.OK) {
+        if (platform === teamsfx_api_1.Platform.CLI) {
+            ui === null || ui === void 0 ? void 0 : ui.showMessage("warn", stateResult.message, false);
+        }
+        else if (platform === teamsfx_api_1.Platform.VSCode) {
+            logProvider === null || logProvider === void 0 ? void 0 : logProvider.warning(stateResult.message);
+        }
+        return teamsfx_api_1.ok({
+            state: stateResult.state,
+            message: stateResult.message,
+        });
+    }
+    const userInfo = result.value;
+    if (!envName) {
+        return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ListCollaborator, teamsfx_api_1.returnSystemError(new Error("Failed to get env name."), constants_1.SolutionSource, constants_1.SolutionError.FailedToGetEnvName), telemetryReporter));
+    }
+    const [results, errors] = param.apiVersion === 1
+        ? await executeListCollaboratorV1(param.ctx, userInfo)
+        : await executeListCollaboratorV2(param.ctx, param.inputs, param.envInfo, param.tokenProvider, userInfo);
+    let errorMsg = "";
+    if (errors.length > 0) {
+        errorMsg += `Failed to list collaborator for the project.\n Error details: \n`;
+        for (const fxError of errors) {
+            errorMsg += fxError.error.message + "\n";
+        }
+    }
+    if (errorMsg) {
+        return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ListCollaborator, teamsfx_api_1.returnUserError(new Error(errorMsg), constants_1.SolutionSource, constants_1.SolutionError.FailedToListCollaborator), telemetryReporter));
+    }
+    const isAadActivated = collaborationUtil_1.CollaborationUtil.AadResourcePluginsActivated(param.ctx);
+    const teamsAppOwners = results[0].isErr() ? [] : results[0].value;
+    const aadOwners = (results[1] && results[1].isErr()) || !results[1] ? [] : results[1].value;
+    const collaborators = [];
+    const teamsAppId = (_b = (_a = teamsAppOwners[0]) === null || _a === void 0 ? void 0 : _a.resourceId) !== null && _b !== void 0 ? _b : "";
+    const aadAppId = (_d = (_c = aadOwners[0]) === null || _c === void 0 ? void 0 : _c.resourceId) !== null && _d !== void 0 ? _d : "";
+    const aadAppTenantId = (_e = envState.get(constants_1.PluginNames.SOLUTION)) === null || _e === void 0 ? void 0 : _e.get(__1.REMOTE_TEAMS_APP_TENANT_ID);
+    for (const teamsAppOwner of teamsAppOwners) {
+        const aadOwner = aadOwners.find((owner) => owner.userObjectId === teamsAppOwner.userObjectId);
+        collaborators.push({
+            // For guest account, aadOwner.userPrincipalName will be user's email, and is easy to read.
+            userPrincipalName: (_g = (_f = aadOwner === null || aadOwner === void 0 ? void 0 : aadOwner.userPrincipalName) !== null && _f !== void 0 ? _f : teamsAppOwner.userPrincipalName) !== null && _g !== void 0 ? _g : teamsAppOwner.userObjectId,
+            userObjectId: teamsAppOwner.userObjectId,
+            isAadOwner: aadOwner ? true : false,
+            aadResourceId: aadOwner ? aadOwner.resourceId : undefined,
+            teamsAppResourceId: teamsAppOwner.resourceId,
+        });
+    }
+    if (platform === teamsfx_api_1.Platform.CLI || platform === teamsfx_api_1.Platform.VSCode) {
+        const message = [
+            { content: `Listing M365 permissions\n`, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+            { content: `Account used to check: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+            { content: userInfo.userPrincipalName + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+            {
+                content: `Starting list all teams app owners for environment: `,
+                color: teamsfx_api_1.Colors.BRIGHT_WHITE,
+            },
+            { content: `${envName}\n`, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+            { content: `Tenant ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+            { content: aadAppTenantId + "\n", color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+            { content: `M365 Teams App (ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE },
+            { content: teamsAppId, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA },
+        ];
+        if (isAadActivated) {
+            message.push({ content: `), SSO AAD App (ID: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE }, { content: aadAppId, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA }, { content: `)\n`, color: teamsfx_api_1.Colors.BRIGHT_WHITE });
+        }
+        else {
+            message.push({ content: ")\n", color: teamsfx_api_1.Colors.BRIGHT_WHITE });
+        }
+        for (const collaborator of collaborators) {
+            message.push({ content: `Teams App Owner: `, color: teamsfx_api_1.Colors.BRIGHT_WHITE }, { content: collaborator.userPrincipalName, color: teamsfx_api_1.Colors.BRIGHT_MAGENTA }, { content: `. `, color: teamsfx_api_1.Colors.BRIGHT_WHITE });
+            if (isAadActivated && !collaborator.isAadOwner) {
+                message.push({ content: `(Not owner of SSO AAD app)`, color: teamsfx_api_1.Colors.BRIGHT_YELLOW });
+            }
+            message.push({ content: "\n", color: teamsfx_api_1.Colors.BRIGHT_WHITE });
+        }
+        if (platform === teamsfx_api_1.Platform.CLI) {
+            ui === null || ui === void 0 ? void 0 : ui.showMessage("info", message, false);
+        }
+        else if (platform === teamsfx_api_1.Platform.VSCode) {
+            logProvider === null || logProvider === void 0 ? void 0 : logProvider.info(message);
+        }
+    }
+    const aadOwnerCount = collaborators.filter((collaborator) => collaborator.aadResourceId && collaborator.isAadOwner).length;
+    telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.ListCollaborator, {
+        [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
+        [constants_1.SolutionTelemetryProperty.Success]: constants_1.SolutionTelemetrySuccess.Yes,
+        [constants_1.SolutionTelemetryProperty.CollaboratorCount]: collaborators.length.toString(),
+        [constants_1.SolutionTelemetryProperty.AadOwnerCount]: aadOwnerCount.toString(),
+        [constants_1.SolutionTelemetryProperty.Env]: common_1.getHashedEnv(envName),
+    });
+    return teamsfx_api_1.ok({
+        collaborators: collaborators,
+        state: common_1.CollaborationState.OK,
+    });
+}
+async function listCollaborator(param) {
+    var _a, _b;
+    if (param.apiVersion === 1) {
+        const envState = param.ctx.envInfo.state;
+        const envName = param.ctx.envInfo.envName;
+        const telemetryReporter = param.ctx.telemetryReporter;
+        const ui = param.ctx.ui;
+        const graphTokenProvider = param.ctx.graphTokenProvider;
+        const logProvider = param.ctx.logProvider;
+        const platform = (_a = param.ctx.answers) === null || _a === void 0 ? void 0 : _a.platform;
+        return listCollaboratorImpl(param, envState, envName, telemetryReporter, ui, graphTokenProvider, logProvider, platform);
+    }
+    else {
+        const configMap = teamsfx_api_1.ConfigMap.fromJSON(param.envInfo.state);
+        if (!configMap) {
+            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`failed to convert profile ${JSON.stringify(param.envInfo.state)}`), constants_1.PluginNames.SOLUTION, constants_1.SolutionError.InternelError));
+        }
+        const envState = utils4v2_1.flattenConfigMap(configMap);
+        const envName = param.envInfo.envName;
+        const telemetryReporter = param.ctx.telemetryReporter;
+        const ui = param.ctx.userInteraction;
+        const graphTokenProvider = param.tokenProvider.graphTokenProvider;
+        const logProvider = param.ctx.logProvider;
+        const platform = (_b = param.inputs) === null || _b === void 0 ? void 0 : _b.platform;
+        return listCollaboratorImpl(param, envState, envName, telemetryReporter, ui, graphTokenProvider, logProvider, platform);
+    }
+}
+exports.listCollaborator = listCollaborator;
+//# sourceMappingURL=listCollaborator.js.map

package/build/plugins/solution/fx-solution/v2/listCollaborator.js.map ADDED Viewed

@@ -0,0 +1 @@

+ {"version":3,"file":"listCollaborator.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/listCollaborator.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/provision.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,aAAa,EACb,IAAI,EACJ,eAAe,EAEhB,MAAM,wBAAwB,CAAC;~~AAmChC~~,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,~~CAkM3D~~;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA8CjG"}
1	+ {"version":3,"file":"provision.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAIN,aAAa,EACb,IAAI,EACJ,eAAe,EAEhB,MAAM,wBAAwB,CAAC;AAyChC,wBAAsB,iBAAiB,CACrC,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,YAAY,CAAC,EAAE,CAAC,SAAS,CAAC,EACtC,aAAa,EAAE,aAAa,GAC3B,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,CAgO3D;AAED,wBAAsB,sBAAsB,CAAC,GAAG,EAAE,eAAe,GAAG,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CA8CjG"}

package/build/plugins/solution/fx-solution/v2/provision.js CHANGED Viewed

@@ -8,17 +8,17 @@ const executor_1 = require("./executor");
 const utils_1 = require("./utils");
 const constants_1 = require("../constants");
 const util = tslib_1.__importStar(require("util"));
-const lodash_1 = require("lodash");
+const lodash_1 = tslib_1.__importStar(require("lodash"));
 const constants_2 = require("../../../../common/constants");
 const adaptor_1 = require("./adaptor");
 const commonQuestions_1 = require("../commonQuestions");
 const arm_1 = require("../arm");
 const typedi_1 = tslib_1.__importDefault(require("typedi"));
 const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
-const lodash_2 = tslib_1.__importDefault(require("lodash"));
 const permissionRequest_1 = require("../../../../core/permissionRequest");
 const core_1 = require("../../../../core");
 const constants_3 = require("../../../resource/appstudio/constants");
+const utils4v2_1 = require("../../../resource/utils4v2");
 async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
     var _a, _b, _c, _d;
     if (inputs.projectPath === undefined) {
@@ -39,7 +39,7 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
             return new teamsfx_api_1.v2.FxFailure(result.error);
         }
     }
-    const newEnvInfo = lodash_2.default.cloneDeep(envInfo);
+    const newEnvInfo = lodash_1.default.cloneDeep(envInfo);
     if (!newEnvInfo.state[constants_1.GLOBAL_CONFIG]) {
         newEnvInfo.state[constants_1.GLOBAL_CONFIG] = { output: {}, secrets: {} };
     }
@@ -57,8 +57,8 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
             return new teamsfx_api_1.v2.FxFailure(consentResult.error);
         }
     }
-    const plugins = utils_1.getSelectedPlugins(azureSolutionSettings);
     const solutionInputs = utils_1.extractSolutionInputs(newEnvInfo.state[constants_1.GLOBAL_CONFIG]["output"]);
+    const plugins = utils_1.getSelectedPlugins(azureSolutionSettings);
     const provisionThunks = plugins
         .filter((plugin) => !lodash_1.isUndefined(plugin.provisionResource))
         .map((plugin) => {
@@ -106,7 +106,7 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
             return new teamsfx_api_1.v2.FxPartialSuccess(utils_1.combineRecords(provisionResult.output), result.error);
         }
     }
-    if (core_1.isV2()) {
+    if (core_1.isV2() && !utils_1.isAzureProject(azureSolutionSettings)) {
         solutionInputs.remoteTeamsAppId =
             newEnvInfo.state[constants_1.PluginNames.APPST]["output"][constants_3.Constants.TEAMS_APP_ID];
     }
@@ -144,13 +144,42 @@ async function provisionResource(ctx, inputs, envInfo, tokenProvider) {
         if (newEnvInfo.state[constants_1.GLOBAL_CONFIG] && newEnvInfo.state[constants_1.GLOBAL_CONFIG][constants_1.ARM_TEMPLATE_OUTPUT]) {
             delete newEnvInfo.state[constants_1.GLOBAL_CONFIG][constants_1.ARM_TEMPLATE_OUTPUT];
         }
+        const url = tools_1.getResourceGroupInPortal(solutionInputs.subscriptionId, solutionInputs.tenantId, solutionInputs.resourceGroupName);
         const msg = util.format(`Success: ${tools_1.getStrings().solution.ProvisionSuccessNotice}`, ctx.projectSetting.appName);
         (_d = ctx.logProvider) === null || _d === void 0 ? void 0 : _d.info(msg);
-        ctx.userInteraction.showMessage("info", msg, false);
+        if (url) {
+            const title = "View Provisioned Resources";
+            ctx.userInteraction.showMessage("info", msg, false, title).then((result) => {
+                const userSelected = result.isOk() ? result.value : undefined;
+                if (userSelected === title) {
+                    ctx.userInteraction.openUrl(url);
+                }
+            });
+        }
+        else {
+            ctx.userInteraction.showMessage("info", msg, false);
+        }
         solutionInputs[constants_1.SOLUTION_PROVISION_SUCCEEDED] = true;
-        const output = configureResourceResult.output;
-        output.push({ name: constants_1.GLOBAL_CONFIG, result: { output: solutionInputs, secrets: {} } });
-        return new teamsfx_api_1.v2.FxSuccess(utils_1.combineRecords(output));
+        const configOutput = configureResourceResult.output;
+        configOutput.push({ name: constants_1.GLOBAL_CONFIG, result: { output: solutionInputs, secrets: {} } });
+        const res1 = utils_1.combineRecords(provisionResult.output);
+        const res2 = utils_1.combineRecords(configOutput);
+        for (const key of Object.keys(res2)) {
+            if (!newEnvInfo.state[key]) {
+                newEnvInfo.state[key].output = res2[key].output;
+            }
+            else {
+                const newOutput = utils4v2_1.assignJsonInc(newEnvInfo.state[key].output, res2[key].output);
+                if (newOutput)
+                    newEnvInfo.state[key].output = newOutput;
+            }
+        }
+        for (const key of Object.keys(newEnvInfo.state)) {
+            if (!res1[key])
+                res1[key] = { output: {}, secrets: {} };
+            res1[key].output = newEnvInfo.state[key].output;
+        }
+        return new teamsfx_api_1.v2.FxSuccess(res1);
     }
 }
 exports.provisionResource = provisionResource;

package/build/plugins/solution/fx-solution/v2/provision.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":";;;;AAAA,wDAYgC;AAChC,~~oDAA8F~~;~~AAC9F~~,yCAAiD;AACjD,mCAOiB;AACjB,~~4CASsB~~;AACtB,mDAA6B;AAC7B,~~mCAAqC~~;~~AACrC~~,4DAAiE;AACjE,uCAAoD;AACpD,wDAA2D;AAC3D,gCAA4C;AAC5C,4DAA+B;AAC/B,wEAA+D;~~AAC~~/D,~~4DAAuB;AAEvB,~~0EAAmF;AACnF,2CAAwD;AACxD,qEAAkE;~~AAE3D~~,KAAK,UAAU,iBAAiB,CACrC,GAAe,EACf,MAAc,EACd,OAAsC,EACtC,aAA4B;;IAE5B,IAAI,MAAM,CAAC,WAAW,KAAK,SAAS,EAAE;QACpC,OAAO,IAAI,gBAAE,CAAC,SAAS,CACrB,+BAAiB,CACf,IAAI,KAAK,CAAC,0BAA0B,CAAC,EACrC,0BAAc,EACd,yBAAa,CAAC,aAAa,CAC5B,CACF,CAAC;KACH;IACD,MAAM,WAAW,GAAW,MAAM,CAAC,WAAW,CAAC;IAE/C,MAAM,qBAAqB,GAAG,gCAAwB,CAAC,GAAG,CAAC,CAAC;IAC5D,2EAA2E;IAC3E,sFAAsF;IACtF,4EAA4E;IAC5E,MAAM,aAAa,CAAC,cAAc,CAAC,cAAc,EAAE,CAAC;IAEpD,IAAI,sBAAc,CAAC,qBAAqB,CAAC,EAAE;QACzC,IAAI,GAAG,CAAC,yBAAyB,KAAK,SAAS,EAAE;YAC/C,GAAG,CAAC,yBAAyB,GAAG,IAAI,iDAA6B,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;SACvF;QACD,MAAM,MAAM,GAAG,MAAM,+BAAuB,CAC1C,qBAAqB,EACrB,GAAG,CAAC,yBAAyB,CAC9B,CAAC;QACF,IAAI,MAAM,CAAC,KAAK,EAAE,EAAE;YAClB,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC;SACvC;KACF;IAED,MAAM,UAAU,GAAc,gBAAC,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IACnD,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,yBAAa,CAAC,EAAE;QACpC,UAAU,CAAC,KAAK,CAAC,yBAAa,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;KAC/D;IACD,IAAI,sBAAc,CAAC,qBAAqB,CAAC,EAAE;QACzC,MAAM,OAAO,GAAG,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC;QAC3C,MAAM,cAAc,GAAG,IAAI,iCAAuB,CAAC,CAAC,GAAG,EAAE,MAAM,EAAE,UAAU,EAAE,aAAa,CAAC,CAAC,CAAC;QAC7F,MAAM,GAAG,GAAG,MAAM,uCAAqB,CACrC,cAAc,EACd,OAAO,EACP,cAAc,CAAC,OAAO,CAAC,KAAK,EAC5B,aAAa,CAAC,oBAAoB,EAClC,MAAM,aAAa,CAAC,cAAc,CAAC,aAAa,EAAE,CACnD,CAAC;QACF,IAAI,GAAG,CAAC,KAAK,EAAE,EAAE;YACf,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC;SACpC;QACD,mFAAmF;QACnF,UAAU,CAAC,KAAK,GAAG,cAAc,CAAC,eAAe,EAAE,CAAC;QACpD,MAAM,aAAa,GAAG,MAAM,sBAAsB,CAAC,cAAc,CAAC,CAAC;QACnE,IAAI,aAAa,CAAC,KAAK,EAAE,EAAE;YACzB,OAAO,IAAI,gBAAE,CAAC,SAAS,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;SAC9C;KACF;IAED,MAAM,~~OAAO~~,GAAG,~~0BAAkB~~,CAAC,~~qBAAqB~~,CAAC,CAAC~~;IAC1D~~,~~MAAM~~,~~cAAc~~,~~GAAG~~,~~6BAAqB~~,CAAC,~~UAAU~~,CAAC,~~KAAK~~,~~CAAC~~,~~yBAAa~~,~~CAAC~~,CAAC,~~QAAQ~~,CAAC,CAAC~~,CAAC~~;~~IACxF~~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~~QACV~~,cAAc,CAAC,gBAAgB;YAC7B,UAAU,CAAC,KAAK,CAAC,uBAAW,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,CAAC,qBAAS,CAAC,YAAY,CAAC,CAAC;KACzE;IACD,MAAM,uBAAuB,GAAG,OAAO;SACpC,MAAM,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,oBAAW,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAC;SAC1D,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE;QACd,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE;YAClC,UAAU,CAAC,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC;SACpC;QAED,OAAO;YACL,UAAU,EAAE,GAAG,MAAM,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,wBAAwB;YAClC,KAAK,EAAE,GAAG,EAAE;YACV,oEAAoE;YACpE,MAAM,CAAC,iBAAkB,CACvB,GAAG,gDACE,MAAM,GAAK,cAAc,KAAE,WAAW,EAAE,WAAW,qCACnD,UAAU,KAAE,KAAK,EAAE,UAAU,CAAC,KAAK,KACxC,aAAa,CACd;SACJ,CAAC;IACJ,CAAC,CAAC,CAAC;IAEL,MAAM,uBAAuB,GAAG,MAAM,8BAAmB,CACvD,uBAAuB,EACvB,GAAG,CAAC,WAAW,CAChB,CAAC;IACF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CACnB,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,yBAAyB,EAAE,6BAAiB,CAAC,QAAQ,CAAC,CACzF,CAAC;IACF,IACE,uBAAuB,CAAC,IAAI,KAAK,SAAS;QAC1C,uBAAuB,CAAC,IAAI,KAAK,gBAAgB,EACjD;QACA,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,mBAAmB,EAAE,GAAG,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;QAC/F,GAAG,CAAC,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QAC3B,cAAc,CAAC,wCAA4B,CAAC,GAAG,KAAK,CAAC;QAErD,IAAI,uBAAuB,CAAC,IAAI,KAAK,SAAS,EAAE;YAC9C,OAAO,uBAAuB,CAAC;SAChC;aAAM;YACL,MAAM,MAAM,GAAG,uBAAuB,CAAC,MAAM,CAAC;YAC9C,MAAM,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,yBAAa,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;YACtF,OAAO,IAAI,gBAAE,CAAC,gBAAgB,CAAC,sBAAc,CAAC,MAAM,CAAC,EAAE,uBAAuB,CAAC,KAAK,CAAC,CAAC;SACvF;KACF;SAAM;QACL,IAAI,UAAU,CAAC,KAAK,CAAC,yBAAa,CAAC,IAAI,UAAU,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,+BAAmB,CAAC,EAAE;YAC3F,OAAO,UAAU,CAAC,KAAK,CAAC,yBAAa,CAAC,CAAC,+BAAmB,CAAC,CAAC;SAC7D;QAED,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CACrB,YAAY,kBAAU,EAAE,CAAC,QAAQ,CAAC,sBAAsB,EAAE,EAC1D,GAAG,CAAC,cAAc,CAAC,OAAO,CAC3B,CAAC;QACF,MAAA,GAAG,CAAC,WAAW,0CAAE,IAAI,CAAC,GAAG,CAAC,CAAC;QAC3B,GAAG,CAAC,eAAe,CAAC,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,CAAC;~~QACpD~~,cAAc,CAAC,wCAA4B,CAAC,GAAG,IAAI,CAAC;QACpD,MAAM,~~MAAM~~,GAAG,uBAAuB,CAAC,MAAM,CAAC;~~QAC9C~~,~~MAAM~~,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,yBAAa,EAAE,MAAM,EAAE,EAAE,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,EAAE,EAAE,EAAE,CAAC,CAAC;~~QAEtF~~,~~OAAO~~,IAAI,~~gBAAE~~,CAAC,~~SAAS~~,CAAC,sBAAc,CAAC,MAAM,CAAC,CAAC,CAAC;~~KACjD~~;AACH,CAAC;~~AAvMD~~,~~8CAuMC~~;AAEM,KAAK,UAAU,sBAAsB,CAAC,GAAoB;;IAC/D,IAAI,qBAAc,EAAE,EAAE;QACpB,8EAA8E;QAC9E,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;KACjB;IAED,MAAM,UAAU,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,oBAAoB,0CAAE,yBAAyB,EAAE,CAAA,CAAC;IAE/E,kDAAkD;IAClD,MAAM,QAAQ,GAAI,UAAkB,CAAC,QAAQ,CAAC,CAAC,CAAE,UAAkB,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;IAClF,MAAM,cAAc,GAAG,MAAA,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAa,CAAC,0CAAE,GAAG,CAAC,2BAAe,CAAW,CAAC;IAC5F,MAAM,gBAAgB,GAAG,MAAA,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,yBAAa,CAAC,0CAAE,GAAG,CAAC,6BAAiB,CAAW,CAAC;IAEhG,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CACrB,kBAAU,EAAE,CAAC,QAAQ,CAAC,sBAAsB,EAC5C,QAAQ,EACR,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,cAAc,CACrD,CAAC;IACF,IAAI,UAAU,GAAG,SAAS,CAAC;IAC3B,IAAI,yBAAiB,EAAE,EAAE;QACvB,MAAM,MAAM,GAAG,IAAI,CAAC,MAAM,CACxB,kBAAU,EAAE,CAAC,QAAQ,CAAC,yBAAyB,EAC/C,GAAG,CAAC,OAAO,CAAC,OAAO,EACnB,QAAQ,EACR,gBAAgB,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,cAAc,CACrD,CAAC;QACF,UAAU,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,EAAE,0CAAE,WAAW,CAAC,MAAM,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA,CAAC;KAC3E;SAAM;QACL,UAAU,GAAG,MAAM,CAAA,MAAA,GAAG,CAAC,EAAE,0CAAE,WAAW,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,WAAW,EAAE,oBAAoB,CAAC,CAAA,CAAC;KAC9F;IACD,MAAM,OAAO,GAAG,CAAA,UAAU,aAAV,UAAU,uBAAV,UAAU,CAAE,IAAI,EAAE,EAAC,CAAC,CAAC,UAAU,CAAC,KAAK,CAAC,CAAC,CAAC,SAAS,CAAC;IAElE,IAAI,OAAO,KAAK,WAAW,EAAE;QAC3B,IAAI,OAAO,KAAK,oBAAoB,EAAE;YACpC,MAAA,GAAG,CAAC,EAAE,0CAAE,OAAO,CAAC,uDAAuD,CAAC,CAAC;SAC1E;QAED,OAAO,iBAAG,CACR,6BAAe,CACb,IAAI,KAAK,CAAC,kBAAU,EAAE,CAAC,QAAQ,CAAC,eAAe,CAAC,EAChD,0BAAc,EACd,kBAAU,EAAE,CAAC,QAAQ,CAAC,eAAe,CACtC,CACF,CAAC;KACH;IACD,OAAO,gBAAE,CAAC,kBAAI,CAAC,CAAC;AAClB,CAAC;AA9CD,wDA8CC"}
1	+ {"version":3,"file":"provision.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/provision.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/solution.d.ts CHANGED Viewed

@@ -14,5 +14,9 @@ export declare class TeamsAppSolutionV2 implements v2.SolutionPlugin {
     createEnv?: (ctx: v2.Context, inputs: Inputs) => Promise<Result<Void, FxError>>;
     getQuestions?: (ctx: v2.Context, inputs: Inputs, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<QTreeNode | undefined, FxError>>;
     getQuestionsForUserTask?: (ctx: v2.Context, inputs: Inputs, func: Func, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<QTreeNode | undefined, FxError>>;
+    grantPermission?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
+    checkPermission?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
+    listCollaborator?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
+    listAllCollaborators?: (ctx: v2.Context, inputs: v2.InputsWithProjectPath, envInfo: DeepReadonly<EnvInfoV2>, tokenProvider: TokenProvider) => Promise<Result<Json, FxError>>;
 }
 //# sourceMappingURL=solution.d.ts.map

package/build/plugins/solution/fx-solution/v2/solution.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EACtB,oBAAoB,EACpB,IAAI,EACJ,OAAO,EACP,MAAM,EACN,IAAI,EACJ,SAAS,EACT,MAAM,EACN,aAAa,EACb,EAAE,EACF,IAAI,EACL,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAAE,YAAY,EAAE,SAAS,EAAE,MAAM,iCAAiC,CAAC;~~AAc1E~~,qBACa,kBAAmB,YAAW,EAAE,CAAC,cAAc;IAC1D,IAAI,SAAuB;IAC3B,WAAW,EAAE,MAAM,CAA8B;IAEjD,kBAAkB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAClE;IACrB,wBAAwB,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAClE;IAE3B,kBAAkB,EAAE,CAClB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,SAAS,EAClB,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,uBAAuB,EAAE,OAAO,CAAC,CAAC,CAAqB;IAEnF,MAAM,CAAC,EAAE,CACP,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,gBAAgB,EAAE,IAAI,EACtB,aAAa,EAAE,oBAAoB,KAChC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAU;IAE7C,kBAAkB,EAAE,CAClB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,EAAE,CAAC,SAAS,EACrB,aAAa,EAAE,sBAAsB,KAClC,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAsB;IACzD,sBAAsB,CAAC,EAAE,CACvB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,aAAa,EAAE,IAAI,EACnB,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAA0B;IAElE,0BAA0B,CAAC,EAAE,CAC3B,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,KACX,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAA8B;IAElF,eAAe,CAAC,EAAE,CAChB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,aAAa,EAAE,IAAI,EACnB,OAAO,EAAE,SAAS,EAClB,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC,CAAmB;IAEzD,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAAa;IAE5F,YAAY,CAAC,EAAE,CACb,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,EAChC,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAAgB;IAEpE,uBAAuB,CAAC,EAAE,CACxB,GAAG,EAAE,EAAE,CAAC,OAAO,EACf,MAAM,EAAE,MAAM,EACd,IAAI,EAAE,IAAI,EACV,OAAO,EAAE,YAAY,CAAC,SAAS,CAAC,EAChC,aAAa,EAAE,aAAa,KACzB,OAAO,CAAC,MAAM,CAAC,SAAS,GAAG,SAAS,EAAE,OAAO,CAAC,CAAC,CAA2B;~~CAChF~~"}
1	+ {"version":3,"file":"solution.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":"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"}

package/build/plugins/solution/fx-solution/v2/solution.js CHANGED Viewed

@@ -5,11 +5,15 @@ const tslib_1 = require("tslib");
 const typedi_1 = require("typedi");
 const constants_1 = require("../../../../common/constants");
 const SolutionPluginContainer_1 = require("../../../../core/SolutionPluginContainer");
+const checkPermission_1 = require("./checkPermission");
 const createEnv_1 = require("./createEnv");
 const deploy_1 = require("./deploy");
 const executeUserTask_1 = require("./executeUserTask");
 const generateResourceTemplate_1 = require("./generateResourceTemplate");
 const getQuestions_1 = require("./getQuestions");
+const grantPermission_1 = require("./grantPermission");
+const listAllCollaborators_1 = require("./listAllCollaborators");
+const listCollaborator_1 = require("./listCollaborator");
 const provision_1 = require("./provision");
 const provisionLocal_1 = require("./provisionLocal");
 const publish_1 = require("./publish");
@@ -29,6 +33,10 @@ let TeamsAppSolutionV2 = class TeamsAppSolutionV2 {
         this.createEnv = createEnv_1.createEnv;
         this.getQuestions = getQuestions_1.getQuestions;
         this.getQuestionsForUserTask = getQuestions_1.getQuestionsForUserTask;
+        this.grantPermission = (ctx, inputs, envInfo, tokenProvider) => grantPermission_1.grantPermission({ apiVersion: 2, ctx, inputs, envInfo, tokenProvider });
+        this.checkPermission = (ctx, inputs, envInfo, tokenProvider) => checkPermission_1.checkPermission({ apiVersion: 2, ctx, inputs, envInfo, tokenProvider });
+        this.listCollaborator = (ctx, inputs, envInfo, tokenProvider) => listCollaborator_1.listCollaborator({ apiVersion: 2, ctx, inputs, envInfo, tokenProvider });
+        this.listAllCollaborators = (ctx, inputs, envInfo, tokenProvider) => listAllCollaborators_1.listAllCollaborators({ apiVersion: 2, ctx, inputs, envInfo, tokenProvider });
     }
 };
 TeamsAppSolutionV2 = tslib_1.__decorate([

package/build/plugins/solution/fx-solution/v2/solution.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":";;;;AAcA,mCAAiC;AACjC,4DAAiE;AACjE,sFAA6E;AAC7E,2CAAwC;AACxC,qCAAkC;AAClC,uDAAoD;AACpD,yEAAsE;AACtE,iDAAmG;AACnG,2CAAgD;AAChD,qDAA0D;AAC1D,uCAA+C;AAC/C,+CAAmD;AAGnD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAG,mBAAmB,CAAC;QAC3B,gBAAW,GAAW,6BAAiB,CAAC,QAAQ,CAAC;QAEjD,uBAAkB,GAChB,gCAAkB,CAAC;QACrB,6BAAwB,GACtB,mDAAwB,CAAC;QAE3B,uBAAkB,GAK+C,6BAAiB,CAAC;QAEnF,WAAM,GAKgC,eAAM,CAAC;QAE7C,uBAAkB,GAKoB,4BAAkB,CAAC;QACzD,2BAAsB,GAKqB,uCAAsB,CAAC;QAElE,+BAA0B,GAG6B,yCAA0B,CAAC;QAElF,oBAAe,GAO0B,iCAAe,CAAC;QAEzD,cAAS,GAAyE,qBAAS,CAAC;QAE5F,iBAAY,GAK2C,2BAAY,CAAC;QAEpE,4BAAuB,GAMgC,sCAAuB,CAAC;~~IACjF~~,CAAC;CAAA,CAAA;~~AAlEY~~,kBAAkB;IAD9B,gBAAO,CAAC,2CAAiB,CAAC,oBAAoB,CAAC;GACnC,kBAAkB,~~CAkE9B~~;~~AAlEY~~,gDAAkB"}
1	+ {"version":3,"file":"solution.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/solution.ts"],"names":[],"mappings":";;;;AAcA,mCAAiC;AACjC,4DAAiE;AACjE,sFAA6E;AAC7E,uDAAoD;AACpD,2CAAwC;AACxC,qCAAkC;AAClC,uDAAoD;AACpD,yEAAsE;AACtE,iDAAmG;AACnG,uDAAoD;AACpD,iEAA8D;AAC9D,yDAAsD;AACtD,2CAAgD;AAChD,qDAA0D;AAC1D,uCAA+C;AAC/C,+CAAmD;AAGnD,IAAa,kBAAkB,GAA/B,MAAa,kBAAkB;IAA/B;QACE,SAAI,GAAG,mBAAmB,CAAC;QAC3B,gBAAW,GAAW,6BAAiB,CAAC,QAAQ,CAAC;QAEjD,uBAAkB,GAChB,gCAAkB,CAAC;QACrB,6BAAwB,GACtB,mDAAwB,CAAC;QAE3B,uBAAkB,GAK+C,6BAAiB,CAAC;QAEnF,WAAM,GAKgC,eAAM,CAAC;QAE7C,uBAAkB,GAKoB,4BAAkB,CAAC;QACzD,2BAAsB,GAKqB,uCAAsB,CAAC;QAElE,+BAA0B,GAG6B,yCAA0B,CAAC;QAElF,oBAAe,GAO0B,iCAAe,CAAC;QAEzD,cAAS,GAAyE,qBAAS,CAAC;QAE5F,iBAAY,GAK2C,2BAAY,CAAC;QAEpE,4BAAuB,GAMgC,sCAAuB,CAAC;QAE/E,oBAAe,GAKuB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,iCAAe,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE7E,oBAAe,GAKuB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,iCAAe,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE7E,qBAAgB,GAKsB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,mCAAgB,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;QAE9E,yBAAoB,GAKkB,CACpC,GAAe,EACf,MAAgC,EAChC,OAAgC,EAChC,aAA4B,EAC5B,EAAE,CAAC,2CAAoB,CAAC,EAAE,UAAU,EAAE,CAAC,EAAE,GAAG,EAAE,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,CAAC,CAAC;IACpF,CAAC;CAAA,CAAA;AAlHY,kBAAkB;IAD9B,gBAAO,CAAC,2CAAiB,CAAC,oBAAoB,CAAC;GACnC,kBAAkB,CAkH9B;AAlHY,gDAAkB"}

package/build/plugins/solution/fx-solution/v2/utils.d.ts CHANGED Viewed

@@ -1,4 +1,5 @@
-import { v2, Inputs, FxError, Result, AzureSolutionSettings, Void, PermissionRequestProvider, Json } from "@microsoft/teamsfx-api";
+import { v2, Inputs, FxError, Result, AzureSolutionSettings, Void, PermissionRequestProvider, Json, SolutionContext, Plugin } from "@microsoft/teamsfx-api";
+import { PluginsWithContext } from "../solution";
 export declare function getSelectedPlugins(azureSettings: AzureSolutionSettings): v2.ResourcePlugin[];
 export declare function getAzureSolutionSettings(ctx: v2.Context): AzureSolutionSettings;
 export declare function isAzureProject(azureSettings: AzureSolutionSettings): boolean;
@@ -14,4 +15,5 @@ export declare function parseUserName(appStudioToken?: Record<string, unknown>):
 export declare function loadTeamsAppTenantIdForLocal(localSettings: v2.LocalSettings, appStudioToken?: Record<string, unknown>): Result<Void, FxError>;
 export declare function fillInSolutionSettings(solutionSettings: AzureSolutionSettings, answers: Inputs): Result<Void, FxError>;
 export declare function checkWetherProvisionSucceeded(config: Json): boolean;
+export declare function getPluginAndContextArray(ctx: SolutionContext, selectedPlugins: Plugin[]): PluginsWithContext[];
 //# sourceMappingURL=utils.d.ts.map

package/build/plugins/solution/fx-solution/v2/utils.d.ts.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EAEJ,yBAAyB,EAGzB,IAAI,~~EACL~~,MAAM,wBAAwB,CAAC;~~AAsBhC~~,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,CAE/E;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,OAAO,CAE5E;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAWrE;AAED,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB;AAED,wBAAgB,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsB/F;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAOvB;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,qBAAqB,EACvC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAiDvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAEnE"}
1	+ {"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,EAAE,EACF,MAAM,EACN,OAAO,EACP,MAAM,EAGN,qBAAqB,EACrB,IAAI,EAEJ,yBAAyB,EAGzB,IAAI,EACJ,eAAe,EACf,MAAM,EACP,MAAM,wBAAwB,CAAC;AAqBhC,OAAO,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAGjD,wBAAgB,kBAAkB,CAAC,aAAa,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAgB,wBAAwB,CAAC,GAAG,EAAE,EAAE,CAAC,OAAO,GAAG,qBAAqB,CAE/E;AAED,wBAAgB,cAAc,CAAC,aAAa,EAAE,qBAAqB,GAAG,OAAO,CAE5E;AAED,wBAAgB,cAAc,CAAC,CAAC,EAAE,OAAO,EAAE;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,CAAC,CAAA;CAAE,EAAE,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC,CAO3F;AAED,wBAAgB,qBAAqB,CAAC,MAAM,EAAE,IAAI,GAAG,EAAE,CAAC,cAAc,CAWrE;AAED,wBAAgB,eAAe,CAAC,gBAAgB,EAAE,qBAAqB,GAAG,EAAE,CAAC,cAAc,EAAE,CAI5F;AAED,wBAAsB,uBAAuB,CAC3C,gBAAgB,EAAE,qBAAqB,EACvC,yBAAyB,EAAE,yBAAyB,GACnD,OAAO,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC,CAqBhC;AAED,wBAAgB,qBAAqB,CACnC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CA0BzB;AAED,wBAAgB,aAAa,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAsB/F;AAGD,wBAAgB,4BAA4B,CAC1C,aAAa,EAAE,EAAE,CAAC,aAAa,EAC/B,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACvC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAOvB;AAED,wBAAgB,sBAAsB,CACpC,gBAAgB,EAAE,qBAAqB,EACvC,OAAO,EAAE,MAAM,GACd,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAiDvB;AAED,wBAAgB,6BAA6B,CAAC,MAAM,EAAE,IAAI,GAAG,OAAO,CAEnE;AAED,wBAAgB,wBAAwB,CACtC,GAAG,EAAE,eAAe,EACpB,eAAe,EAAE,MAAM,EAAE,GACxB,kBAAkB,EAAE,CAEtB"}

package/build/plugins/solution/fx-solution/v2/utils.js CHANGED Viewed

@@ -1,11 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.checkWetherProvisionSucceeded = exports.fillInSolutionSettings = exports.loadTeamsAppTenantIdForLocal = exports.parseUserName = exports.parseTeamsAppTenantId = exports.ensurePermissionRequest = exports.reloadV2Plugins = exports.extractSolutionInputs = exports.combineRecords = exports.isAzureProject = exports.getAzureSolutionSettings = exports.getSelectedPlugins = void 0;
+exports.getPluginAndContextArray = exports.checkWetherProvisionSucceeded = exports.fillInSolutionSettings = exports.loadTeamsAppTenantIdForLocal = exports.parseUserName = exports.parseTeamsAppTenantId = exports.ensurePermissionRequest = exports.reloadV2Plugins = exports.extractSolutionInputs = exports.combineRecords = exports.isAzureProject = exports.getAzureSolutionSettings = exports.getSelectedPlugins = void 0;
 const teamsfx_api_1 = require("@microsoft/teamsfx-api");
 const localSettingsConstants_1 = require("../../../../common/localSettingsConstants");
 const constants_1 = require("../constants");
 const question_1 = require("../question");
 const ResourcePluginContainer_1 = require("../ResourcePluginContainer");
+const util_1 = require("../utils/util");
 function getSelectedPlugins(azureSettings) {
     const plugins = ResourcePluginContainer_1.getActivatedV2ResourcePlugins(azureSettings);
     azureSettings.activeResourcePlugins = plugins.map((p) => p.name);
@@ -135,4 +136,8 @@ function checkWetherProvisionSucceeded(config) {
     return config[constants_1.GLOBAL_CONFIG] && config[constants_1.GLOBAL_CONFIG][constants_1.SOLUTION_PROVISION_SUCCEEDED];
 }
 exports.checkWetherProvisionSucceeded = checkWetherProvisionSucceeded;
+function getPluginAndContextArray(ctx, selectedPlugins) {
+    return selectedPlugins.map((plugin) => [plugin, util_1.getPluginContext(ctx, plugin.name)]);
+}
+exports.getPluginAndContextArray = getPluginAndContextArray;
 //# sourceMappingURL=utils.js.map

package/build/plugins/solution/fx-solution/v2/utils.js.map CHANGED Viewed

	@@ -1 +1 @@
1	- {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":";;;AAAA,~~wDAcgC~~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"}
1	+ {"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/utils.ts"],"names":[],"mappings":"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"}

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "@microsoft/teamsfx-core",
-  "version": "1.0.0",
+  "version": "1.0.1-alpha.389dbb3f.0",
   "main": "build/index.js",
   "types": "build/index.d.ts",
   "license": "MIT",
@@ -19,6 +19,7 @@
     "test:appstudio": "nyc mocha \"tests/plugins/resource/appstudio/**/*.test.ts\"",
     "test:spfx": "nyc mocha \"tests/plugins/resource/spfx/**/*.test.ts\"",
     "test:apim": "nyc mocha \"tests/plugins/resource/apim/**/*.test.ts\"",
+    "test:keyvault": "nyc mocha \"tests/plugins/resource/keyvault/**/*.test.ts\"",
     "test:unit": "nyc --no-clean mocha \"tests/**/*.test.ts\"",
     "test:solution": "nyc mocha \"tests/plugins/solution/*.test.ts\"",
     "test:core": "nyc mocha \"tests/core/*.test.ts\"",
@@ -47,7 +48,7 @@
     "@azure/storage-blob": "^12.7.0",
     "@dbpiper/timer": "1.0.0-beta.2",
     "@feathersjs/hooks": "^0.6.5",
-    "@microsoft/teamsfx-api": "^0.11.0",
+    "@microsoft/teamsfx-api": "0.11.1-alpha.389dbb3f.0",
     "@npmcli/package-json": "^1.0.1",
     "@types/jwt-decode": "3.1.0",
     "@types/proper-lockfile": "^4.1.1",
@@ -61,6 +62,7 @@
     "fs-extra": "^9.1.0",
     "glob": "^7.1.6",
     "got": "^11.8.2",
+    "handlebars": "^4.7.7",
     "http-close": "^1.0.0",
     "ignore": "^5.1.8",
     "install": "^0.13.0",
@@ -153,7 +155,7 @@
     "resource/**/*",
     "templates/**/*"
   ],
-  "gitHead": "ede858b9747681a1bbf87bb3c80b0d770f2cafb5",
+  "gitHead": "30c5fb95b665204a4473edc5c7af9af54a21310c",
   "publishConfig": {
     "access": "public"
   },

package/resource/strings.json CHANGED Viewed

@@ -23,6 +23,7 @@
     "AlreadyProvisionNotice": "'%s' is already provisioned in the cloud, will create the teams app again if it has been removed.",
     "NotProvisionedNotice": "'%s' is not provisioned in the cloud yet. Please provision first.",
     "GenerateArmTemplateFailNotice": "'%s' Failed to create ARM template for required Azure services.",
+    "UpdateArmTemplateFailNotice": "'%s' Failed to update ARM template for required Azure services.",
     "UpdateArmTemplateNotice": "The Azure resource template is updated based on your resource and capability selection. We recommend to initialize your project workspace with git init to track all changes.",
     "LocalDebugTenantConfirmNotice": "You already run local debug for the Teams app in another tenant '%s'. You can sign out %s and sign in with the matched M365 account to re-use the previous local debug resource. If you really want to switch tenant for local debug, you can delete the %s file and re-run local debug.",
     "MigrationToArmAndMultiEnvMessage": "Teams Toolkit will upgrade your project configuration files to support the latest features. The upgrade process will not change your custom code and create the backup files in case revert is needed.\nNotice this upgrade is a must-have to continue to use current version Teams Toolkit. If you are not ready to upgrade and want to continue to use the old version, please find Teams Toolkit in Extension and install the version <= 2.10.0",

package/templates/azure/config.bicep CHANGED Viewed

@@ -1,18 +1,6 @@
 @secure()
 param provisionParameters object
 param provisionOutputs object
-var functionCurrentConfigs = reference('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/web', '2021-02-01')
-var functionCurrentAppSettings = list('${provisionOutputs.functionOutput.value.functionAppResourceId}/config/appsettings', '2021-02-01').properties
-module teamsFxFunctionConfig './teamsFx/function.bicep' = {
-  name: 'addTeamsFxFunctionConfiguration'
-  params: {
-    provisionParameters: provisionParameters
-    provisionOutputs: provisionOutputs
-    currentConfigs: functionCurrentConfigs
-    currentAppSettings: functionCurrentAppSettings
-  }
-}
 var simpleAuthCurrentAppSettings = list('${provisionOutputs.simpleAuthOutput.value.webAppResourceId}/config/appsettings', '2021-02-01').properties
 module teamsFxSimpleAuthConfig './teamsFx/simpleAuth.bicep' = {
@@ -22,4 +10,4 @@ module teamsFxSimpleAuthConfig './teamsFx/simpleAuth.bicep' = {
     provisionOutputs: provisionOutputs
     currentAppSettings: simpleAuthCurrentAppSettings
   }
-}
+}