@pnp/cli-microsoft365 10.5.0 → 10.6.0-beta.195c8d5

package/dist/m365/spo/commands/folder/folder-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 _SpoFolderRoleAssignmentAddCommand_instances, _SpoFolderRoleAssignmentAddCommand_initTelemetry, _SpoFolderRoleAssignmentAddCommand_initOptions, _SpoFolderRoleAssignmentAddCommand_initValidators, _SpoFolderRoleAssignmentAddCommand_initTypes;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.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 spoRoleDefinitionFolderCommand 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 SpoFolderRoleAssignmentAddCommand extends SpoCommand {
@@ -38,7 +34,6 @@ class SpoFolderRoleAssignmentAddCommand extends SpoCommand {
         const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
         const roleFolderUrl = urlUtil.getWebRelativePath(args.options.webUrl, args.options.folderUrl);
         try {
-            //await this.getFolderUrl(args.options);
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (roleFolderUrl.split('/').length === 2) {
                 requestUrl += `GetList('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
@@ -46,13 +41,13 @@ class SpoFolderRoleAssignmentAddCommand extends SpoCommand {
             else {
                 requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
             }
-            const roleDefinitionId = await this.getRoleDefinitionId(args.options);
+            const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
             let principalId = args.options.principalId;
             if (args.options.upn) {
-                principalId = await this.getUserPrincipalId(args.options);
+                principalId = await this.getUserPrincipalId(args.options, logger);
             }
             else if (args.options.groupName) {
-                principalId = await this.getGroupPrincipalId(args.options);
+                principalId = await this.getGroupPrincipalId(args.options, logger);
             }
             else if (args.options.entraGroupId || args.options.entraGroupName) {
                 if (this.verbose) {
@@ -82,50 +77,20 @@ class SpoFolderRoleAssignmentAddCommand extends SpoCommand {
         };
         return request.post(requestOptions);
     }
-    async getRoleDefinitionId(options) {
+    async getRoleDefinitionId(options, logger) {
         if (!options.roleDefinitionName) {
             return options.roleDefinitionId;
         }
-        const roleDefinitionFolderCommandOptions = {
-            webUrl: options.webUrl,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoRoleDefinitionFolderCommand, { options: { ...roleDefinitionFolderCommandOptions, _: [] } });
-        const getRoleDefinitionFolderOutput = JSON.parse(output.stdout);
-        const roleDefinition = getRoleDefinitionFolderOutput.find((role) => role.Name === options.roleDefinitionName);
-        if (roleDefinition) {
-            return roleDefinition.Id;
-        }
-        else {
-            throw Error(`The specified role definition name '${options.roleDefinitionName}' does not exist.`);
-        }
+        const roleDefintion = await spo.getRoleDefintionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
+        return roleDefintion.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;
     }
 }
 _SpoFolderRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFolderRoleAssignmentAddCommand_initTelemetry = function _SpoFolderRoleAssignmentAddCommand_initTelemetry() {

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

@@ -11,8 +11,6 @@ import { urlUtil } from '../../../../utils/urlUtil.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';
 class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand {
@@ -38,11 +36,12 @@ class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand {
             const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
             const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
             try {
+                let principalId = args.options.principalId;
                 if (args.options.upn) {
-                    args.options.principalId = await this.getUserPrincipalId(args.options);
+                    principalId = await this.getUserPrincipalId(args.options, logger);
                 }
                 else if (args.options.groupName) {
-                    args.options.principalId = await this.getGroupPrincipalId(args.options);
+                    principalId = await this.getGroupPrincipalId(args.options, logger);
                 }
                 else if (args.options.entraGroupId || args.options.entraGroupName) {
                     if (this.verbose) {
@@ -52,9 +51,9 @@ class SpoFolderRoleAssignmentRemoveCommand 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;
+                    principalId = siteUser.Id;
                 }
-                await this.removeRoleAssignment(requestUrl, logger, args.options);
+                await this.removeRoleAssignment(requestUrl, principalId);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -70,9 +69,9 @@ class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand {
             }
         }
     }
-    async removeRoleAssignment(requestUrl, logger, options) {
+    async removeRoleAssignment(requestUrl, principalId) {
         const requestOptions = {
-            url: `${requestUrl}/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
+            url: `${requestUrl}/roleassignments/removeroleassignment(principalid='${principalId}')`,
             method: 'POST',
             headers: {
                 'accept': 'application/json;odata=nometadata',
@@ -82,30 +81,13 @@ class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand {
         };
         return 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;
     }
 }
 _SpoFolderRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFolderRoleAssignmentRemoveCommand_initTelemetry = function _SpoFolderRoleAssignmentRemoveCommand_initTelemetry() {

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

@@ -4,7 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoListItemRoleAssignmentAddCommand_instances, _SpoListItemRoleAssignmentAddCommand_initTelemetry, _SpoListItemRoleAssignmentAddCommand_initOptions, _SpoListItemRoleAssignmentAddCommand_initValidators;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -12,9 +11,6 @@ import { urlUtil } from '../../../../utils/urlUtil.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 { spo } from '../../../../utils/spo.js';
 class SpoListItemRoleAssignmentAddCommand extends SpoCommand {
     get name() {
@@ -47,15 +43,13 @@ class SpoListItemRoleAssignmentAddCommand extends SpoCommand {
                 requestUrl += `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
             }
             requestUrl += `items(${args.options.listItemId})/`;
-            const roleDefinitionId = await this.getRoleDefinitionId(args.options);
+            const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
             let principalId = args.options.principalId;
             if (args.options.upn) {
-                principalId = await this.getUserPrincipalId(args.options);
-                await this.addRoleAssignment(requestUrl, roleDefinitionId, principalId);
+                principalId = await this.getUserPrincipalId(args.options, logger);
             }
             else if (args.options.groupName) {
-                principalId = await this.getGroupPrincipalId(args.options);
-                await this.addRoleAssignment(requestUrl, roleDefinitionId, principalId);
+                principalId = await this.getGroupPrincipalId(args.options, logger);
             }
             else if (args.options.entraGroupId || args.options.entraGroupName) {
                 if (this.verbose) {
@@ -85,45 +79,20 @@ class SpoListItemRoleAssignmentAddCommand 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 roleDefintion = await spo.getRoleDefinitionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
+        return roleDefintion.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;
     }
 }
 _SpoListItemRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListItemRoleAssignmentAddCommand_initTelemetry = function _SpoListItemRoleAssignmentAddCommand_initTelemetry() {

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

@@ -11,8 +11,6 @@ import { urlUtil } from '../../../../utils/urlUtil.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';
 class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand {
@@ -59,10 +57,10 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand {
             }
             requestUrl += `items(${options.listItemId})/`;
             if (options.upn) {
-                options.principalId = await this.getUserPrincipalId(options);
+                options.principalId = await this.getUserPrincipalId(options, logger);
             }
             else if (options.groupName) {
-                options.principalId = await this.getGroupPrincipalId(options);
+                options.principalId = await this.getGroupPrincipalId(options, logger);
             }
             else if (options.entraGroupId || options.entraGroupName) {
                 if (this.verbose) {
@@ -92,30 +90,13 @@ class SpoListItemRoleAssignmentRemoveCommand 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;
     }
 }
 _SpoListItemRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListItemRoleAssignmentRemoveCommand_initTelemetry = function _SpoListItemRoleAssignmentRemoveCommand_initTelemetry() {

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/m365/tenant/commands/people/people-profilecardproperty-add.js

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TenantPeopleProfileCardPropertyAddCommand_instances, _TenantPeopleProfileCardPropertyAddCommand_initTelemetry, _TenantPeopleProfileCardPropertyAddCommand_initOptions, _TenantPeopleProfileCardPropertyAddCommand_initValidators;
 import request from '../../../../request.js';
+import { optionsUtils } from '../../../../utils/optionsUtils.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { profileCardPropertyNames } from './profileCardProperties.js';
@@ -71,7 +72,7 @@ class TenantPeopleProfileCardPropertyAddCommand extends GraphCommand {
         ];
     }
     getLocalizations(options) {
-        const unknownOptions = Object.keys(this.getUnknownOptions(options));
+        const unknownOptions = Object.keys(optionsUtils.getUnknownOptions(options, this.options));
         if (unknownOptions.length === 0) {
             return [];
         }
@@ -88,7 +89,7 @@ class TenantPeopleProfileCardPropertyAddCommand extends GraphCommand {
 _TenantPeopleProfileCardPropertyAddCommand_instances = new WeakSet(), _TenantPeopleProfileCardPropertyAddCommand_initTelemetry = function _TenantPeopleProfileCardPropertyAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         // Add unknown options to telemetry
-        const unknownOptions = Object.keys(this.getUnknownOptions(args.options));
+        const unknownOptions = Object.keys(optionsUtils.getUnknownOptions(args.options, this.options));
         const unknownOptionsObj = unknownOptions.reduce((obj, key) => ({ ...obj, [key]: true }), {});
         Object.assign(this.telemetryProperties, {
             displayName: typeof args.options.displayName !== 'undefined',
@@ -114,7 +115,7 @@ _TenantPeopleProfileCardPropertyAddCommand_instances = new WeakSet(), _TenantPeo
         if (!propertyName.startsWith('customattribute') && args.options.displayName !== undefined) {
             return `The option 'displayName' can only be used when adding customAttributes as profile card properties`;
         }
-        const unknownOptions = Object.keys(this.getUnknownOptions(args.options));
+        const unknownOptions = Object.keys(optionsUtils.getUnknownOptions(args.options, this.options));
         if (!propertyName.startsWith('customattribute') && unknownOptions.length > 0) {
             return `Unknown options like ${unknownOptions.join(', ')} are only supported with customAttributes`;
         }

package/dist/m365/tenant/commands/people/people-profilecardproperty-set.js

@@ -8,6 +8,7 @@ import GraphCommand from '../../../base/GraphCommand.js';
 import request from '../../../../request.js';
 import { profileCardPropertyNames as allProfileCardPropertyNames } from './profileCardProperties.js';
 import commands from '../../commands.js';
+import { optionsUtils } from '../../../../utils/optionsUtils.js';
 class TenantPeopleProfileCardPropertySetCommand extends GraphCommand {
     get name() {
         return commands.PEOPLE_PROFILECARDPROPERTY_SET;
@@ -73,7 +74,7 @@ class TenantPeopleProfileCardPropertySetCommand extends GraphCommand {
      * @example Transform "--displayName-en-US 'Cost center'" to { languageTag: 'en-US', displayName: 'Cost center' }
      */
     getLocalizations(options) {
-        const unknownOptions = this.getUnknownOptions(options);
+        const unknownOptions = optionsUtils.getUnknownOptions(options, this.options);
         const result = Object.keys(unknownOptions).map(o => ({
             languageTag: o.substring(o.indexOf('-') + 1),
             displayName: unknownOptions[o]
@@ -84,7 +85,7 @@ class TenantPeopleProfileCardPropertySetCommand extends GraphCommand {
 _TenantPeopleProfileCardPropertySetCommand_instances = new WeakSet(), _TenantPeopleProfileCardPropertySetCommand_initTelemetry = function _TenantPeopleProfileCardPropertySetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         // Add unknown options to telemetry
-        const unknownOptions = Object.keys(this.getUnknownOptions(args.options));
+        const unknownOptions = Object.keys(optionsUtils.getUnknownOptions(args.options, this.options));
         const unknownOptionsObj = unknownOptions.reduce((obj, key) => ({ ...obj, [key]: true }), {});
         Object.assign(this.telemetryProperties, {
             displayName: typeof args.options.displayName !== 'undefined',
@@ -104,7 +105,7 @@ _TenantPeopleProfileCardPropertySetCommand_instances = new WeakSet(), _TenantPeo
             return `'${args.options.name}' is not a valid value for option name. Allowed values are: ${this.profileCardPropertyNames.join(', ')}.`;
         }
         // Unknown options are allowed only if they start with 'displayName-'
-        const unknownOptionKeys = Object.keys(this.getUnknownOptions(args.options));
+        const unknownOptionKeys = Object.keys(optionsUtils.getUnknownOptions(args.options, this.options));
         const invalidOptionKey = unknownOptionKeys.find(o => !o.startsWith('displayName-'));
         if (invalidOptionKey) {
             return `Invalid option: '${invalidOptionKey}'`;

package/dist/m365/todo/commands/list/list-remove.js

@@ -46,7 +46,7 @@ class TodoListRemoveCommand extends DelegatedGraphCommand {
             responseType: 'json'
         };
         const response = await request.get(requestOptions);
-        return response.value && response.value.length === 1 ? response.value[0].id : null;
+        return response.value && response.value.length === 1 ? response.value[0].id : undefined;
     }
     async removeList(args) {
         try {