@pnp/cli-microsoft365 9.0.0-beta.2f8dd1e → 9.0.0-beta.39e78b2

package/dist/m365/spo/commands/folder/folder-sharinglink-list.js

@@ -0,0 +1,110 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoFolderSharingLinkListCommand_instances, _SpoFolderSharingLinkListCommand_initTelemetry, _SpoFolderSharingLinkListCommand_initOptions, _SpoFolderSharingLinkListCommand_initOptionSets, _SpoFolderSharingLinkListCommand_initValidators, _SpoFolderSharingLinkListCommand_initTypes;
+import { cli } from '../../../../cli/cli.js';
+import { spo } from '../../../../utils/spo.js';
+import { odata } from '../../../../utils/odata.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import { drive } from '../../../../utils/drive.js';
+import { validation } from '../../../../utils/validation.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+class SpoFolderSharingLinkListCommand extends SpoCommand {
+    get name() {
+        return commands.FOLDER_SHARINGLINK_LIST;
+    }
+    get description() {
+        return 'Lists all the sharing links of a specific folder';
+    }
+    defaultProperties() {
+        return ['id', 'scope', 'roles', 'link'];
+    }
+    constructor() {
+        super();
+        _SpoFolderSharingLinkListCommand_instances.add(this);
+        this.allowedScopes = ['anonymous', 'users', 'organization'];
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkListCommand_instances, "m", _SpoFolderSharingLinkListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkListCommand_instances, "m", _SpoFolderSharingLinkListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkListCommand_instances, "m", _SpoFolderSharingLinkListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkListCommand_instances, "m", _SpoFolderSharingLinkListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderSharingLinkListCommand_instances, "m", _SpoFolderSharingLinkListCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving sharing links for folder ${args.options.folderId || args.options.folderUrl}...`);
+        }
+        try {
+            const relFolderUrl = await spo.getFolderServerRelativeUrl(args.options.webUrl, args.options.folderUrl, args.options.folderId, logger, args.options.verbose);
+            const absoluteFolderUrl = urlUtil.getAbsoluteUrl(args.options.webUrl, relFolderUrl);
+            const folderUrl = new URL(absoluteFolderUrl);
+            const siteId = await spo.getSiteId(args.options.webUrl);
+            const driveDetails = await drive.getDriveByUrl(siteId, folderUrl, logger, args.options.verbose);
+            const itemId = await drive.getDriveItemId(driveDetails, folderUrl, logger, args.options.verbose);
+            let requestUrl = `https://graph.microsoft.com/v1.0/drives/${driveDetails.id}/items/${itemId}/permissions?$filter=Link ne null`;
+            if (args.options.scope) {
+                requestUrl += ` and Link/Scope eq '${args.options.scope}'`;
+            }
+            const sharingLinks = await odata.getAllItems(requestUrl);
+            // remove grantedToIdentities from the sharing link object
+            const filteredSharingLinks = sharingLinks.map(link => {
+                // eslint-disable-next-line @typescript-eslint/no-unused-vars
+                const { grantedToIdentities, ...filteredLink } = link;
+                return filteredLink;
+            });
+            if (!args.options.output || !cli.shouldTrimOutput(args.options.output)) {
+                await logger.log(filteredSharingLinks);
+            }
+            else {
+                //converted to text friendly output
+                await logger.log(filteredSharingLinks.map(i => {
+                    return {
+                        id: i.id,
+                        roles: i.roles.join(','),
+                        link: i.link.webUrl,
+                        scope: i.link.scope
+                    };
+                }));
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_SpoFolderSharingLinkListCommand_instances = new WeakSet(), _SpoFolderSharingLinkListCommand_initTelemetry = function _SpoFolderSharingLinkListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            folderUrl: typeof args.options.folderUrl !== 'undefined',
+            folderId: typeof args.options.folderId !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined'
+        });
+    });
+}, _SpoFolderSharingLinkListCommand_initOptions = function _SpoFolderSharingLinkListCommand_initOptions() {
+    this.options.unshift({ option: '-u, --webUrl <webUrl>' }, { option: '--folderUrl [folderUrl]' }, { option: '--folderId [folderId]' }, {
+        option: '-s, --scope [scope]',
+        autocomplete: this.allowedScopes
+    });
+}, _SpoFolderSharingLinkListCommand_initOptionSets = function _SpoFolderSharingLinkListCommand_initOptionSets() {
+    this.optionSets.push({ options: ['folderUrl', 'folderId'] });
+}, _SpoFolderSharingLinkListCommand_initValidators = function _SpoFolderSharingLinkListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.folderId && !validation.isValidGuid(args.options.folderId)) {
+            return `${args.options.folderId} is not a valid GUID`;
+        }
+        if (args.options.scope && !this.allowedScopes.some(scope => scope === args.options.scope)) {
+            return `'${args.options.scope}' is not a valid scope. Allowed values are: ${this.allowedScopes.join(',')}`;
+        }
+        return true;
+    });
+}, _SpoFolderSharingLinkListCommand_initTypes = function _SpoFolderSharingLinkListCommand_initTypes() {
+    this.types.string.push('webUrl', 'folderUrl', 'folderId', 'scope');
+};
+export default new SpoFolderSharingLinkListCommand();
+//# sourceMappingURL=folder-sharinglink-list.js.map

