@pnp/cli-microsoft365 10.6.0-beta.55e3c97 → 10.6.0-beta.a7465c9

package/dist/m365/spo/commands/web/web-roleassignment-add.js

@@ -4,16 +4,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators, _SpoWebRoleAssignmentAddCommand_initOptionSets;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoGroupGetCommand from '../group/group-get.js';
-import spoRoleDefinitionListCommand from '../roledefinition/roledefinition-list.js';
-import spoUserGetCommand from '../user/user-get.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
-import { spo } from '../../../../utils/spo.js';
 class SpoWebRoleAssignmentAddCommand extends SpoCommand {
     get name() {
         return commands.WEB_ROLEASSIGNMENT_ADD;
@@ -34,12 +30,14 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             await logger.logToStderr(`Adding role assignment to web ${args.options.webUrl}...`);
         }
         try {
-            args.options.roleDefinitionId = await this.getRoleDefinitionId(args.options);
+            const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
             if (args.options.upn) {
-                args.options.principalId = await this.getUserPrincipalId(args.options);
+                const principalId = await this.getUserPrincipalId(args.options, logger);
+                await this.addRoleAssignment(args.options.webUrl, principalId, roleDefinitionId, logger);
             }
             else if (args.options.groupName) {
-                args.options.principalId = await this.getGroupPrincipalId(args.options);
+                const principalId = await this.getGroupPrincipalId(args.options, logger);
+                await this.addRoleAssignment(args.options.webUrl, principalId, roleDefinitionId, logger);
             }
             else if (args.options.entraGroupId || args.options.entraGroupName) {
                 if (this.verbose) {
@@ -49,17 +47,19 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
                     ? await entraGroup.getGroupById(args.options.entraGroupId)
                     : await entraGroup.getGroupByDisplayName(args.options.entraGroupName);
                 const siteUser = await spo.ensureEntraGroup(args.options.webUrl, group);
-                args.options.principalId = siteUser.Id;
+                await this.addRoleAssignment(args.options.webUrl, siteUser.Id, roleDefinitionId, logger);
             }
-            await this.addRoleAssignment(logger, args.options);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async addRoleAssignment(logger, options) {
+    async addRoleAssignment(webUrl, principalId, roleDefinitionId, logger) {
+        if (this.verbose) {
+            await logger.logToStderr('Adding role assignment...');
+        }
         const requestOptions = {
-            url: `${options.webUrl}/_api/web/roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
+            url: `${webUrl}/_api/web/roleassignments/addroleassignment(principalid='${principalId}',roledefid='${roleDefinitionId}')`,
             method: 'POST',
             headers: {
                 'accept': 'application/json;odata=nometadata',
@@ -69,45 +69,20 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
         };
         await request.post(requestOptions);
     }
-    async getRoleDefinitionId(options) {
+    async getRoleDefinitionId(options, logger) {
         if (!options.roleDefinitionName) {
             return options.roleDefinitionId;
         }
-        const roleDefinitionListCommandOptions = {
-            webUrl: options.webUrl,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoRoleDefinitionListCommand, { options: { ...roleDefinitionListCommandOptions, _: [] } });
-        const getRoleDefinitionListOutput = JSON.parse(output.stdout);
-        const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
-        return roleDefinitionId;
+        const roledefinition = await spo.getRoleDefinitionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
+        return roledefinition.Id;
     }
-    async getGroupPrincipalId(options) {
-        const groupGetCommandOptions = {
-            webUrl: options.webUrl,
-            name: options.groupName,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
-        const getGroupOutput = JSON.parse(output.stdout);
-        return getGroupOutput.Id;
+    async getGroupPrincipalId(options, logger) {
+        const group = await spo.getGroupByName(options.webUrl, options.groupName, logger, this.verbose);
+        return group.Id;
     }
-    async getUserPrincipalId(options) {
-        const userGetCommandOptions = {
-            webUrl: options.webUrl,
-            email: options.upn,
-            id: undefined,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
-        const getUserOutput = JSON.parse(output.stdout);
-        return getUserOutput.Id;
+    async getUserPrincipalId(options, logger) {
+        const user = await spo.getUserByEmail(options.webUrl, options.upn, logger, this.verbose);
+        return user.Id;
     }
 }
 _SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignmentAddCommand_initTelemetry = function _SpoWebRoleAssignmentAddCommand_initTelemetry() {

package/dist/m365/spo/commands/web/web-roleassignment-remove.js

@@ -4,15 +4,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators, _SpoWebRoleAssignmentRemoveCommand_initOptionSets;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoGroupGetCommand from '../group/group-get.js';
-import spoUserGetCommand from '../user/user-get.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { spo } from '../../../../utils/spo.js';
+import { cli } from '../../../../cli/cli.js';
 class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
     get name() {
         return commands.WEB_ROLEASSIGNMENT_REMOVE;
@@ -45,10 +43,12 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
         }
         try {
             if (options.upn) {
-                options.principalId = await this.getUserPrincipalId(options);
+                const principalId = await this.getUserPrincipalId(options, logger);
+                await this.removeRoleAssignmentWithOptions(options.webUrl, principalId, logger);
             }
             else if (options.groupName) {
-                options.principalId = await this.getGroupPrincipalId(options);
+                const principalId = await this.getGroupPrincipalId(options, logger);
+                await this.removeRoleAssignmentWithOptions(options.webUrl, principalId, logger);
             }
             else if (options.entraGroupId || options.entraGroupName) {
                 if (this.verbose) {
@@ -58,17 +58,19 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
                     ? await entraGroup.getGroupById(options.entraGroupId)
                     : await entraGroup.getGroupByDisplayName(options.entraGroupName);
                 const siteUser = await spo.ensureEntraGroup(options.webUrl, group);
-                options.principalId = siteUser.Id;
+                await this.removeRoleAssignmentWithOptions(options.webUrl, siteUser.Id, logger);
             }
-            await this.removeRoleAssignmentWithOptions(logger, options);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async removeRoleAssignmentWithOptions(logger, options) {
+    async removeRoleAssignmentWithOptions(webUrl, principalId, logger) {
+        if (this.verbose) {
+            await logger.logToStderr('Removing role assignment...');
+        }
         const requestOptions = {
-            url: `${options.webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
+            url: `${webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${principalId}')`,
             method: 'POST',
             headers: {
                 'accept': 'application/json;odata=nometadata',
@@ -78,30 +80,13 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
         };
         await request.post(requestOptions);
     }
-    async getGroupPrincipalId(options) {
-        const groupGetCommandOptions = {
-            webUrl: options.webUrl,
-            name: options.groupName,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
-        const getGroupOutput = JSON.parse(output.stdout);
-        return getGroupOutput.Id;
+    async getGroupPrincipalId(options, logger) {
+        const group = await spo.getGroupByName(options.webUrl, options.groupName, logger, this.verbose);
+        return group.Id;
     }
-    async getUserPrincipalId(options) {
-        const userGetCommandOptions = {
-            webUrl: options.webUrl,
-            email: options.upn,
-            id: undefined,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
-        const getUserOutput = JSON.parse(output.stdout);
-        return getUserOutput.Id;
+    async getUserPrincipalId(options, logger) {
+        const user = await spo.getUserByEmail(options.webUrl, options.upn, logger, this.verbose);
+        return user.Id;
     }
 }
 _SpoWebRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoWebRoleAssignmentRemoveCommand_initTelemetry = function _SpoWebRoleAssignmentRemoveCommand_initTelemetry() {

package/dist/utils/spo.js

@@ -519,10 +519,11 @@ export const spo = {
     },
     /**
    * Retrieves the spo user by email.
+   * Returns a user object
    * @param webUrl Web url
    * @param email The email of the user
    * @param logger the Logger object
-   * @param verbose set for verbose logging
+   * @param verbose Set for verbose logging
    */
     async getUserByEmail(webUrl, email, logger, verbose) {
         if (verbose && logger) {
@@ -593,10 +594,11 @@ export const spo = {
     },
     /**
     * Retrieves the spo group by name.
+    * Returns a group object
     * @param webUrl Web url
     * @param name The name of the group
     * @param logger the Logger object
-    * @param verbose set for verbose logging
+    * @param verbose Set for verbose logging
     */
     async getGroupByName(webUrl, name, logger, verbose) {
         if (verbose && logger) {
@@ -615,10 +617,11 @@ export const spo = {
     },
     /**
     * Retrieves the role definition by name.
+    * Returns a RoleDefinition object
     * @param webUrl Web url
     * @param name the name of the role definition
     * @param logger the Logger object
-    * @param verbose set for verbose logging
+    * @param verbose Set for verbose logging
     */
     async getRoleDefinitionByName(webUrl, name, logger, verbose) {
         if (verbose && logger) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "10.6.0-beta.55e3c97",
+  "version": "10.6.0-beta.a7465c9",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",