@pnp/cli-microsoft365 10.11.0-beta.b1eeb91 → 10.11.0

package/dist/config.js

@@ -16,6 +16,7 @@ export default {
         'https://graph.microsoft.com/Community.ReadWrite.All',
         'https://graph.microsoft.com/Directory.AccessAsUser.All',
         'https://graph.microsoft.com/Directory.ReadWrite.All',
+        'https://graph.microsoft.com/EngagementRole.ReadWrite.All',
         'https://graph.microsoft.com/ExternalConnection.ReadWrite.All',
         'https://graph.microsoft.com/ExternalItem.ReadWrite.All',
         'https://graph.microsoft.com/FileStorageContainer.Selected',

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

@@ -32,13 +32,16 @@ class EntraGroupMemberAddCommand extends GraphCommand {
             if (args.options.groupDisplayName) {
                 await this.warn(logger, `Option 'groupDisplayName' is deprecated and will be removed in the next major release.`);
             }
+            if (args.options.ids) {
+                await this.warn(logger, `Option 'ids' is deprecated and will be removed in the next major release. Please use 'userIds' instead.`);
+            }
             if (this.verbose) {
-                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userNames} to group ${args.options.groupId || args.options.groupDisplayName || args.options.groupName}...`);
+                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userIds || args.options.userNames || args.options.subgroupIds || args.options.subgroupNames} to group ${args.options.groupId || args.options.groupDisplayName || args.options.groupName}...`);
             }
             const groupId = await this.getGroupId(logger, args.options);
-            const userIds = await this.getUserIds(logger, args.options);
-            for (let i = 0; i < userIds.length; i += 400) {
-                const userIdsBatch = userIds.slice(i, i + 400);
+            const objectIds = await this.getObjectIds(logger, args.options);
+            for (let i = 0; i < objectIds.length; i += 400) {
+                const objectIdsBatch = objectIds.slice(i, i + 400);
                 const requestOptions = {
                     url: `${this.resource}/v1.0/$batch`,
                     headers: {
@@ -49,8 +52,8 @@ class EntraGroupMemberAddCommand extends GraphCommand {
                         requests: []
                     }
                 };
-                for (let j = 0; j < userIdsBatch.length; j += 20) {
-                    const userIdsChunk = userIdsBatch.slice(j, j + 20);
+                for (let j = 0; j < objectIdsBatch.length; j += 20) {
+                    const objectIdsChunk = objectIdsBatch.slice(j, j + 20);
                     requestOptions.data.requests.push({
                         id: j + 1,
                         method: 'PATCH',
@@ -59,7 +62,7 @@ class EntraGroupMemberAddCommand extends GraphCommand {
                             'content-type': 'application/json;odata.metadata=none'
                         },
                         body: {
-                            [`${args.options.role === 'Member' ? 'members' : 'owners'}@odata.bind`]: userIdsChunk.map(u => `${this.resource}/v1.0/directoryObjects/${u}`)
+                            [`${args.options.role === 'Member' ? 'members' : 'owners'}@odata.bind`]: objectIdsChunk.map(u => `${this.resource}/v1.0/directoryObjects/${u}`)
                         }
                     });
                 }
@@ -84,15 +87,33 @@ class EntraGroupMemberAddCommand extends GraphCommand {
         }
         return entraGroup.getGroupIdByDisplayName(options.groupDisplayName || options.groupName);
     }
+    async getObjectIds(logger, options) {
+        if (options.ids || options.userIds || options.userNames) {
+            return this.getUserIds(logger, options);
+        }
+        return this.getGroupIds(logger, options);
+    }
     async getUserIds(logger, options) {
         if (options.ids) {
             return options.ids.split(',').map(i => i.trim());
         }
+        if (options.userIds) {
+            return options.userIds.split(',').map(i => i.trim());
+        }
         if (this.verbose) {
             await logger.logToStderr('Retrieving ID(s) of user(s)...');
         }
         return entraUser.getUserIdsByUpns(options.userNames.split(',').map(u => u.trim()));
     }
+    async getGroupIds(logger, options) {
+        if (options.subgroupIds) {
+            return options.subgroupIds.split(',').map(i => i.trim());
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving ID(s) of group(s)...');
+        }
+        return entraGroup.getGroupIdsByDisplayNames(options.subgroupNames.split(',').map(u => u.trim()));
+    }
 }
 _EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddCommand_initTelemetry = function _EntraGroupMemberAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -101,7 +122,10 @@ _EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddComma
             groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
             ids: typeof args.options.ids !== 'undefined',
-            userNames: typeof args.options.userNames !== 'undefined'
+            userIds: typeof args.options.userIds !== 'undefined',
+            userNames: typeof args.options.userNames !== 'undefined',
+            subgroupIds: typeof args.options.subgroupIds !== 'undefined',
+            subgroupNames: typeof args.options.subgroupNames !== 'undefined'
         });
     });
 }, _EntraGroupMemberAddCommand_initOptions = function _EntraGroupMemberAddCommand_initOptions() {
@@ -113,8 +137,14 @@ _EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddComma
         option: '-n, --groupName [groupName]'
     }, {
         option: '--ids [ids]'
+    }, {
+        option: '--userIds [userIds]'
     }, {
         option: '--userNames [userNames]'
+    }, {
+        option: '--subgroupIds [subgroupIds]'
+    }, {
+        option: '--subgroupNames [subgroupNames]'
     }, {
         option: '-r, --role <role>',
         autocomplete: this.roleValues
@@ -130,21 +160,36 @@ _EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddComma
                 return `The following GUIDs are invalid for the option 'ids': ${isValidGUIDArrayResult}.`;
             }
         }
