@pnp/cli-microsoft365 10.6.0-beta.36bb898 → 10.6.0-beta.3facb8f

package/dist/Command.js

@@ -15,6 +15,7 @@ import { accessToken } from './utils/accessToken.js';
 import { md } from './utils/md.js';
 import { prompt } from './utils/prompt.js';
 import { zod } from './utils/zod.js';
+import { optionsUtils } from './utils/optionsUtils.js';
 export class CommandError {
     constructor(message, code) {
         this.message = message;
@@ -337,39 +338,16 @@ class Command {
         }
         await telemetry.trackEvent(this.getUsedCommandName(), this.getTelemetryProperties(args));
     }
-    getUnknownOptions(options) {
-        const unknownOptions = JSON.parse(JSON.stringify(options));
-        // remove minimist catch-all option
-        delete unknownOptions._;
-        const knownOptions = this.options;
-        const longOptionRegex = /--([^\s]+)/;
-        const shortOptionRegex = /-([a-z])\b/;
-        knownOptions.forEach(o => {
-            const longOptionName = longOptionRegex.exec(o.option)[1];
-            delete unknownOptions[longOptionName];
-            // short names are optional so we need to check if the current command has
-            // one before continuing
-            const shortOptionMatch = shortOptionRegex.exec(o.option);
-            if (shortOptionMatch) {
-                const shortOptionName = shortOptionMatch[1];
-                delete unknownOptions[shortOptionName];
-            }
-        });
-        return unknownOptions;
-    }
     trackUnknownOptions(telemetryProps, options) {
-        const unknownOptions = this.getUnknownOptions(options);
+        const unknownOptions = optionsUtils.getUnknownOptions(options, this.options);
         const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
         unknownOptionsNames.forEach(o => {
             telemetryProps[o] = true;
         });
     }
     addUnknownOptionsToPayload(payload, options) {
-        const unknownOptions = this.getUnknownOptions(options);
-        const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
-        unknownOptionsNames.forEach(o => {
-            payload[o] = unknownOptions[o];
-        });
+        const unknownOptions = optionsUtils.getUnknownOptions(options, this.options);
+        optionsUtils.addUnknownOptionsToPayload(payload, unknownOptions);
     }
     loadValuesFromAccessToken(args) {
         if (!auth.connection.accessTokens[auth.defaultResource]) {

package/dist/config.js

@@ -29,6 +29,7 @@ export default {
         'https://graph.microsoft.com/OnlineMeetingArtifact.Read.All',
         'https://graph.microsoft.com/OnlineMeetings.ReadWrite',
         'https://graph.microsoft.com/OnlineMeetingTranscript.Read.All',
+        'https://graph.microsoft.com/Organization.ReadWrite.All',
         'https://graph.microsoft.com/PeopleSettings.ReadWrite.All',
         'https://graph.microsoft.com/Place.Read.All',
         'https://graph.microsoft.com/Policy.Read.All',

package/dist/m365/adaptivecard/commands/adaptivecard-send.js

@@ -7,6 +7,7 @@ var _AdaptiveCardSendCommand_instances, _AdaptiveCardSendCommand_initTelemetry,
 import request from '../../../request.js';
 import AnonymousCommand from '../../base/AnonymousCommand.js';
 import commands from '../commands.js';
+import { optionsUtils } from '../../../utils/optionsUtils.js';
 class AdaptiveCardSendCommand extends AnonymousCommand {
     get name() {
         return commands.SEND;
@@ -26,7 +27,7 @@ class AdaptiveCardSendCommand extends AnonymousCommand {
         return true;
     }
     async commandAction(logger, args) {
-        const unknownOptions = this.getUnknownOptions(args.options);
+        const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
         const unknownOptionNames = Object.getOwnPropertyNames(unknownOptions);
         const card = await this.getCard(args, unknownOptionNames, unknownOptions);
         const requestOptions = {

package/dist/m365/base/SpoCommand.js

@@ -1,6 +1,7 @@
 import { createRequire } from 'module';
 import auth, { AuthType } from '../../Auth.js';
 import Command, { CommandError } from '../../Command.js';
+import { optionsUtils } from '../../utils/optionsUtils.js';
 const require = createRequire(import.meta.url);
 const csomDefs = require('../../../csom.json');
 export default class SpoCommand extends Command {
@@ -70,7 +71,7 @@ export default class SpoCommand extends Command {
         }
     }
     validateUnknownCsomOptions(options, csomObject, csomPropertyType) {
-        const unknownOptions = this.getUnknownOptions(options);
+        const unknownOptions = optionsUtils.getUnknownOptions(options, this.options);
         const optionNames = Object.getOwnPropertyNames(unknownOptions);
         if (optionNames.length === 0) {
             return true;

package/dist/m365/commands/request.js

@@ -36,11 +36,7 @@ class RequestCommand extends Command {
             const url = this.resolveUrlTokens(args.options.url);
             const method = (args.options.method || 'get').toUpperCase();
             const headers = {};
-            const unknownOptions = this.getUnknownOptions(args.options);
-            const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
-            unknownOptionsNames.forEach(o => {
-                headers[o] = unknownOptions[o];
-            });
+            this.addUnknownOptionsToPayload(headers, args.options);
             if (!headers.accept) {
                 headers.accept = 'application/json';
             }
@@ -105,19 +101,14 @@ class RequestCommand extends Command {
 }
 _RequestCommand_instances = new WeakSet(), _RequestCommand_initTelemetry = function _RequestCommand_initTelemetry() {
     this.telemetry.push((args) => {
-        const properties = {
+        Object.assign(this.telemetryProperties, {
             method: args.options.method || 'get',
             resource: typeof args.options.resource !== 'undefined',
             accept: args.options.accept || 'application/json',
             body: typeof args.options.body !== 'undefined',
             filePath: typeof args.options.filePath !== 'undefined'
-        };
-        const unknownOptions = this.getUnknownOptions(args.options);
-        const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
-        unknownOptionsNames.forEach(o => {
-            properties[o] = typeof unknownOptions[o] !== 'undefined';
         });
-        Object.assign(this.telemetryProperties, properties);
+        this.trackUnknownOptions(this.telemetryProperties, args.options);
     });
 }, _RequestCommand_initOptions = function _RequestCommand_initOptions() {
     this.options.unshift({

package/dist/m365/commands/setup.js

@@ -18,6 +18,7 @@ import { validation } from '../../utils/validation.js';
 import AnonymousCommand from '../base/AnonymousCommand.js';
 import commands from './commands.js';
 import { interactivePreset, powerShellPreset, scriptingPreset } from './setupPresets.js';
+import { optionsUtils } from '../../utils/optionsUtils.js';
 export var CliUsageMode;
 (function (CliUsageMode) {
     CliUsageMode["Interactively"] = "interactively";
@@ -227,6 +228,7 @@ class SetupCommand extends AnonymousCommand {
         });
         const appInfo = await entraApp.createAppRegistration({
             options,
+            unknownOptions: optionsUtils.getUnknownOptions(options, this.options),
             apis,
             logger,
             verbose: this.verbose,

package/dist/m365/entra/commands/administrativeunit/administrativeunit-add.js

@@ -14,6 +14,9 @@ class EntraAdministrativeUnitAddCommand extends GraphCommand {
     get description() {
         return 'Creates an administrative unit';
     }
+    allowUnknownOptions() {
+        return true;
+    }
     constructor() {
         super();
         _EntraAdministrativeUnitAddCommand_instances.add(this);
@@ -21,17 +24,19 @@ class EntraAdministrativeUnitAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAdministrativeUnitAddCommand_instances, "m", _EntraAdministrativeUnitAddCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
+        const requestBody = {
+            description: args.options.description,
+            displayName: args.options.displayName,
+            visibility: args.options.hiddenMembership ? 'HiddenMembership' : null
+        };
+        this.addUnknownOptionsToPayload(requestBody, args.options);
         const requestOptions = {
             url: `${this.resource}/v1.0/directory/administrativeUnits`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json',
-            data: {
-                description: args.options.description,
-                displayName: args.options.displayName,
-                visibility: args.options.hiddenMembership ? 'HiddenMembership' : null
-            }
+            data: requestBody
         };
         try {
             const administrativeUnit = await request.post(requestOptions);

package/dist/m365/entra/commands/app/app-add.js

@@ -12,6 +12,7 @@ import { accessToken } from '../../../../utils/accessToken.js';
 import { entraApp } from '../../../../utils/entraApp.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { optionsUtils } from '../../../../utils/optionsUtils.js';
 class EntraAppAddCommand extends GraphCommand {
     get name() {
         return commands.APP_ADD;
@@ -19,6 +20,9 @@ class EntraAppAddCommand extends GraphCommand {
     get description() {
         return 'Creates new Entra app registration';
     }
+    allowUnknownOptions() {
+        return true;
+    }
     constructor() {
         super();
         _EntraAppAddCommand_instances.add(this);
@@ -43,6 +47,7 @@ class EntraAppAddCommand extends GraphCommand {
             });
             let appInfo = await entraApp.createAppRegistration({
                 options: args.options,
+                unknownOptions: optionsUtils.getUnknownOptions(args.options, this.options),
                 apis,
                 logger,
                 verbose: this.verbose,

package/dist/m365/entra/commands/app/app-set.js

@@ -10,6 +10,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { cli } from '../../../../cli/cli.js';
+import { optionsUtils } from '../../../../utils/optionsUtils.js';
 class EntraAppSetCommand extends GraphCommand {
     get name() {
         return commands.APP_SET;
@@ -17,6 +18,9 @@ class EntraAppSetCommand extends GraphCommand {
     get description() {
         return 'Updates Entra app registration';
     }
+    allowUnknownOptions() {
+        return true;
+    }
     constructor() {
         super();
         _EntraAppSetCommand_instances.add(this);
@@ -29,6 +33,7 @@ class EntraAppSetCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             let objectId = await this.getAppObjectId(args, logger);
+            objectId = await this.updateUnknownOptions(args, objectId);
             objectId = await this.configureUri(args, objectId, logger);
             objectId = await this.configureRedirectUris(args, objectId, logger);
             objectId = await this.updateAllowPublicClientFlows(args, objectId, logger);
@@ -68,6 +73,23 @@ class EntraAppSetCommand extends GraphCommand {
         const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registration with name '${name}' found.`, resultAsKeyValuePair);
         return result.id;
     }
+    async updateUnknownOptions(args, objectId) {
+        const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
+        if (Object.keys(unknownOptions).length > 0) {
+            const requestBody = {};
+            optionsUtils.addUnknownOptionsToPayload(requestBody, unknownOptions);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
+                headers: {
+                    'content-type': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: requestBody
+            };
+            await request.patch(requestOptions);
+        }
+        return objectId;
+    }
     async updateAllowPublicClientFlows(args, objectId, logger) {
         if (args.options.allowPublicClientFlows === undefined) {
             return objectId;
@@ -270,6 +292,7 @@ _a = EntraAppSetCommand, _EntraAppSetCommand_instances = new WeakSet(), _EntraAp
             certificateDisplayName: typeof args.options.certificateDisplayName !== 'undefined',
             allowPublicClientFlows: typeof args.options.allowPublicClientFlows !== 'undefined'
         });
+        this.trackUnknownOptions(this.telemetryProperties, args.options);
     });
 }, _EntraAppSetCommand_initOptions = function _EntraAppSetCommand_initOptions() {
     this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '-n, --name [name]' }, { option: '-u, --uris [uris]' }, { option: '-r, --redirectUris [redirectUris]' }, { option: '--certificateFile [certificateFile]' }, { option: '--certificateBase64Encoded [certificateBase64Encoded]' }, { option: '--certificateDisplayName [certificateDisplayName]' }, {

package/dist/m365/entra/commands/group/group-add.js

@@ -212,6 +212,7 @@ _EntraGroupAddCommand_instances = new WeakSet(), _EntraGroupAddCommand_initOptio
             memberUserNames: typeof args.options.memberUserNames !== 'undefined',
             visibility: typeof args.options.visibility !== 'undefined'
         });
+        this.trackUnknownOptions(this.telemetryProperties, args.options);
     });
 };
 export default new EntraGroupAddCommand();

package/dist/m365/entra/commands/group/group-set.js

@@ -19,6 +19,9 @@ class EntraGroupSetCommand extends GraphCommand {
     get description() {
         return 'Updates a Microsoft Entra group';
     }
+    allowUnknownOptions() {
+        return true;
+    }
     constructor() {
         super();
         _EntraGroupSetCommand_instances.add(this);
@@ -38,17 +41,19 @@ class EntraGroupSetCommand extends GraphCommand {
                 }
                 groupId = await entraGroup.getGroupIdByDisplayName(args.options.displayName);
             }
+            const requestBody = {
+                displayName: args.options.newDisplayName,
+                description: args.options.description === '' ? null : args.options.description,
+                mailNickName: args.options.mailNickname,
+                visibility: args.options.visibility
+            };
+            this.addUnknownOptionsToPayload(requestBody, args.options);
             const requestOptions = {
                 url: `${this.resource}/v1.0/groups/${groupId}`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
-                data: {
-                    displayName: args.options.newDisplayName,
-                    description: args.options.description === '' ? null : args.options.description,
-                    mailNickName: args.options.mailNickname,
-                    visibility: args.options.visibility
-                }
+                data: requestBody
             };
             await request.patch(requestOptions);
             const ownerIds = await this.getUserIds(logger, args.options.ownerIds, args.options.ownerUserNames);
@@ -167,6 +172,7 @@ _EntraGroupSetCommand_instances = new WeakSet(), _EntraGroupSetCommand_initTelem
             memberUserNames: typeof args.options.memberUserNames !== 'undefined',
             visibility: typeof args.options.visibility !== 'undefined'
         });
+        this.trackUnknownOptions(this.telemetryProperties, args.options);
     });
 }, _EntraGroupSetCommand_initOptions = function _EntraGroupSetCommand_initOptions() {
     this.options.unshift({

package/dist/m365/entra/commands/user/user-add.js

@@ -131,6 +131,7 @@ _EntraUserAddCommand_instances = new WeakSet(), _EntraUserAddCommand_initTelemet
             managerUserId: typeof args.options.managerUserId !== 'undefined',
             managerUserName: typeof args.options.managerUserName !== 'undefined'
         });
+        this.trackUnknownOptions(this.telemetryProperties, args.options);
     });
 }, _EntraUserAddCommand_initOptions = function _EntraUserAddCommand_initOptions() {
     this.options.unshift({

package/dist/m365/entra/commands/user/user-list.js

@@ -8,6 +8,7 @@ import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import { optionsUtils } from '../../../../utils/optionsUtils.js';
 class EntraUserListCommand extends GraphCommand {
     get name() {
         return commands.USER_LIST;
@@ -56,7 +57,7 @@ class EntraUserListCommand extends GraphCommand {
     }
     getFilter(options) {
         const filters = [];
-        const unknownOptions = this.getUnknownOptions(options);
+        const unknownOptions = optionsUtils.getUnknownOptions(options, this.options);
         Object.keys(unknownOptions).forEach(key => {
             if (typeof options[key] === 'boolean') {
                 throw `Specify value for the ${key} property`;

package/dist/m365/external/commands/item/item-add.js

@@ -47,7 +47,7 @@ class ExternalItemAddCommand extends GraphCommand {
         // we need to rewrite the @odata properties to the correct format
         // to extract multiple values for collections into arrays
         this.rewriteCollectionProperties(args.options);
-        this.addUnknownOptionsToPayload(requestBody.properties, args.options);
+        this.addUnknownOptionsToPayload(requestBody, args.options);
         const requestOptions = {
             url: `${this.resource}/v1.0/external/connections/${args.options.externalConnectionId}/items/${args.options.id}`,
             headers: {
@@ -96,6 +96,7 @@ _a = ExternalItemAddCommand, _ExternalItemAddCommand_instances = new WeakSet(),
         Object.assign(this.telemetryProperties, {
             contentType: typeof args.options.contentType
         });
+        this.trackUnknownOptions(this.telemetryProperties, args.options);
     });
 }, _ExternalItemAddCommand_initOptions = function _ExternalItemAddCommand_initOptions() {
     this.options.unshift({

package/dist/m365/graph/commands/openextension/openextension-add.js

@@ -0,0 +1,73 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
+import { validation } from '../../../../utils/validation.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import request from '../../../../request.js';
+import { optionsUtils } from '../../../../utils/optionsUtils.js';
+const options = globalOptionsZod
+    .extend({
+    name: zod.alias('n', z.string()),
+    resourceId: zod.alias('i', z.string()),
+    resourceType: zod.alias('t', z.enum(['user', 'group', 'device', 'organization']))
+})
+    .and(z.any());
+class GraphOpenExtensionAddCommand extends GraphCommand {
+    get name() {
+        return commands.OPENEXTENSION_ADD;
+    }
+    get description() {
+        return 'Adds an open extension to a resource';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => options.resourceType !== 'group' && options.resourceType !== 'device' && options.resourceType !== 'organization' || (options.resourceId && validation.isValidGuid(options.resourceId)), options => ({
+            message: `The '${options.resourceId}' must be a valid GUID`,
+            path: ['resourceId']
+        }))
+            .refine(options => options.resourceType !== 'user' || (options.resourceId && (validation.isValidGuid(options.resourceId) || validation.isValidUserPrincipalName(options.resourceId))), options => ({
+            message: `The '${options.resourceId}' must be a valid GUID or user principal name`,
+            path: ['resourceId']
+        }));
+    }
+    async commandAction(logger, args) {
+        try {
+            const requestBody = {};
+            requestBody["extensionName"] = args.options.name;
+            const unknownOptions = optionsUtils.getUnknownOptions(args.options, this.options);
+            const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
+            unknownOptionsNames.forEach(async (o) => {
+                try {
+                    const jsonObject = JSON.parse(unknownOptions[o]);
+                    requestBody[o] = jsonObject;
+                }
+                catch {
+                    requestBody[o] = unknownOptions[o];
+                }
+            });
+            const requestOptions = {
+                url: `${this.resource}/v1.0/${args.options.resourceType}${args.options.resourceType === 'organization' ? '' : 's'}/${args.options.resourceId}/extensions`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            if (args.options.verbose) {
+                await logger.logToStderr(`Adding open extension to the ${args.options.resourceType} with id '${args.options.resourceId}'...`);
+            }
+            const res = await request.post(requestOptions);
+            await logger.log(res);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new GraphOpenExtensionAddCommand();
+//# sourceMappingURL=openextension-add.js.map

package/dist/m365/graph/commands.js

@@ -4,6 +4,7 @@ export default {
     DIRECTORYEXTENSION_ADD: `${prefix} directoryextension add`,
     DIRECTORYEXTENSION_GET: `${prefix} directoryextension get`,
     DIRECTORYEXTENSION_REMOVE: `${prefix} directoryextension remove`,
+    OPENEXTENSION_ADD: `${prefix} openextension add`,
     SCHEMAEXTENSION_ADD: `${prefix} schemaextension add`,
     SCHEMAEXTENSION_GET: `${prefix} schemaextension get`,
     SCHEMAEXTENSION_LIST: `${prefix} schemaextension list`,

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() {