@pnp/cli-microsoft365 10.3.0-beta.cd20f0c → 10.3.0-beta.ea113b7

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

@@ -12,6 +12,7 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
     get name() {
         return commands.FILE_ROLEASSIGNMENT_REMOVE;
@@ -42,6 +43,20 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
                 else if (args.options.upn) {
                     principalId = await this.getUserPrincipalId(args.options, logger);
                 }
+                else if (args.options.entraGroupId || args.options.entraGroupName) {
+                    if (this.verbose) {
+                        await logger.logToStderr('Retrieving group information...');
+                    }
+                    let group;
+                    if (args.options.entraGroupId) {
+                        group = await entraGroup.getGroupById(args.options.entraGroupId);
+                    }
+                    else {
+                        group = await entraGroup.getGroupByDisplayName(args.options.entraGroupName);
+                    }
+                    const entraSiteUser = await spo.ensureEntraGroup(args.options.webUrl, group);
+                    principalId = entraSiteUser.Id;
+                }
                 else {
                     principalId = args.options.principalId;
                 }
@@ -93,6 +108,8 @@ _SpoFileRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFileRoleAssig
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
+            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
+            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
             force: !!args.options.force
         });
     });
@@ -109,6 +126,10 @@ _SpoFileRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFileRoleAssig
         option: '--upn [upn]'
     }, {
         option: '--groupName [groupName]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '-f, --force'
     });
@@ -121,15 +142,18 @@ _SpoFileRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFileRoleAssig
         if (args.options.principalId && isNaN(args.options.principalId)) {
             return `Specified principalId ${args.options.principalId} is not a number`;
         }
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `'${args.options.entraGroupId}' is not a valid GUID for option entraGroupId`;
+        }
         if (args.options.fileId && !validation.isValidGuid(args.options.fileId)) {
             return `${args.options.fileId} is not a valid GUID`;
         }
         return true;
     });
 }, _SpoFileRoleAssignmentRemoveCommand_initOptionSets = function _SpoFileRoleAssignmentRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['fileUrl', 'fileId'] }, { options: ['upn', 'groupName', 'principalId'] });
+    this.optionSets.push({ options: ['fileUrl', 'fileId'] }, { options: ['upn', 'groupName', 'principalId', 'entraGroupId', 'entraGroupName'] });
 }, _SpoFileRoleAssignmentRemoveCommand_initTypes = function _SpoFileRoleAssignmentRemoveCommand_initTypes() {
-    this.types.string.push('webUrl', 'fileUrl', 'fileId', 'upn', 'groupName');
+    this.types.string.push('webUrl', 'fileUrl', 'fileId', 'upn', 'groupName', 'entraGroupId', 'entraGroupName');
     this.types.boolean.push('force');
 };
 export default new SpoFileRoleAssignmentRemoveCommand();

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