+        if (args.options.userIds) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.userIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'userIds': ${isValidGUIDArrayResult}.`;
+            }
+        }
         if (args.options.userNames) {
             const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.userNames);
             if (isValidUPNArrayResult !== true) {
                 return `The following user principal names are invalid for the option 'userNames': ${isValidUPNArrayResult}.`;
             }
         }
+        if (args.options.subgroupIds) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.subgroupIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'subgroupIds': ${isValidGUIDArrayResult}.`;
+            }
+        }
+        if ((args.options.subgroupIds || args.options.subgroupNames) && args.options.role === 'Owner') {
+            return `Subgroups cannot be set as owners.`;
+        }
         if (this.roleValues.indexOf(args.options.role) === -1) {
             return `Option 'role' must be one of the following values: ${this.roleValues.join(', ')}.`;
         }
         return true;
     });
 }, _EntraGroupMemberAddCommand_initOptionSets = function _EntraGroupMemberAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupDisplayName', 'groupName'] }, { options: ['ids', 'userNames'] });
+    this.optionSets.push({ options: ['groupId', 'groupDisplayName', 'groupName'] }, { options: ['ids', 'userIds', 'userNames', 'subgroupIds', 'subgroupNames'] });
 }, _EntraGroupMemberAddCommand_initTypes = function _EntraGroupMemberAddCommand_initTypes() {
-    this.types.string.push('groupId', 'groupDisplayName', 'groupName', 'ids', 'userNames', 'role');
+    this.types.string.push('groupId', 'groupDisplayName', 'groupName', 'ids', 'userIds', 'userNames', 'subgroupIds', 'subgroupNames', 'role');
 };
 export default new EntraGroupMemberAddCommand();
 //# sourceMappingURL=group-member-add.js.map

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

@@ -32,8 +32,11 @@ class EntraGroupMemberSetCommand extends GraphCommand {
             if (args.options.groupDisplayName) {
                 await this.warn(logger, `Option 'groupDisplayName' is deprecated and will be removed in the next major release.`);
             }
+            if (args.options.ids) {
+                await this.warn(logger, `Option 'ids' is deprecated and will be removed in the next major release. Please use 'userIds' instead.`);
+            }
             if (this.verbose) {
-                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userNames} to role ${args.options.role} of group ${args.options.groupId || args.options.groupDisplayName || args.options.groupName}...`);
+                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userIds || args.options.userNames} to role ${args.options.role} of group ${args.options.groupId || args.options.groupDisplayName || args.options.groupName}...`);
             }
             const groupId = await this.getGroupId(logger, args.options);
             const userIds = await this.getUserIds(logger, args.options);
