@microsoft/teamsfx-core 1.2.2-alpha.01a113d2.0 → 1.2.2-alpha.4ce002ea.0

package/resource/strings.json

@@ -61,7 +61,34 @@
     "Collaboration": {
       "ListCollaboratorsSuccess": "List M365 Teams App%s owners success, you can view it in Teams Toolkit output window",
       "WithAadApp": "(With AAD App)",
-      "FailedToListCollaborators": "Failed to list Teams App owners for the project.\nError details: \n"
+      "FailedToListCollaborators": "Failed to list Teams App owners for the project.\nError details: \n",
+      "GrantingPermission": "Granting permission",
+      "EmailCannotBeEmptyOrSame":"Collaborator's email cannot be null or same as current user",
+      "CannotFindUserInCurrentTenant":"Cannot find user in current tenant, please check whether your email address is correct",
+      "GrantPermissionForUser":"Grant permission for user",
+      "FailedToGetEnvName": "Failed to get env name.",
+      "AccountToGrantPermission": "Account to grant permission: ",
+      "StartingGrantPermission":"Starting grant permission for environment: ",
+      "TenantId": "Tenant ID: ",
+      "FailedToGrantPermission":"Failed to grant permission for the below resources to user: %s.\n Resource details: \n",
+      "PermissionHasBeenGrantTo":"permission has been granted to ",
+      "GrantPermissionResourceId": ", Resource ID: ",
+      "SharePointTip":"\nIf added user is not a SharePoint App Catalog site admin, you need to manually setup access policy via SharePoint admin center, please refer to this link for more details: ",
+      "AzureTip":"\nIf added user cannot access Azure resources, you need to manually setup access policy via Azure portal, please refer to this link for more details: ",
+      "ListingM365Permission": "Listing M365 permissions\n",
+      "AccountUsedToCheck":"Account used to check: ",
+      "StartingListAllTeamsAppOwners": "Starting list all teams app owners for environment: ",
+      "M365TeamsAppId": "M365 Teams App (ID: ",
+      "SsoAadAppId":"), SSO AAD App (ID: ",
+      "TeamsAppOwner": "Teams App Owner: ",
+      "NotOwnerOfSsoAadApp":"(Not owner of SSO AAD app)",
+      "FailedToConvertProfile": "failed to convert profile ",
+      "StaringCheckPermission": "Starting check permission for environment: ",
+      "FailedToCheckPermission": "Failed to check permission for the below resources.\n Resource details: \n",
+      "CheckPermissionResourceId": "Resource ID: ",
+      "Undefined": "undefined",
+      "ResourceName": ", Resource Name: ",
+      "Permission": ", Permission: "
     }
   },
   "plugins": {

package/templates/plugins/solution/{main.bicep → mainConfig.bicep}

@@ -1,13 +1,3 @@
-@secure()
-param provisionParameters object
-
-module provision './provision.bicep' = {
-  name: 'provisionResources'
-  params: {
-    provisionParameters: provisionParameters
-  }
-}
-
 module teamsFxConfig './config.bicep' = {
   name: 'addTeamsFxConfigurations'
   params: {
@@ -15,6 +5,4 @@ module teamsFxConfig './config.bicep' = {
     provisionOutputs: provision
   }
 }
-
-output provisionOutput object = provision
 output teamsFxConfigurationOutput object = contains(reference(resourceId('Microsoft.Resources/deployments', teamsFxConfig.name), '2020-06-01'), 'outputs') ? teamsFxConfig : {}

package/templates/plugins/solution/mainProvision.bicep

@@ -0,0 +1,10 @@
+@secure()
+param provisionParameters object
+
+module provision './provision.bicep' = {
+  name: 'provisionResources'
+  params: {
+    provisionParameters: provisionParameters
+  }
+}
+output provisionOutput object = provision

package/build/plugins/solution/fx-solution/v2/listAllCollaborators.d.ts

@@ -1,5 +0,0 @@
-import { FxError, Result } from "@microsoft/teamsfx-api";
-import { ListCollaboratorResult } from "../../../../common";
-import { CollabApiParam } from "./collaborationUtil";
-export declare function listAllCollaborators(param: CollabApiParam): Promise<Result<Record<string, ListCollaboratorResult>, FxError>>;
-//# sourceMappingURL=listAllCollaborators.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"listAllCollaborators.d.ts","sourceRoot":"","sources":["../../../../../src/plugins/solution/fx-solution/v2/listAllCollaborators.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,OAAO,EAIP,MAAM,EAMP,MAAM,wBAAwB,CAAC;AAChC,OAAO,EAKL,sBAAsB,EAEvB,MAAM,oBAAoB,CAAC;AAY5B,OAAO,EAAE,cAAc,EAAqB,MAAM,qBAAqB,CAAC;AA2JxE,wBAAsB,oBAAoB,CACxC,KAAK,EAAE,cAAc,GACpB,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,sBAAsB,CAAC,EAAE,OAAO,CAAC,CAAC,CAyClE"}

package/build/plugins/solution/fx-solution/v2/listAllCollaborators.js

@@ -1,118 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.listAllCollaborators = 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 collaborationUtil_1 = require("./collaborationUtil");
-const __1 = require("../../../..");
-const listCollaborator_1 = require("./listCollaborator");
-async function listAllCollaboratorsImpl(param, projectPath, cryptoProvider, telemetryReporter, ui, graphTokenProvider, platform) {
-    var _a, _b;
-    telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.ListAllCollaboratorsStart, {
-        [constants_1.SolutionTelemetryProperty.Component]: constants_1.SolutionTelemetryComponentName,
-    });
-    const collaboratorsResult = {};
-    const envs = await __1.environmentManager.listEnvConfigs(projectPath);
-    if (envs.isErr()) {
-        return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ListAllCollaborators, envs.error, telemetryReporter));
-    }
-    const result = await collaborationUtil_1.CollaborationUtil.getCurrentUserInfo(graphTokenProvider);
-    if (result.isErr()) {
-        return teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ListAllCollaborators, result.error, telemetryReporter));
-    }
-    const userInfo = result.value;
-    for (const env of envs.value) {
-        try {
-            const envInfo = await __1.environmentManager.loadEnvInfo(projectPath, cryptoProvider, env);
-            if (envInfo.isErr()) {
-                throw envInfo.error;
-            }
-            const stateResult = collaborationUtil_1.CollaborationUtil.getCurrentCollaborationState(envInfo.value.state, 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);
-                }
-                collaboratorsResult[env] = {
-                    state: stateResult.state,
-                    message: stateResult.message,
-                };
-                continue;
-            }
-            const [results, errors] = param.apiVersion === 1
-                ? await listCollaborator_1.executeListCollaboratorV1(param.ctx, userInfo)
-                : await listCollaborator_1.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) {
-                collaboratorsResult[env] = {
-                    state: common_1.CollaborationState.ERROR,
-                    error: teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ListAllCollaborators, teamsfx_api_1.returnUserError(new Error(errorMsg), constants_1.SolutionSource, constants_1.SolutionError.FailedToListCollaborator), telemetryReporter)),
-                };
-                continue;
-            }
-            const teamsAppOwners = results[0].isErr() ? [] : results[0].value;
-            const aadOwners = results[1].isErr() ? [] : results[1].value;
-            const collaborators = [];
-            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: (_b = (_a = aadOwner === null || aadOwner === void 0 ? void 0 : aadOwner.userPrincipalName) !== null && _a !== void 0 ? _a : teamsAppOwner.userPrincipalName) !== null && _b !== void 0 ? _b : teamsAppOwner.userObjectId,
-                    userObjectId: teamsAppOwner.userObjectId,
-                    isAadOwner: aadOwner ? true : false,
-                    aadResourceId: aadOwner ? aadOwner.resourceId : undefined,
-                    teamsAppResourceId: teamsAppOwner.resourceId,
-                });
-            }
-            const aadOwnerCount = collaborators.filter((collaborator) => collaborator.aadResourceId && collaborator.isAadOwner).length;
-            telemetryReporter === null || telemetryReporter === void 0 ? void 0 : telemetryReporter.sendTelemetryEvent(constants_1.SolutionTelemetryEvent.ListAllCollaborators, {
-                [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(env),
-            });
-            collaboratorsResult[env] = {
-                collaborators: collaborators,
-                state: common_1.CollaborationState.OK,
-            };
-        }
-        catch (error) {
-            collaboratorsResult[env] = {
-                state: common_1.CollaborationState.ERROR,
-                error: teamsfx_api_1.err(util_1.sendErrorTelemetryThenReturnError(constants_1.SolutionTelemetryEvent.ListAllCollaborators, teamsfx_api_1.returnUserError(error, constants_1.SolutionSource, constants_1.SolutionError.FailedToListCollaborator), telemetryReporter)),
-            };
-        }
-    }
-    return teamsfx_api_1.ok(collaboratorsResult);
-}
-async function listAllCollaborators(param) {
-    var _a, _b;
-    if (param.apiVersion === 1) {
-        const telemetryReporter = param.ctx.telemetryReporter;
-        const ui = param.ctx.ui;
-        const graphTokenProvider = param.ctx.graphTokenProvider;
-        const platform = (_a = param.ctx.answers) === null || _a === void 0 ? void 0 : _a.platform;
-        const projectPath = param.ctx.root;
-        if (!projectPath) {
-            return teamsfx_api_1.err(teamsfx_api_1.returnSystemError(new Error(`projectPath is undefined`), constants_1.PluginNames.SOLUTION, constants_1.SolutionError.InternelError));
-        }
-        return listAllCollaboratorsImpl(param, projectPath, param.ctx.cryptoProvider, telemetryReporter, ui, graphTokenProvider, platform);
-    }
-    else {
-        const telemetryReporter = param.ctx.telemetryReporter;
-        const ui = param.ctx.userInteraction;
-        const graphTokenProvider = param.tokenProvider.graphTokenProvider;
-        const platform = (_b = param.inputs) === null || _b === void 0 ? void 0 : _b.platform;
-        return listAllCollaboratorsImpl(param, param.inputs.projectPath, param.ctx.cryptoProvider, telemetryReporter, ui, graphTokenProvider, platform);
-    }
-}
-exports.listAllCollaborators = listAllCollaborators;
-//# sourceMappingURL=listAllCollaborators.js.map

package/build/plugins/solution/fx-solution/v2/listAllCollaborators.js.map

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