@pnp/cli-microsoft365 10.5.0 → 10.6.0-beta.38233e7

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

@@ -0,0 +1,62 @@
+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 { odata } from '../../../../utils/odata.js';
+const options = globalOptionsZod
+    .extend({
+    resourceId: zod.alias('i', z.string()),
+    resourceType: zod.alias('t', z.enum(['user', 'group', 'device', 'organization']))
+})
+    .strict();
+class GraphOpenExtensionListCommand extends GraphCommand {
+    get name() {
+        return commands.OPENEXTENSION_LIST;
+    }
+    get description() {
+        return 'Retrieves all open extensions for a resource';
+    }
+    defaultProperties() {
+        return ['id', 'extensionName'];
+    }
+    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 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'
+                },
+                responseType: 'json'
+            };
+            if (args.options.verbose) {
+                await logger.logToStderr(`Retrieving open extensions for the ${args.options.resourceType} with id '${args.options.resourceId}'...`);
+            }
+            const res = await odata.getAllItems(requestOptions);
+            await logger.log(res);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new GraphOpenExtensionListCommand();
+//# sourceMappingURL=openextension-list.js.map

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

@@ -0,0 +1,68 @@
+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 { cli } from '../../../../cli/cli.js';
+import request from '../../../../request.js';
+const options = globalOptionsZod
+    .extend({
+    resourceId: zod.alias('i', z.string()),
+    resourceType: zod.alias('t', z.enum(['user', 'group', 'device', 'organization'])),
+    name: zod.alias('n', z.string()),
+    force: zod.alias('f', z.boolean().optional())
+})
+    .strict();
+class GraphOpenExtensionRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.OPENEXTENSION_REMOVE;
+    }
+    get description() {
+        return 'Removes a specific open extension for 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) {
+        const removeOpenExtension = async () => {
+            try {
+                if (this.verbose) {
+                    await logger.logToStderr(`Removing open extension for resource ${args.options.resourceId}...`);
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/${args.options.resourceType}${args.options.resourceType === 'organization' ? '' : 's'}/${args.options.resourceId}/extensions/${args.options.name}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                await request.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeOpenExtension();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove open extension '${args.options.name}' from resource '${args.options.resourceId}' of type '${args.options.resourceType}'?` });
+            if (result) {
+                await removeOpenExtension();
+            }
+        }
+    }
+}
+export default new GraphOpenExtensionRemoveCommand();
+//# sourceMappingURL=openextension-remove.js.map

package/dist/m365/graph/commands.js

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

package/dist/m365/pp/commands/card/card-clone.js

@@ -4,13 +4,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PpCardCloneCommand_instances, _PpCardCloneCommand_initTelemetry, _PpCardCloneCommand_initOptions, _PpCardCloneCommand_initOptionSets, _PpCardCloneCommand_initValidators;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-import ppCardGetCommand from './card-get.js';
 class PpCardCloneCommand extends PowerPlatformCommand {
     get name() {
         return commands.CARD_CLONE;
@@ -30,28 +28,26 @@ class PpCardCloneCommand extends PowerPlatformCommand {
         if (this.verbose) {
             await logger.logToStderr(`Cloning a card from '${args.options.id || args.options.name}'...`);
         }
-        const res = await this.cloneCard(args);
+        const res = await this.cloneCard(args, logger);
         await logger.log(res);
     }
-    async getCardId(args) {
+    async getCardId(args, dynamicsApiUrl, logger) {
         if (args.options.id) {
             return args.options.id;
         }
-        const options = {
-            environmentName: args.options.environmentName,
-            name: args.options.name,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(ppCardGetCommand, { options: { ...options, _: [] } });
-        const getCardOutput = JSON.parse(output.stdout);
-        return getCardOutput.cardid;
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving the card Id for card '${args.options.name}'`);
+        }
+        const card = await powerPlatform.getCardByName(dynamicsApiUrl, args.options.name);
+        return card.cardid;
     }
-    async cloneCard(args) {
+    async cloneCard(args, logger) {
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const cardId = await this.getCardId(args);
+            const cardId = await this.getCardId(args, dynamicsApiUrl, logger);
+            if (this.verbose) {
+                await logger.logToStderr(`Cloning the card with id '${cardId}'`);
+            }
             const requestOptions = {
                 url: `${dynamicsApiUrl}/api/data/v9.1/CardCreateClone`,
                 headers: {

package/dist/m365/pp/commands/card/card-get.js

@@ -4,13 +4,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PpCardGetCommand_instances, _PpCardGetCommand_initTelemetry, _PpCardGetCommand_initOptions, _PpCardGetCommand_initOptionSets, _PpCardGetCommand_initValidators;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-import { formatting } from '../../../../utils/formatting.js';
 class PpCardGetCommand extends PowerPlatformCommand {
     get name() {
         return commands.CARD_GET;
@@ -32,35 +30,31 @@ class PpCardGetCommand extends PowerPlatformCommand {
         }
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const res = await this.getCard(dynamicsApiUrl, args.options);
+            const res = await this.getCard(dynamicsApiUrl, args.options, logger);
             await logger.log(res);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getCard(dynamicsApiUrl, options) {
+    async getCard(dynamicsApiUrl, options, logger) {
+        if (options.name) {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving the card with name '${options.name}'`);
+            }
+            return await powerPlatform.getCardByName(dynamicsApiUrl, options.name);
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving the card with id '${options.id}'`);
+        }
         const requestOptions = {
+            url: `${dynamicsApiUrl}/api/data/v9.1/cards(${options.id})`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
-        if (options.id) {
-            requestOptions.url = `${dynamicsApiUrl}/api/data/v9.1/cards(${options.id})`;
-            const result = await request.get(requestOptions);
-            return result;
-        }
-        requestOptions.url = `${dynamicsApiUrl}/api/data/v9.1/cards?$filter=name eq '${options.name}'`;
-        const result = await request.get(requestOptions);
-        if (result.value.length === 0) {
-            throw `The specified card '${options.name}' does not exist.`;
-        }
-        if (result.value.length > 1) {
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('cardid', result.value);
-            return cli.handleMultipleResultsFound(`Multiple cards with name '${options.name}' found`, resultAsKeyValuePair);
-        }
-        return result.value[0];
+        return await request.get(requestOptions);
     }
 }
 _PpCardGetCommand_instances = new WeakSet(), _PpCardGetCommand_initTelemetry = function _PpCardGetCommand_initTelemetry() {

package/dist/m365/pp/commands/card/card-remove.js

@@ -10,7 +10,6 @@ import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-import ppCardGetCommand from './card-get.js';
 class PpCardRemoveCommand extends PowerPlatformCommand {
     get name() {
         return commands.CARD_REMOVE;
@@ -31,34 +30,32 @@ class PpCardRemoveCommand extends PowerPlatformCommand {
             await logger.logToStderr(`Removing card '${args.options.id || args.options.name}'...`);
         }
         if (args.options.force) {
-            await this.deleteCard(args);
+            await this.deleteCard(args, logger);
         }
         else {
             const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove card '${args.options.id || args.options.name}'?` });
             if (result) {
-                await this.deleteCard(args);
+                await this.deleteCard(args, logger);
             }
         }
     }
-    async getCardId(args) {
+    async getCardId(args, dynamicsApiUrl, logger) {
         if (args.options.id) {
             return args.options.id;
         }
-        const options = {
-            environmentName: args.options.environmentName,
-            name: args.options.name,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(ppCardGetCommand, { options: { ...options, _: [] } });
-        const getCardOutput = JSON.parse(output.stdout);
-        return getCardOutput.cardid;
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving the card with name '${args.options.name}'`);
+        }
+        const card = await powerPlatform.getCardByName(dynamicsApiUrl, args.options.name);
+        return card.cardid;
     }
-    async deleteCard(args) {
+    async deleteCard(args, logger) {
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const cardId = await this.getCardId(args);
+            const cardId = await this.getCardId(args, dynamicsApiUrl, logger);
+            if (this.verbose) {
+                await logger.logToStderr(`Deleting card with Id '${cardId}'`);
+            }
             const requestOptions = {
                 url: `${dynamicsApiUrl}/api/data/v9.1/cards(${cardId})`,
                 headers: {

package/dist/m365/pp/commands/solution/solution-get.js

@@ -49,23 +49,17 @@ class PpSolutionGetCommand extends PowerPlatformCommand {
         }
     }
     async getSolution(dynamicsApiUrl, options) {
+        if (options.name) {
+            return powerPlatform.getSolutionByName(dynamicsApiUrl, options.name);
+        }
         const requestOptions = {
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
-        if (options.id) {
-            requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/solutions(${options.id})?$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
-            const result = await request.get(requestOptions);
-            return result;
-        }
-        requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/solutions?$filter=isvisible eq true and uniquename eq \'${options.name}\'&$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
-        const result = await request.get(requestOptions);
-        if (result.value.length === 0) {
-            throw `The specified solution '${options.name}' does not exist.`;
-        }
-        return result.value[0];
+        requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/solutions(${options.id})?$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
+        return request.get(requestOptions);
     }
 }
 _PpSolutionGetCommand_instances = new WeakSet(), _PpSolutionGetCommand_initTelemetry = function _PpSolutionGetCommand_initTelemetry() {

package/dist/m365/pp/commands/solution/solution-publish.js

@@ -4,14 +4,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PpSolutionPublishCommand_instances, _PpSolutionPublishCommand_initTelemetry, _PpSolutionPublishCommand_initOptions, _PpSolutionPublishCommand_initOptionSets, _PpSolutionPublishCommand_initValidators;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-import ppSolutionGetCommand from './solution-get.js';
 class PpSolutionPublishCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_PUBLISH;
@@ -29,8 +27,8 @@ class PpSolutionPublishCommand extends PowerPlatformCommand {
     }
     async commandAction(logger, args) {
         try {
-            const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const solutionId = await this.getSolutionId(args, logger);
+            const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+            const solutionId = await this.getSolutionId(args, dynamicsApiUrl, logger);
             const solutionComponents = await this.getSolutionComponents(dynamicsApiUrl, solutionId, logger);
             const parameterXml = await this.buildXmlRequestObject(solutionComponents, logger);
             const requestOptions = {
@@ -71,23 +69,15 @@ class PpSolutionPublishCommand extends PowerPlatformCommand {
         const response = await request.get(requestOptions);
         return response.value;
     }
-    async getSolutionId(args, logger) {
+    async getSolutionId(args, dynamicsApiUrl, logger) {
         if (args.options.id) {
             return args.options.id;
         }
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving solutionId`);
+            await logger.logToStderr(`Retrieving solutionId...`);
         }
-        const options = {
-            environmentName: args.options.environmentName,
-            name: args.options.name,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(ppSolutionGetCommand, { options: { ...options, _: [] } });
-        const getSolutionOutput = JSON.parse(output.stdout);
-        return getSolutionOutput.solutionid;
+        const solution = await powerPlatform.getSolutionByName(dynamicsApiUrl, args.options.name);
+        return solution.solutionid;
     }
     async buildXmlRequestObject(solutionComponents, logger) {
         if (this.verbose) {

package/dist/m365/pp/commands/solution/solution-remove.js

@@ -10,7 +10,6 @@ import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-import ppSolutionGetCommand from './solution-get.js';
 class PpSolutionRemoveCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_REMOVE;
@@ -40,25 +39,17 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand {
             }
         }
     }
-    async getSolutionId(args) {
+    async getSolutionId(args, dynamicsApiUrl) {
         if (args.options.id) {
             return args.options.id;
         }
-        const options = {
-            environmentName: args.options.environmentName,
-            name: args.options.name,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(ppSolutionGetCommand, { options: { ...options, _: [] } });
-        const getSolutionOutput = JSON.parse(output.stdout);
-        return getSolutionOutput.solutionid;
+        const solution = await powerPlatform.getSolutionByName(dynamicsApiUrl, args.options.name);
+        return solution.solutionid;
     }
     async deleteSolution(args) {
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const solutionId = await this.getSolutionId(args);
+            const solutionId = await this.getSolutionId(args, dynamicsApiUrl);
             const requestOptions = {
                 url: `${dynamicsApiUrl}/api/data/v9.1/solutions(${solutionId})`,
                 headers: {

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