@@ -60,6 +63,9 @@ class EntraGroupMemberSetCommand extends GraphCommand {
         if (options.ids) {
             return options.ids.split(',').map(i => i.trim());
         }
+        if (options.userIds) {
+            return options.userIds.split(',').map(i => i.trim());
+        }
         if (this.verbose) {
             await logger.logToStderr('Retrieving ID(s) of user(s)...');
         }
@@ -163,6 +169,7 @@ _EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetComma
             groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
             ids: typeof args.options.ids !== 'undefined',
+            userIds: typeof args.options.userIds !== 'undefined',
             userNames: typeof args.options.userNames !== 'undefined'
         });
     });
@@ -175,6 +182,8 @@ _EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetComma
         option: '-n, --groupName [groupName]'
     }, {
         option: '--ids [ids]'
+    }, {
+        option: '--userIds [userIds]'
     }, {
         option: '--userNames [userNames]'
     }, {
@@ -192,6 +201,12 @@ _EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetComma
                 return `'${isValidGUIDArrayResult}' is not a valid GUID for option 'ids'.`;
             }
         }
+        if (args.options.userIds) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.userIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'userIds': ${isValidGUIDArrayResult}.`;
+            }
+        }
         if (args.options.userNames) {
             const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(args.options.userNames);
             if (isValidUserPrincipalNameArray !== true) {
@@ -204,9 +219,9 @@ _EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetComma
         return true;
     });
 }, _EntraGroupMemberSetCommand_initOptionSets = function _EntraGroupMemberSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupDisplayName', 'groupName'] }, { options: ['ids', 'userNames'] });
+    this.optionSets.push({ options: ['groupId', 'groupDisplayName', 'groupName'] }, { options: ['ids', 'userIds', 'userNames'] });
 }, _EntraGroupMemberSetCommand_initTypes = function _EntraGroupMemberSetCommand_initTypes() {
-    this.types.string.push('groupId', 'groupDisplayName', 'groupName', 'ids', 'userNames', 'role');
+    this.types.string.push('groupId', 'groupDisplayName', 'groupName', 'ids', 'userIds', 'userNames', 'role');
 };
 export default new EntraGroupMemberSetCommand();
 //# sourceMappingURL=group-member-set.js.map

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.21.0.js

@@ -8,6 +8,7 @@ import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types
 import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
 import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
 import { FN002019_DEVDEP_microsoft_rush_stack_compiler } from './rules/FN002019_DEVDEP_microsoft_rush_stack_compiler.js';
+import { FN002022_DEVDEP_typescript } from './rules/FN002022_DEVDEP_typescript.js';
 import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
 export default [
     new FN001008_DEP_react('17'),
@@ -20,6 +21,7 @@ export default [
     new FN002016_DEVDEP_types_react_dom('17'),
     new FN002019_DEVDEP_microsoft_rush_stack_compiler(['5.3']),
     new FN002021_DEVDEP_rushstack_eslint_config('4.0.1'),
+    new FN002022_DEVDEP_typescript('~5.3.3'),
     new FN021001_PKG_spfx_deps_versions_match_project_version(true)
 ];
 //# sourceMappingURL=doctor-1.21.0.js.map

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.21.1.js

@@ -8,6 +8,7 @@ import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types
 import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
 import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
 import { FN002019_DEVDEP_microsoft_rush_stack_compiler } from './rules/FN002019_DEVDEP_microsoft_rush_stack_compiler.js';
+import { FN002022_DEVDEP_typescript } from './rules/FN002022_DEVDEP_typescript.js';
 import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
 export default [
     new FN001008_DEP_react('17'),
@@ -20,6 +21,7 @@ export default [
     new FN002016_DEVDEP_types_react_dom('17'),
     new FN002019_DEVDEP_microsoft_rush_stack_compiler(['5.3']),
     new FN002021_DEVDEP_rushstack_eslint_config('4.0.1'),
+    new FN002022_DEVDEP_typescript('~5.3.3'),
     new FN021001_PKG_spfx_deps_versions_match_project_version(true)
 ];
 //# sourceMappingURL=doctor-1.21.1.js.map

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.22.0-beta.1.js

@@ -5,6 +5,7 @@ import { FN001035_DEP_fluentui_react } from './rules/FN001035_DEP_fluentui_react
 import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types_webpack_env.js';
 import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
 import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
+import { FN002022_DEVDEP_typescript } from './rules/FN002022_DEVDEP_typescript.js';
 import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
 export default [
     new FN001008_DEP_react('17'),
@@ -14,6 +15,7 @@ export default [
     new FN002015_DEVDEP_types_react('17'),
     new FN002016_DEVDEP_types_react_dom('17'),
     new FN002021_DEVDEP_rushstack_eslint_config('4.3.0'),
+    new FN002022_DEVDEP_typescript('5.3.3'),
     new FN021001_PKG_spfx_deps_versions_match_project_version(true)
 ];
 //# sourceMappingURL=doctor-1.22.0-beta.1.js.map

package/dist/m365/spfx/commands/project/project-doctor/rules/FN002022_DEVDEP_typescript.js

@@ -0,0 +1,10 @@
+import { DependencyRule } from './DependencyRule.js';
+export class FN002022_DEVDEP_typescript extends DependencyRule {
+    constructor(version) {
+        super('typescript', version, true);
+    }
+    get id() {
+        return 'FN002022';
+    }
+}
+//# sourceMappingURL=FN002022_DEVDEP_typescript.js.map

package/dist/m365/spo/commands/file/file-version-get.js

@@ -47,6 +47,7 @@ class SpoFileVersionGetCommand extends SpoCommand {
         else {
             requestUrl += `GetFileById('${args.options.fileId}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
         }