package/dist/m365/spo/commands/group/group-member-add.js

@@ -3,12 +3,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoGroupMemberAddCommand_instances, _SpoGroupMemberAddCommand_initTelemetry, _SpoGroupMemberAddCommand_initOptions, _SpoGroupMemberAddCommand_initValidators, _SpoGroupMemberAddCommand_initOptionSets;
+var _SpoGroupMemberAddCommand_instances, _SpoGroupMemberAddCommand_initTelemetry, _SpoGroupMemberAddCommand_initOptions, _SpoGroupMemberAddCommand_initValidators, _SpoGroupMemberAddCommand_initOptionSets, _SpoGroupMemberAddCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
-import { entraUser } from '../../../../utils/entraUser.js';
 import { formatting } from '../../../../utils/formatting.js';
-import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
@@ -20,7 +18,7 @@ class SpoGroupMemberAddCommand extends SpoCommand {
         return 'Add members to a SharePoint Group';
     }
     defaultProperties() {
-        return ['DisplayName', 'Email'];
+        return ['Title', 'UserPrincipalName'];
     }
     constructor() {
         super();
@@ -29,110 +27,100 @@ class SpoGroupMemberAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoGroupMemberAddCommand_instances, "m", _SpoGroupMemberAddCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
             if (args.options.aadGroupIds) {
                 args.options.entraGroupIds = args.options.aadGroupIds;
-                await this.warn(logger, `Option 'aadGroupIds' is deprecated. Please use 'entraGroupIds' instead`);
+                await this.warn(logger, `Option 'aadGroupIds' is deprecated. Please use 'entraGroupIds' instead.`);
             }
             if (args.options.aadGroupNames) {
                 args.options.entraGroupNames = args.options.aadGroupNames;
-                await this.warn(logger, `Option 'aadGroupNames' is deprecated. Please use 'entraGroupNames' instead`);
+                await this.warn(logger, `Option 'aadGroupNames' is deprecated. Please use 'entraGroupNames' instead.`);
             }
-            const groupId = await this.getGroupId(args, logger);
-            const resolvedUsernameList = await this.getValidUsers(args, logger);
+            const loginNames = await this.getLoginNames(logger, args.options);
+            let apiUrl = `${args.options.webUrl}/_api/web/SiteGroups`;
+            if (args.options.groupId) {
+                apiUrl += `/GetById(${args.options.groupId})`;
+            }
+            else {
+                apiUrl += `/GetByName('${formatting.encodeQueryParameter(args.options.groupName)}')`;
+            }
+            apiUrl += '/users';
             if (this.verbose) {
-                await logger.logToStderr(`Adding resource(s) to SharePoint Group ${args.options.groupId || args.options.groupName}`);
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/SP.Web.ShareObject`,
-                headers: {
-                    accept: 'application/json;odata=nometadata',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: {
-                    url: args.options.webUrl,
-                    peoplePickerInput: this.getFormattedUserList(resolvedUsernameList),
-                    roleValue: `group:${groupId}`
-                }
-            };
-            const sharingResult = await request.post(requestOptions);
-            if (sharingResult.ErrorMessage !== null) {
-                throw sharingResult.ErrorMessage;
+                await logger.logToStderr('Adding members to group...');
+            }
+            const result = [];
+            for (const loginName of loginNames) {
+                const requestOptions = {
+                    url: apiUrl,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json',
+                    data: {
+                        LoginName: loginName
+                    }
+                };
+                const response = await request.post(requestOptions);
+                result.push(response);
             }
-            await logger.log(sharingResult.UsersAddedToGroup);
+            await logger.log(result);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getGroupId(args, logger) {
-        if (this.verbose) {
-            await logger.logToStderr(`Getting group Id for SharePoint Group ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
-        }
-        const getGroupMethod = args.options.groupName ?
-            `GetByName('${formatting.encodeQueryParameter(args.options.groupName)}')` :
-            `GetById('${args.options.groupId}')`;
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/sitegroups/${getGroupMethod}?$select=Id`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        const response = await request.get(requestOptions);
-        return response.Id;
-    }
-    async getValidUsers(args, logger) {
-        if (this.verbose) {
-            await logger.logToStderr('Checking if the specified users and groups exist');
+    async getLoginNames(logger, options) {
+        const loginNames = [];
+        if (options.userNames || options.emails) {
+            loginNames.push(...formatting.splitAndTrim(options.userNames || options.emails).map(u => `i:0#.f|membership|${u}`));
         }