@@ -14,6 +14,8 @@ 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 {
     get name() {
         return commands.FOLDER_ROLEASSIGNMENT_ADD;
@@ -45,37 +47,29 @@ class SpoFolderRoleAssignmentAddCommand extends SpoCommand {
                 requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
             }
             const roleDefinitionId = await this.getRoleDefinitionId(args.options);
+            let principalId = args.options.principalId;
             if (args.options.upn) {
-                const upnPrincipalId = await this.getUserPrincipalId(args.options);
-                await this.breakRoleAssignment(requestUrl);
-                await this.addRoleAssignment(requestUrl, upnPrincipalId, roleDefinitionId);
+                principalId = await this.getUserPrincipalId(args.options);
             }
             else if (args.options.groupName) {
-                const groupPrincipalId = await this.getGroupPrincipalId(args.options);
-                await this.breakRoleAssignment(requestUrl);
-                await this.addRoleAssignment(requestUrl, groupPrincipalId, roleDefinitionId);
+                principalId = await this.getGroupPrincipalId(args.options);
             }
-            else {
-                await this.breakRoleAssignment(requestUrl);
-                await this.addRoleAssignment(requestUrl, args.options.principalId, roleDefinitionId);
+            else if (args.options.entraGroupId || args.options.entraGroupName) {
+                if (this.verbose) {
+                    await logger.logToStderr('Retrieving group information...');
+                }
+                const group = args.options.entraGroupId
+                    ? await entraGroup.getGroupById(args.options.entraGroupId)
+                    : await entraGroup.getGroupByDisplayName(args.options.entraGroupName);
+                const siteUser = await spo.ensureEntraGroup(args.options.webUrl, group);
+                principalId = siteUser.Id;
             }
+            await this.addRoleAssignment(requestUrl, principalId, roleDefinitionId);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async breakRoleAssignment(requestUrl) {
-        const requestOptions = {
-            url: `${requestUrl}/breakroleinheritance(true)`,
-            method: 'POST',
-            headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request.post(requestOptions);
-    }
     async addRoleAssignment(requestUrl, principalId, roleDefinitionId) {
         const requestOptions = {
             url: `${requestUrl}/roleassignments/addroleassignment(principalid='${principalId}',roledefid='${roleDefinitionId}')`,
@@ -140,6 +134,8 @@ _SpoFolderRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFolderRoleAssi
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
+            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
+            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
             roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
             roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined'
         });
@@ -155,6 +151,10 @@ _SpoFolderRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFolderRoleAssi
         option: '--upn [upn]'
     }, {
         option: '--groupName [groupName]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '--roleDefinitionId [roleDefinitionId]'
     }, {
@@ -169,15 +169,18 @@ _SpoFolderRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFolderRoleAssi
         if (args.options.principalId && isNaN(args.options.principalId)) {
             return `Specified principalId ${args.options.principalId} is not a number`;
         }
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `'${args.options.entraGroupId}' is not a valid GUID for option entraGroupId.`;
+        }
         if (args.options.roleDefinitionId && isNaN(args.options.roleDefinitionId)) {
             return `Specified roleDefinitionId ${args.options.roleDefinitionId} is not a number`;
         }
-        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
+        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName, args.options.entraGroupId, args.options.entraGroupName];
         if (!principalOptions.some(item => item !== undefined)) {
-            return `Specify either principalId, upn or groupName`;
+            return `Specify either principalId, upn, groupName, entraGroupId or entraGroupName`;
         }
         if (principalOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either principalId, upn or groupName but not multiple`;
+            return `Specify either principalId, upn, groupName, entraGroupId or entraGroupName but not multiple`;
         }
         const roleDefinitionOptions = [args.options.roleDefinitionId, args.options.roleDefinitionName];
         if (!roleDefinitionOptions.some(item => item !== undefined)) {

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

@@ -13,6 +13,8 @@ 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 {
     get name() {
         return commands.FOLDER_ROLEASSIGNMENT_REMOVE;
@@ -38,15 +40,21 @@ class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand {
             try {
                 if (args.options.upn) {
                     args.options.principalId = await this.getUserPrincipalId(args.options);
-                    await this.removeRoleAssignment(requestUrl, logger, args.options);
                 }
                 else if (args.options.groupName) {
                     args.options.principalId = await this.getGroupPrincipalId(args.options);
-                    await this.removeRoleAssignment(requestUrl, logger, args.options);
                 }
-                else {
-                    await this.removeRoleAssignment(requestUrl, logger, args.options);
+                else if (args.options.entraGroupId || args.options.entraGroupName) {
+                    if (this.verbose) {
+                        await logger.logToStderr('Retrieving group information...');
+                    }
+                    const group = args.options.entraGroupId
+                        ? 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.removeRoleAssignment(requestUrl, logger, args.options);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -106,6 +114,8 @@ _SpoFolderRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFolderRoleA
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
+            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
+            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
             force: !!args.options.force
         });
     });
@@ -120,6 +130,10 @@ _SpoFolderRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFolderRoleA
         option: '--upn [upn]'
     }, {
         option: '--groupName [groupName]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '-f, --force'
     });
@@ -132,12 +146,15 @@ _SpoFolderRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFolderRoleA
         if (args.options.principalId && isNaN(args.options.principalId)) {
             return `Specified principalId ${args.options.principalId} is not a number`;
         }
-        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `'${args.options.entraGroupId}' is not a valid GUID for option entraGroupId.`;
+        }
+        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName, args.options.entraGroupId, args.options.entraGroupName];
         if (principalOptions.some(item => item !== undefined) && principalOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either principalId id, upn or groupName`;
+            return `Specify either principalId id, upn, groupName, entraGroupId or entraGroupName`;
         }
         if (principalOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least principalId id, upn or groupName`;
+            return `Specify at least principalId id, upn, groupName, entraGroupId or entraGroupName`;
         }
         return true;
     });

package/dist/m365/spo/commands/list/list-defaultvalue-list.js

@@ -0,0 +1,140 @@
+import SpoCommand from '../../../base/SpoCommand.js';
+import { globalOptionsZod } from '../../../../Command.js';
+import { z } from 'zod';
+import { zod } from '../../../../utils/zod.js';
+import commands from '../../commands.js';
+import { DOMParser } from '@xmldom/xmldom';
+import { validation } from '../../../../utils/validation.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+const options = globalOptionsZod
+    .extend({
+    webUrl: zod.alias('u', z.string()
+        .refine(url => validation.isValidSharePointUrl(url) === true, url => ({
+        message: `'${url}' is not a valid SharePoint Online site URL.`
+    }))),
+    listId: zod.alias('i', z.string().optional()
+        .refine(id => id === undefined || validation.isValidGuid(id), id => ({
+        message: `'${id}' is not a valid GUID.`
+    }))),
+    listTitle: zod.alias('t', z.string().optional()),
+    listUrl: z.string().optional(),
+    folderUrl: z.string().optional()
+})
+    .strict();
+class SpoListDefaultValueListCommand extends SpoCommand {
+    get name() {
+        return commands.LIST_DEFAULTVALUE_LIST;
+    }
+    get description() {
+        return 'Retrieves default column values for a specific document library';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.listId, options.listTitle, options.listUrl].filter(o => o !== undefined).length === 1, {
+            message: 'Use one of the following options: listId, listTitle, listUrl.'
+        });
+    }
+    async commandAction(logger, args) {
+        try {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving default column values for list '${args.options.listId || args.options.listTitle || args.options.listUrl}'...`);
+                await logger.logToStderr('Retrieving list information...');
+            }
+            const listServerRelUrl = await this.getServerRelativeListUrl(args.options);
+            if (this.verbose) {
+                await logger.logToStderr('Retrieving default column values...');
+            }
+            let defaultValues;
+            try {
+                const defaultValuesXml = await this.getDefaultColumnValuesXml(args.options.webUrl, listServerRelUrl);
+                defaultValues = this.convertXmlToJson(defaultValuesXml);
+            }
+            catch (err) {
+                if (err.status !== 404) {
+                    throw err;
+                }
+                // For lists that have never had default column values set, the client_LocationBasedDefaults.html file does not exist.
+                defaultValues = [];
+            }
+            if (args.options.folderUrl) {
+                const serverRelFolderUrl = urlUtil.removeTrailingSlashes(urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl));
+                defaultValues = defaultValues.filter(d => d.folderUrl.toLowerCase() === serverRelFolderUrl.toLowerCase());
+            }
+            await logger.log(defaultValues);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getServerRelativeListUrl(options) {
+        const requestOptions = {
+            url: `${options.webUrl}/_api/Web`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        if (options.listUrl) {
+            const serverRelativeUrl = urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+            requestOptions.url += `/GetList('${serverRelativeUrl}')`;
+        }
+        else if (options.listId) {
+            requestOptions.url += `/Lists('${options.listId}')`;
+        }
+        else if (options.listTitle) {
+            requestOptions.url += `/Lists/GetByTitle('${formatting.encodeQueryParameter(options.listTitle)}')`;
+        }
+        requestOptions.url += '?$expand=RootFolder&$select=RootFolder/ServerRelativeUrl,BaseTemplate';
+        try {
+            const response = await request.get(requestOptions);
+            if (response.BaseTemplate !== 101) {
+                throw `List '${options.listId || options.listTitle || options.listUrl}' is not a document library.`;
+            }
+            return response.RootFolder.ServerRelativeUrl;
+        }
+        catch (error) {
+            if (error.status === 404) {
+                throw `List '${options.listId || options.listTitle || options.listUrl}' was not found.`;
+            }
+            throw error;
+        }
+    }
+    async getDefaultColumnValuesXml(webUrl, listServerRelUrl) {
+        const requestOptions = {
+            url: `${webUrl}/_api/Web/GetFileByServerRelativePath(decodedUrl='${formatting.encodeQueryParameter(listServerRelUrl + '/Forms/client_LocationBasedDefaults.html')}')/$value`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const defaultValuesXml = await request.get(requestOptions);
+        return defaultValuesXml;
+    }
+    convertXmlToJson(xml) {
+        const results = [];
+        const parser = new DOMParser();
+        const doc = parser.parseFromString(xml, 'application/xml');
+        const folderLinks = doc.getElementsByTagName('a');
+        for (let i = 0; i < folderLinks.length; i++) {
+            const folderUrl = folderLinks[i].getAttribute('href');
+            const defaultValues = folderLinks[i].getElementsByTagName('DefaultValue');
+            for (let j = 0; j < defaultValues.length; j++) {
+                const fieldName = defaultValues[j].getAttribute('FieldName');
+                const fieldValue = defaultValues[j].textContent;
+                results.push({
+                    fieldName: fieldName,
+                    fieldValue: fieldValue,
+                    folderUrl: decodeURIComponent(folderUrl)
+                });
+            }
+        }
+        return results;
+    }
+}
+export default new SpoListDefaultValueListCommand();
+//# sourceMappingURL=list-defaultvalue-list.js.map

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

@@ -6,6 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
@@ -14,6 +15,7 @@ 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() {
         return commands.LISTITEM_ROLEASSIGNMENT_ADD;
@@ -46,7 +48,7 @@ class SpoListItemRoleAssignmentAddCommand extends SpoCommand {
             }
             requestUrl += `items(${args.options.listItemId})/`;
             const roleDefinitionId = await this.getRoleDefinitionId(args.options);
-            let principalId = 0;
+            let principalId = args.options.principalId;
             if (args.options.upn) {
                 principalId = await this.getUserPrincipalId(args.options);
                 await this.addRoleAssignment(requestUrl, roleDefinitionId, principalId);
@@ -55,10 +57,17 @@ class SpoListItemRoleAssignmentAddCommand extends SpoCommand {
                 principalId = await this.getGroupPrincipalId(args.options);
                 await this.addRoleAssignment(requestUrl, roleDefinitionId, principalId);
             }
-            else {
-                principalId = args.options.principalId;
-                await this.addRoleAssignment(requestUrl, roleDefinitionId, principalId);
+            else if (args.options.entraGroupId || args.options.entraGroupName) {
+                if (this.verbose) {
+                    await logger.logToStderr('Retrieving group information...');
+                }
+                const group = args.options.entraGroupId
+                    ? await entraGroup.getGroupById(args.options.entraGroupId)
+                    : await entraGroup.getGroupByDisplayName(args.options.entraGroupName);
+                const siteUser = await spo.ensureEntraGroup(args.options.webUrl, group);
+                principalId = siteUser.Id;
             }
+            await this.addRoleAssignment(requestUrl, roleDefinitionId, principalId);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -126,6 +135,8 @@ _SpoListItemRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListItemRole
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
+            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
+            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
             roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
             roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined'
         });
@@ -147,6 +158,10 @@ _SpoListItemRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListItemRole
         option: '--upn [upn]'
     }, {
         option: '--groupName [groupName]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '--roleDefinitionId [roleDefinitionId]'
     }, {
@@ -177,12 +192,15 @@ _SpoListItemRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListItemRole
         if (listOptions.filter(item => item !== undefined).length === 0) {
             return `Specify at least list id or title or list url`;
         }
-        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
+        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName, args.options.entraGroupId, args.options.entraGroupName];
         if (!principalOptions.some(item => item !== undefined)) {
-            return `Specify either principalId, upn or groupName`;
+            return `Specify either principalId, upn, groupName, entraGroupId or entraGroupName`;
         }
         if (principalOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either principalId, upn or groupName but not multiple`;
+            return `Specify either principalId, upn, groupName, entraGroupId or entraGroupName but not multiple`;
+        }
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `'${args.options.entraGroupId}' is not a valid GUID for option entraGroupId.`;
         }
         const roleDefinitionOptions = [args.options.roleDefinitionId, args.options.roleDefinitionName];
         if (!roleDefinitionOptions.some(item => item !== undefined)) {

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

@@ -13,6 +13,8 @@ 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 {
     get name() {
         return commands.LISTITEM_ROLEASSIGNMENT_REMOVE;
@@ -58,15 +60,21 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand {
             requestUrl += `items(${options.listItemId})/`;
             if (options.upn) {
                 options.principalId = await this.getUserPrincipalId(options);
-                await this.removeRoleAssignmentWithRequestUrl(requestUrl, logger, options);
             }
             else if (options.groupName) {
                 options.principalId = await this.getGroupPrincipalId(options);
-                await this.removeRoleAssignmentWithRequestUrl(requestUrl, logger, options);
             }
-            else {
-                await this.removeRoleAssignmentWithRequestUrl(requestUrl, logger, options);
+            else if (options.entraGroupId || options.entraGroupName) {
+                if (this.verbose) {
+                    await logger.logToStderr('Retrieving group information...');
+                }
+                const group = options.entraGroupId
+                    ? await entraGroup.getGroupById(options.entraGroupId)
+                    : await entraGroup.getGroupByDisplayName(options.entraGroupName);
+                const siteUser = await spo.ensureEntraGroup(options.webUrl, group);
+                options.principalId = siteUser.Id;
             }
+            await this.removeRoleAssignmentWithRequestUrl(requestUrl, logger, options);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -119,6 +127,8 @@ _SpoListItemRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListItemR
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
+            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
+            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
             force: (!(!args.options.force)).toString()
         });
     });
@@ -139,6 +149,10 @@ _SpoListItemRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListItemR
         option: '--upn [upn]'
     }, {
         option: '--groupName [groupName]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '-f, --force'
     });
@@ -157,10 +171,13 @@ _SpoListItemRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListItemR
         if (args.options.principalId && isNaN(args.options.principalId)) {
             return `Specified principalId ${args.options.principalId} is not a number`;
         }
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `'${args.options.entraGroupId}' is not a valid GUID for option entraGroupId.`;
+        }
         return true;
     });
 }, _SpoListItemRoleAssignmentRemoveCommand_initOptionSets = function _SpoListItemRoleAssignmentRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName'] });
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName', 'entraGroupId', 'entraGroupName'] });
 };
 export default new SpoListItemRoleAssignmentRemoveCommand();
 //# sourceMappingURL=listitem-roleassignment-remove.js.map

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

@@ -12,6 +12,8 @@ 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;
@@ -35,15 +37,21 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             args.options.roleDefinitionId = await this.getRoleDefinitionId(args.options);
             if (args.options.upn) {
                 args.options.principalId = await this.getUserPrincipalId(args.options);
-                await this.addRoleAssignment(logger, args.options);
             }
             else if (args.options.groupName) {
                 args.options.principalId = await this.getGroupPrincipalId(args.options);
-                await this.addRoleAssignment(logger, args.options);
             }
-            else {
-                await this.addRoleAssignment(logger, args.options);
+            else if (args.options.entraGroupId || args.options.entraGroupName) {
+                if (this.verbose) {
+                    await logger.logToStderr('Retrieving group information...');
+                }
+                const group = args.options.entraGroupId
+                    ? 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(logger, args.options);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -108,6 +116,8 @@ _SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignment
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
+            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
+            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
             roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
             roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined'
         });
@@ -121,6 +131,10 @@ _SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignment
         option: '--upn [upn]'
     }, {
         option: '--groupName [groupName]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '--roleDefinitionId [roleDefinitionId]'
     }, {
@@ -138,10 +152,13 @@ _SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignment
         if (args.options.roleDefinitionId && isNaN(args.options.roleDefinitionId)) {
             return `Specified roleDefinitionId ${args.options.roleDefinitionId} is not a number`;
         }
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `'${args.options.entraGroupId}' is not a valid GUID for option entraGroupId.`;
+        }
         return true;
     });
 }, _SpoWebRoleAssignmentAddCommand_initOptionSets = function _SpoWebRoleAssignmentAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['principalId', 'upn', 'groupName'] }, { options: ['roleDefinitionId', 'roleDefinitionName'] });
+    this.optionSets.push({ options: ['principalId', 'upn', 'groupName', 'entraGroupId', 'entraGroupName'] }, { options: ['roleDefinitionId', 'roleDefinitionName'] });
 };
 export default new SpoWebRoleAssignmentAddCommand();
 //# sourceMappingURL=web-roleassignment-add.js.map