+        requestUrl += `&$select=*,ExpirationDate`;
         const requestOptions = {
             url: requestUrl,
             headers: {

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

@@ -18,7 +18,7 @@ class SpoFileVersionListCommand extends SpoCommand {
         return 'Retrieves all versions of a file';
     }
     defaultProperties() {
-        return ['Created', 'ID', 'IsCurrentVersion', 'VersionLabel'];
+        return ['Created', 'ID', 'IsCurrentVersion', 'VersionLabel', 'ExpirationDate'];
     }
     constructor() {
         super();
@@ -42,7 +42,7 @@ class SpoFileVersionListCommand extends SpoCommand {
             else {
                 requestUrl += `/GetFileById('${args.options.fileId}')`;
             }
-            requestUrl += `/versions`;
+            requestUrl += `/versions?$select=*,ExpirationDate`;
             const response = await odata.getAllItems(requestUrl);
             await logger.log(response);
         }

package/dist/m365/viva/commands/engage/EngageRole.js

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=EngageRole.js.map

package/dist/m365/viva/commands/engage/engage-role-list.js

@@ -0,0 +1,28 @@
+import { odata } from '../../../../utils/odata.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class VivaEngageRoleListCommand extends GraphCommand {
+    get name() {
+        return commands.ENGAGE_ROLE_LIST;
+    }
+    get description() {
+        return 'Lists all Viva Engage roles';
+    }
+    defaultProperties() {
+        return ['id', 'displayName'];
+    }
+    async commandAction(logger) {
+        if (this.verbose) {
+            await logger.logToStderr('Getting all Viva Engage roles...');
+        }
+        try {
+            const results = await odata.getAllItems(`${this.resource}/beta/employeeExperience/roles`);
+            await logger.log(results);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new VivaEngageRoleListCommand();
+//# sourceMappingURL=engage-role-list.js.map

package/dist/m365/viva/commands/engage/engage-role-member-list.js

@@ -0,0 +1,57 @@
+import { z } from 'zod';
+import { globalOptionsZod } from '../../../../Command.js';
+import { zod } from '../../../../utils/zod.js';
+import { odata } from '../../../../utils/odata.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { vivaEngage } from '../../../../utils/vivaEngage.js';
+const options = globalOptionsZod
+    .extend({
+    roleId: zod.alias('i', z.string().refine(name => validation.isValidGuid(name), name => ({
+        message: `'${name}' is not a valid GUID.`
+    })).optional()),
+    roleName: zod.alias('n', z.string().optional())
+})
+    .strict();
+class VivaEngageRoleMemberListCommand extends GraphCommand {
+    get name() {
+        return commands.ENGAGE_ROLE_MEMBER_LIST;
+    }
+    get description() {
+        return 'Lists all users assigned to a Viva Engage role';
+    }
+    get schema() {
+        return options;
+    }
+    getRefinedSchema(schema) {
+        return schema
+            .refine(options => [options.roleId, options.roleName].filter(x => x !== undefined).length === 1, {
+            message: 'Specify either roleId, or roleName, but not both.'
+        });
+    }
+    defaultProperties() {
+        return ['id', 'userId'];
+    }
+    async commandAction(logger, args) {
+        let roleId = args.options.roleId;
+        try {
+            if (args.options.roleName) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving Viva Engage role ID for role name '${args.options.roleName}'...`);
+                }
+                roleId = await vivaEngage.getRoleIdByName(args.options.roleName);
+            }
+            if (this.verbose) {
+                await logger.logToStderr(`Getting all users assigned to a Viva Engage role ${roleId}...`);
+            }
+            const results = await odata.getAllItems(`${this.resource}/beta/employeeExperience/roles/${roleId}/members`);
+            await logger.log(results);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new VivaEngageRoleMemberListCommand();
+//# sourceMappingURL=engage-role-member-list.js.map

package/dist/m365/viva/commands.js

@@ -27,6 +27,8 @@ export default {
     ENGAGE_REPORT_GROUPSACTIVITYCOUNTS: `${prefix} engage report groupsactivitycounts`,
     ENGAGE_REPORT_GROUPSACTIVITYDETAIL: `${prefix} engage report groupsactivitydetail`,
     ENGAGE_REPORT_GROUPSACTIVITYGROUPCOUNTS: `${prefix} engage report groupsactivitygroupcounts`,
+    ENGAGE_ROLE_LIST: `${prefix} engage role list`,
+    ENGAGE_ROLE_MEMBER_LIST: `${prefix} engage role member list`,
     ENGAGE_SEARCH: `${prefix} engage search`,
     ENGAGE_USER_GET: `${prefix} engage user get`,
     ENGAGE_USER_LIST: `${prefix} engage user list`

package/dist/utils/entraGroup.js

@@ -142,6 +142,49 @@ export const entraGroup = {
         };
         const group = await request.get(requestOptions);
         return group.groupTypes.some(type => type === 'Unified');
+    },
+    /**
+     * Retrieve the IDs of groups by their display names. There is no guarantee that the order of the returned IDs will match the order of the specified names.
+     * @param names Array of group names.
+     * @returns Array of group IDs.
+     */
+    async getGroupIdsByDisplayNames(names) {
+        const groupIds = [];
+        for (let i = 0; i < names.length; i += 20) {
+            const namesChunk = names.slice(i, i + 20);
+            const requestOptions = {
+                url: `${graphResource}/v1.0/$batch`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    requests: namesChunk.map((name, index) => ({
+                        id: index + 1,
+                        method: 'GET',
+                        url: `/groups?$filter=displayName eq '${formatting.encodeQueryParameter(name)}'&$select=id`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        }
+                    }))
+                }
+            };
+            const res = await request.post(requestOptions);
+            for (const response of res.responses) {
+                if (response.body.value.length === 1) {
+                    groupIds.push(response.body.value[0].id);
+                }
+                else if (response.body.value.length > 1) {
+                    const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.body.value);
+                    const result = await cli.handleMultipleResultsFound(`Multiple groups with the name '${namesChunk[response.id - 1]}' found.`, resultAsKeyValuePair);
+                    groupIds.push(result.id);
+                }
+                else {
+                    throw Error(`The specified group with name '${namesChunk[response.id - 1]}' does not exist.`);
+                }
+            }
+        }
+        return groupIds;
     }
 };
 //# sourceMappingURL=entraGroup.js.map

package/dist/utils/vivaEngage.js

@@ -56,6 +56,25 @@ export const vivaEngage = {
             throw `The Microsoft Entra group with id '${entraGroupId}' is not associated with any Viva Engage community.`;
         }
         return filteredCommunity;
+    },
+    /**
+     * Get the ID of a Viva Engage role by its display name.
+     * @param roleName The display name of the role.
+     * @returns The ID of the role.
+     */
+    async getRoleIdByName(roleName) {
+        // This endpoint doesn't support filtering by displayName
+        const response = await odata.getAllItems('https://graph.microsoft.com/beta/employeeExperience/roles');
+        const roles = response.filter(role => role.displayName.toLowerCase() === roleName.toLowerCase());
+        if (roles.length === 0) {
+            throw new Error(`The specified Viva Engage role '${roleName}' does not exist.`);
+        }
+        if (roles.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', roles);
+            const selectedRole = await cli.handleMultipleResultsFound(`Multiple Viva Engage roles with name '${roleName}' found.`, resultAsKeyValuePair);
+            return selectedRole.id;
+        }
+        return roles[0].id;
     }
 };
 //# sourceMappingURL=vivaEngage.js.map

package/docs/docs/cmd/entra/group/group-member-add.mdx

@@ -23,10 +23,19 @@ m365 entra group member add [options]
 : The display name of the Microsoft Entra group. Specify `groupId`, `groupDisplayName` or `groupName` but not multiple.
 
 `--ids [ids]`
-: Microsoft Entra IDs of users. You can also pass a comma-separated list of IDs. Specify either `ids` or `userNames` but not both.
+: (deprecated. Use option `userIds` instead) Microsoft Entra IDs of users. You can also pass a comma-separated list of IDs. Specify either `ids`, `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
+
+`--userIds [userIds]`
+: Microsoft Entra IDs of users. You can also pass a comma-separated list of IDs. Specify either `ids`, `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
 
 `--userNames [userNames]`
-: The user principal names of users. You can also pass a comma-separated list of UPNs. Specify either `ids` or `userNames` but not both.
+: The user principal names of users. You can also pass a comma-separated list of UPNs. Specify either `ids`, `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
+
+`--subgroupIds [subgroupIds]`
+: Comma-separated list of Microsoft Entra group IDs to add. Specify either `ids`, `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
+
+`--subgroupNames [subgroupNames]`
+: Comma-separated list of Microsoft Entra group titles to add. Specify either `ids`, `userIds`,`userNames`, `subgroupIds`, or `subgroupNames` but not multiple.
 
 `-r, --role <role>`
 : The role to be assigned to the new users. Valid values: `Owner`, `Member`.
@@ -39,19 +48,19 @@ m365 entra group member add [options]
 Add a single member specified by ID as a member to a group specified by display name.
 
 ```sh
-m365 entra group member add --groupDisplayName Developers --ids 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
+m365 entra group member add --groupDisplayName Developers --userIds 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
 ```
 
 Add a single member specified by ID as a member to a group specified by group name.
 
 ```sh
-m365 entra group member add --groupName Developers --ids 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
+m365 entra group member add --groupName Developers --userIds 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
 ```
 
 Add multiple members specified by ID as members to a group specified by ID.
 
 ```sh
-m365 entra group member add --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --ids "098b9f52-f48c-4401-819f-29c33794c3f5,f1e06e31-3abf-4746-83c2-1513d71f38b8" --role Member
+m365 entra group member add --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --userIds "098b9f52-f48c-4401-819f-29c33794c3f5,f1e06e31-3abf-4746-83c2-1513d71f38b8" --role Member
 ```
 
 Add a single member specified by UPN as an owner to a group specified by display name.
@@ -72,6 +81,18 @@ Adds multiple members specified by UPN as owners to a group specified by ID.
 m365 entra group member add --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --userNames "john.doe@contoso.com,adele.vance@contoso.com" --role Owner
 ```
 
+Add multiple members (subgroups) specified by ID as members to a group specified by ID.
+
+```sh
+m365 entra group member add --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --subgroupIds "098b9f52-f48c-4401-819f-29c33794c3f5,f1e06e31-3abf-4746-83c2-1513d71f38b8" --role Member
+```
+
+Adds multiple members (subgroups) specified by name as members to a group specified by ID.
+
+```sh
+m365 entra group member add --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --subgroupNames "Developers,Human Resources" --role Member
+```
+
 ## Response
 
 The command won't return a response on success.

package/docs/docs/cmd/entra/group/group-member-set.mdx

@@ -23,7 +23,10 @@ m365 entra group member set [options]
 : The display name of the Microsoft Entra group. Specify `groupId`, `groupDisplayName` or `groupName` but not multiple.
 
 `--ids [ids]`
-: Comma-separated list of user IDs. Specify either `ids` or `userNames` but not both.
+: (deprecated. Use option `userIds` instead) Comma-separated list of user IDs. Specify either `ids`, `userIds` or `userNames` but not multiple.
+
+`--userIds [userIds]`
+: Comma-separated list of user IDs. Specify either `ids`, `userIds` or `userNames` but not multiple.
 
 `--userNames [userNames]`
 : The user principal names of users. You can also pass a comma-separated list of UPNs. Specify either `ids` or `userNames` but not both.
@@ -39,19 +42,19 @@ m365 entra group member set [options]
 Update a single member specified by ID to a member of a group specified by display name
 
 ```sh
-m365 entra group member set --groupDisplayName Developers --ids 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
+m365 entra group member set --groupDisplayName Developers --userIds 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
 ```
 
 Update a single member specified by ID to a member of a group specified by group name
 
 ```sh
-m365 entra group member set --groupName Developers --ids 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
+m365 entra group member set --groupName Developers --userIds 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
 ```
 
 Update multiple members specified by ID to members of a group specified by ID
 
 ```sh
-m365 entra group member set --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --ids "098b9f52-f48c-4401-819f-29c33794c3f5,f1e06e31-3abf-4746-83c2-1513d71f38b8" --role Member
+m365 entra group member set --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --userIds "098b9f52-f48c-4401-819f-29c33794c3f5,f1e06e31-3abf-4746-83c2-1513d71f38b8" --role Member
 ```
 
 Update a single member specified by UPN to an owner of a group specified by display name

package/docs/docs/cmd/spo/file/file-version-get.mdx

@@ -53,6 +53,7 @@ m365 spo file version get --webUrl https://contoso.sharepoint.com --label "1.0"
   {
     "CheckInComment": "",
     "Created": "2022-10-30T12:03:06Z",
+    "ExpirationDate": "2026-01-31T08:23:43.0000000Z",
     "ID": 512,
     "IsCurrentVersion": false,
     "Length": "18898",
@@ -68,6 +69,7 @@ m365 spo file version get --webUrl https://contoso.sharepoint.com --label "1.0"
   ```text
   CheckInComment  :
   Created         : 2022-10-30T12:03:06Z
+  ExpirationDate  : 2026-01-31T08:23:43.0000000Z
   ID              : 512
   IsCurrentVersion: false
   Length          : 18898
@@ -80,8 +82,8 @@ m365 spo file version get --webUrl https://contoso.sharepoint.com --label "1.0"
   <TabItem value="CSV">
 
   ```csv
-  CheckInComment,Created,ID,IsCurrentVersion,Length,Size,Url,VersionLabel
-  ,2022-10-30T12:03:06Z,512,,18898,18898,_vti_history/512/Shared Documents/Document.docx,1.0
+  CheckInComment,Created,ExpirationDate,ID,IsCurrentVersion,Length,Size,Url,VersionLabel
+  ,2022-10-30T12:03:06Z,2026-01-31T08:23:43.0000000Z,512,0,18898,18898,_vti_history/512/Shared Documents/Document.docx,1.0
   ```
 
   </TabItem>
@@ -98,6 +100,7 @@ m365 spo file version get --webUrl https://contoso.sharepoint.com --label "1.0"
   ---------|-------
   CheckInComment |
   Created | 2022-10-30T12:03:06Z
+  ExpirationDate | 2026-01-31T08:23:43.0000000Z
   ID | 512
   IsCurrentVersion | false
   Length | 18898