-        const validUserNames = [];
-        const identifiers = args.options.userNames ?? args.options.emails ?? args.options.entraGroupIds ?? args.options.entraGroupNames ?? args.options.userIds.toString();
-        await Promise.all(identifiers.split(',').map(async (identifier) => {
-            const trimmedIdentifier = identifier.trim();
-            try {
-                if (args.options.userIds) {
-                    if (this.verbose) {
-                        await logger.logToStderr(`Getting AAD ID of user with ID ${trimmedIdentifier}`);
-                    }
-                    const spoUserAzureId = await spo.getUserAzureIdBySpoId(args.options.webUrl, trimmedIdentifier);
-                    validUserNames.push(spoUserAzureId);
-                }
-                else if (args.options.userNames) {
-                    validUserNames.push(trimmedIdentifier);
-                }
-                else if (args.options.entraGroupIds) {
-                    validUserNames.push(trimmedIdentifier);
-                }
-                else if (args.options.entraGroupNames) {
-                    if (this.verbose) {
-                        await logger.logToStderr(`Getting ID of Microsoft Entra group ${trimmedIdentifier}`);
-                    }
-                    const groupId = await entraGroup.getGroupIdByDisplayName(trimmedIdentifier);
-                    validUserNames.push(groupId);
+        else if (options.entraGroupIds || options.entraGroupNames) {
+            if (this.verbose) {
+                await logger.logToStderr(`Resolving ${(options.entraGroupIds || options.entraGroupNames).length} group(s)...`);
+            }
+            const groups = [];
+            if (options.entraGroupIds) {
+                const groupIds = formatting.splitAndTrim(options.entraGroupIds);
+                for (const groupId of groupIds) {
+                    const group = await entraGroup.getGroupById(groupId);
+                    groups.push(group);
                 }
-                else {
-                    if (this.verbose) {
-                        await logger.logToStderr(`Getting Microsoft Entra ID for user ${trimmedIdentifier}`);
-                    }
-                    const upn = await entraUser.getUserIdByEmail(trimmedIdentifier);
-                    validUserNames.push(upn);
+            }
+            else {
+                const groupNames = formatting.splitAndTrim(options.entraGroupNames);
+                for (const groupName of groupNames) {
+                    const group = await entraGroup.getGroupByDisplayName(groupName);
+                    groups.push(group);
                 }
             }
-            catch (err) {
-                throw `Resource '${trimmedIdentifier}' does not exist.`;
+            // Check if group is M365 group or security group
+            loginNames.push(...groups.map(g => g.mailEnabled ? `c:0o.c|federateddirectoryclaimprovider|${g.id}` : `c:0t.c|tenant|${g.id}`));
+        }
+        else if (options.userIds) {
+            const userIds = formatting.splitAndTrim(options.userIds);
+            if (this.verbose) {
+                await logger.logToStderr(`Resolving ${userIds.length} user(s)...`);
             }
-        }));
-        return validUserNames;
+            for (const userId of userIds) {
+                const loginName = await this.getUserLoginNameById(options.webUrl, parseInt(userId));
+                loginNames.push(loginName);
+            }
+        }
+        return loginNames;
     }
-    getFormattedUserList(activeUserList) {
-        const generatedPeoplePicker = JSON.stringify(activeUserList.map(singleUsername => {
-            return { Key: singleUsername.trim() };
-        }));
-        return generatedPeoplePicker;
+    async getUserLoginNameById(webUrl, userId) {
+        const requestOptions = {
+            url: `${webUrl}/_api/web/SiteUsers/GetById(${userId})?$select=LoginName`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const user = await request.get(requestOptions);
+        return user.LoginName;
     }
 }
 _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_initTelemetry = function _SpoGroupMemberAddCommand_initTelemetry() {
@@ -177,29 +165,45 @@ _SpoGroupMemberAddCommand_instances = new WeakSet(), _SpoGroupMemberAddCommand_i
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.groupId && isNaN(args.options.groupId)) {
-            return `Specified groupId ${args.options.groupId} is not a number`;
+        if (args.options.groupId && !validation.isValidPositiveInteger(args.options.groupId)) {
+            return `Specified groupId ${args.options.groupId} is not a positive number.`;
         }
-        const userIdReg = new RegExp(/^[0-9,]*$/);
-        if (args.options.userIds && !userIdReg.test(args.options.userIds)) {
-            return `${args.options.userIds} is not a number or a comma separated value`;
+        if (args.options.userIds) {
+            const isValidArray = validation.isValidPositiveIntegerArray(args.options.userIds);
+            if (isValidArray !== true) {
+                return `Option 'userIds' contains one or more invalid numbers: ${isValidArray}.`;
+            }
         }
-        if (args.options.userNames && args.options.userNames.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
-            return `${args.options.userNames} contains one or more invalid usernames`;
+        if (args.options.userNames) {
+            const isValidArray = validation.isValidUserPrincipalNameArray(args.options.userNames);
+            if (isValidArray !== true) {
+                return `Option 'userNames' contains one or more invalid UPNs: ${isValidArray}.`;
+            }
         }
-        if (args.options.emails && args.options.emails.split(',').some(e => !validation.isValidUserPrincipalName(e))) {
-            return `${args.options.emails} contains one or more invalid email addresses`;
+        if (args.options.emails) {
+            const isValidArray = validation.isValidUserPrincipalNameArray(args.options.emails);
+            if (isValidArray !== true) {
+                return `Option 'emails' contains one or more invalid UPNs: ${isValidArray}.`;
+            }
         }
-        if (args.options.entraGroupIds && args.options.entraGroupIds.split(',').some(e => !validation.isValidGuid(e))) {
-            return `${args.options.entraGroupIds} contains one or more invalid GUIDs`;
+        if (args.options.entraGroupIds) {
+            const isValidArray = validation.isValidGuidArray(args.options.entraGroupIds);
+            if (isValidArray !== true) {
+                return `Option 'entraGroupIds' contains one or more invalid GUIDs: ${isValidArray}.`;
+            }
         }
-        if (args.options.aadGroupIds && args.options.aadGroupIds.split(',').some(e => !validation.isValidGuid(e))) {
-            return `${args.options.aadGroupIds} contains one or more invalid GUIDs`;
+        if (args.options.aadGroupIds) {
+            const isValidArray = validation.isValidGuidArray(args.options.aadGroupIds);
+            if (isValidArray !== true) {
+                return `Option 'aadGroupIds' contains one or more invalid GUIDs: ${isValidArray}.`;
+            }
         }
         return true;
     });
 }, _SpoGroupMemberAddCommand_initOptionSets = function _SpoGroupMemberAddCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'groupName'] }, { options: ['userNames', 'emails', 'userIds', 'entraGroupIds', 'aadGroupIds', 'entraGroupNames', 'aadGroupNames'] });
+}, _SpoGroupMemberAddCommand_initTypes = function _SpoGroupMemberAddCommand_initTypes() {
+    this.types.string.push('webUrl', 'groupName', 'userNames', 'emails', 'userIds', 'entraGroupIds', 'aadGroupIds', 'entraGroupNames', 'aadGroupNames');
 };
 export default new SpoGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

package/dist/m365/spo/commands/list/ListInstance.js

@@ -1,2 +1,7 @@
-export {};
+export var DefaultTrimModeType;
+(function (DefaultTrimModeType) {
+    DefaultTrimModeType[DefaultTrimModeType["NoExpiration"] = 0] = "NoExpiration";
+    DefaultTrimModeType[DefaultTrimModeType["ExpireAfter"] = 1] = "ExpireAfter";
+    DefaultTrimModeType[DefaultTrimModeType["AutoExpiration"] = 2] = "AutoExpiration";
+})(DefaultTrimModeType || (DefaultTrimModeType = {}));
 //# sourceMappingURL=ListInstance.js.map

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

@@ -10,6 +10,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 { DefaultTrimModeType } from "./ListInstance.js";
 import { ListPrincipalType } from './ListPrincipalType.js';
 class SpoListGetCommand extends SpoCommand {
     get name() {
@@ -49,9 +50,11 @@ class SpoListGetCommand extends SpoCommand {
         if (fieldsProperties.expandProperties.length > 0) {
             queryParams.push(`$expand=${fieldsProperties.expandProperties.join(',')}`);
         }
-        const querystring = queryParams.length > 0 ? `?${queryParams.join('&')}` : ``;
+        if (queryParams.length === 0) {
+            queryParams.push(`$expand=VersionPolicies`);
+        }
         const requestOptions = {
-            url: `${requestUrl}${querystring}`,
+            url: `${requestUrl}?${queryParams.join('&')}`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -64,6 +67,9 @@ class SpoListGetCommand extends SpoCommand {
                     r.Member.PrincipalTypeString = ListPrincipalType[r.Member.PrincipalType];
                 });
             }
+            if (listInstance.VersionPolicies) {
+                listInstance.VersionPolicies.DefaultTrimModeValue = DefaultTrimModeType[listInstance.VersionPolicies.DefaultTrimMode];
+            }
             await logger.log(listInstance);
         }
         catch (err) {
@@ -74,7 +80,7 @@ class SpoListGetCommand extends SpoCommand {
         const selectProperties = [];
         let expandProperties = [];
         if (withPermissions) {
-            expandProperties = ['HasUniqueRoleAssignments', 'RoleAssignments/Member', 'RoleAssignments/RoleDefinitionBindings'];
+            expandProperties = ['HasUniqueRoleAssignments', 'RoleAssignments/Member', 'RoleAssignments/RoleDefinitionBindings', 'VersionPolicies'];
         }
         if (properties) {
             properties.split(',').forEach((property) => {

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

@@ -16,7 +16,7 @@ class SpoListListCommand extends SpoCommand {
         return 'Lists all available list in the specified site';
     }
     defaultProperties() {
-        return ['Title', 'Url', 'Id'];
+        return ['Title', 'Id'];
     }
     constructor() {
         super();
@@ -36,9 +36,6 @@ class SpoListListCommand extends SpoCommand {
                 queryParams.push(`$filter=${args.options.filter}`);
             }
             const listInstances = await odata.getAllItems(`${args.options.webUrl}/_api/web/lists?${queryParams.join('&')}`);
-            listInstances.forEach(l => {
-                l.Url = l.RootFolder.ServerRelativeUrl;
-            });
             await logger.log(listInstances);
         }
         catch (err) {

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

@@ -3,8 +3,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators, _SpoListRoleAssignmentAddCommand_initOptionSets;
+var _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators, _SpoListRoleAssignmentAddCommand_initOptionSets, _SpoListRoleAssignmentAddCommand_initTypes;
 import request from '../../../../request.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
@@ -25,6 +26,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoListRoleAssignmentAddCommand_instances, "m", _SpoListRoleAssignmentAddCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -42,39 +44,48 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand {
                 const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 requestUrl += `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
             }
-            args.options.roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
+            const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
+            let principalId = args.options.principalId;
             if (args.options.upn) {
-                const user = await spo.getUserByEmail(args.options.webUrl, args.options.upn, logger, this.verbose);
-                args.options.principalId = user.Id;
-                await this.addRoleAssignment(requestUrl, logger, args.options);
+                const user = await spo.ensureUser(args.options.webUrl, args.options.upn);
+                principalId = user.Id;
             }
             else if (args.options.groupName) {
                 const group = await spo.getGroupByName(args.options.webUrl, args.options.groupName, logger, this.verbose);
-                args.options.principalId = group.Id;
-                await this.addRoleAssignment(requestUrl, logger, args.options);
+                principalId = group.Id;
             }
-            else {
-                await this.addRoleAssignment(requestUrl, logger, args.options);
+            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 siteUser = await spo.ensureEntraGroup(args.options.webUrl, group);
+                principalId = siteUser.Id;
             }
+            await this.addRoleAssignment(requestUrl, principalId, roleDefinitionId);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async addRoleAssignment(requestUrl, logger, options) {
+    async addRoleAssignment(requestUrl, principalId, roleDefinitionId) {
         const requestOptions = {
-            url: `${requestUrl}roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
-            method: 'POST',
+            url: `${requestUrl}roleassignments/addroleassignment(principalid='${principalId}',roledefid='${roleDefinitionId}')`,
             headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         return request.post(requestOptions);
     }
     async getRoleDefinitionId(options, logger) {
-        if (!options.roleDefinitionName) {
+        if (options.roleDefinitionId) {
             return options.roleDefinitionId;
         }
         const roleDefinition = await spo.getRoleDefinitionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
@@ -90,6 +101,8 @@ _SpoListRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListRoleAssignme
             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'
         });
@@ -109,6 +122,10 @@ _SpoListRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListRoleAssignme
         option: '--upn [upn]'
     }, {
         option: '--groupName [groupName]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '--roleDefinitionId [roleDefinitionId]'
     }, {
@@ -121,18 +138,26 @@ _SpoListRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListRoleAssignme
             return isValidSharePointUrl;
         }
         if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} is not a valid GUID`;
+            return `'${args.options.listId}' is not a valid GUID for option listId.`;
+        }
+        if (args.options.upn && !validation.isValidUserPrincipalName(args.options.upn)) {
+            return `'${args.options.upn}' is not a valid user principal name for option upn.`;
+        }
+        if (args.options.principalId && !validation.isValidPositiveInteger(args.options.principalId)) {
+            return `Specified principalId '${args.options.principalId}' is not a valid number.`;
         }
-        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`;
+        if (args.options.roleDefinitionId && !validation.isValidPositiveInteger(args.options.roleDefinitionId)) {
+            return `Specified roleDefinitionId '${args.options.roleDefinitionId}' is not a valid number.`;
         }
         return true;
     });
 }, _SpoListRoleAssignmentAddCommand_initOptionSets = function _SpoListRoleAssignmentAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName'] }, { options: ['roleDefinitionId', 'roleDefinitionName'] });
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName', 'entraGroupId', 'entraGroupName'] }, { options: ['roleDefinitionId', 'roleDefinitionName'] });
+}, _SpoListRoleAssignmentAddCommand_initTypes = function _SpoListRoleAssignmentAddCommand_initTypes() {
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'upn', 'groupName', 'entraGroupId', 'entraGroupName', 'roleDefinitionName');
 };
 export default new SpoListRoleAssignmentAddCommand();
 //# sourceMappingURL=list-roleassignment-add.js.map