@pnp/cli-microsoft365 7.3.0-beta.e0b37b9 → 7.4.0-beta.2324d53

package/dist/m365/{aad → entra}/commands/m365group/m365group-set.js

@@ -3,7 +3,7 @@ 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 _AadM365GroupSetCommand_instances, _AadM365GroupSetCommand_initTelemetry, _AadM365GroupSetCommand_initOptions, _AadM365GroupSetCommand_initTypes, _AadM365GroupSetCommand_initValidators;
+var _EntraM365GroupSetCommand_instances, _EntraM365GroupSetCommand_initTelemetry, _EntraM365GroupSetCommand_initOptions, _EntraM365GroupSetCommand_initTypes, _EntraM365GroupSetCommand_initValidators;
 import { setTimeout } from 'timers/promises';
 import fs from 'fs';
 import path from 'path';
@@ -12,21 +12,25 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
-class AadM365GroupSetCommand extends GraphCommand {
+import aadCommands from '../../aadCommands.js';
+class EntraM365GroupSetCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_SET;
     }
     get description() {
         return 'Updates Microsoft 365 Group properties';
     }
+    alias() {
+        return [aadCommands.M365GROUP_SET];
+    }
     constructor() {
         super();
-        _AadM365GroupSetCommand_instances.add(this);
+        _EntraM365GroupSetCommand_instances.add(this);
         this.pollingInterval = 500;
-        __classPrivateFieldGet(this, _AadM365GroupSetCommand_instances, "m", _AadM365GroupSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupSetCommand_instances, "m", _AadM365GroupSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupSetCommand_instances, "m", _AadM365GroupSetCommand_initTypes).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupSetCommand_instances, "m", _AadM365GroupSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -70,7 +74,7 @@ class AadM365GroupSetCommand extends GraphCommand {
                     },
                     data: fs.readFileSync(fullPath)
                 };
-                await this.setGroupLogo(requestOptions, AadM365GroupSetCommand.numRepeat, logger);
+                await this.setGroupLogo(requestOptions, EntraM365GroupSetCommand.numRepeat, logger);
             }
             else if (this.debug) {
                 await logger.logToStderr('logoPath not set. Skipping');
@@ -140,7 +144,7 @@ class AadM365GroupSetCommand extends GraphCommand {
         }
         catch (err) {
             if (--retryLeft > 0) {
-                await setTimeout(this.pollingInterval * (AadM365GroupSetCommand.numRepeat - retryLeft));
+                await setTimeout(this.pollingInterval * (EntraM365GroupSetCommand.numRepeat - retryLeft));
                 await this.setGroupLogo(requestOptions, retryLeft, logger);
             }
             else {
@@ -160,7 +164,7 @@ class AadM365GroupSetCommand extends GraphCommand {
         }
     }
 }
-_AadM365GroupSetCommand_instances = new WeakSet(), _AadM365GroupSetCommand_initTelemetry = function _AadM365GroupSetCommand_initTelemetry() {
+_EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_initTelemetry = function _EntraM365GroupSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             displayName: typeof args.options.displayName !== 'undefined',
@@ -171,7 +175,7 @@ _AadM365GroupSetCommand_instances = new WeakSet(), _AadM365GroupSetCommand_initT
             logoPath: typeof args.options.logoPath !== 'undefined'
         });
     });
-}, _AadM365GroupSetCommand_initOptions = function _AadM365GroupSetCommand_initOptions() {
+}, _EntraM365GroupSetCommand_initOptions = function _EntraM365GroupSetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
@@ -188,9 +192,9 @@ _AadM365GroupSetCommand_instances = new WeakSet(), _AadM365GroupSetCommand_initT
     }, {
         option: '-l, --logoPath [logoPath]'
     });
-}, _AadM365GroupSetCommand_initTypes = function _AadM365GroupSetCommand_initTypes() {
+}, _EntraM365GroupSetCommand_initTypes = function _EntraM365GroupSetCommand_initTypes() {
     this.types.boolean.push('isPrivate');
-}, _AadM365GroupSetCommand_initValidators = function _AadM365GroupSetCommand_initValidators() {
+}, _EntraM365GroupSetCommand_initValidators = function _EntraM365GroupSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!args.options.displayName &&
             !args.options.description &&
@@ -231,6 +235,6 @@ _AadM365GroupSetCommand_instances = new WeakSet(), _AadM365GroupSetCommand_initT
         return true;
     });
 };
-AadM365GroupSetCommand.numRepeat = 15;
-export default new AadM365GroupSetCommand();
+EntraM365GroupSetCommand.numRepeat = 15;
+export default new EntraM365GroupSetCommand();
 //# sourceMappingURL=m365group-set.js.map

package/dist/m365/{aad → entra}/commands/m365group/m365group-teamify.js

@@ -3,28 +3,32 @@ 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 _AadM365GroupTeamifyCommand_instances, _AadM365GroupTeamifyCommand_initTelemetry, _AadM365GroupTeamifyCommand_initOptions, _AadM365GroupTeamifyCommand_initValidators, _AadM365GroupTeamifyCommand_initOptionSets;
+var _EntraM365GroupTeamifyCommand_instances, _EntraM365GroupTeamifyCommand_initTelemetry, _EntraM365GroupTeamifyCommand_initOptions, _EntraM365GroupTeamifyCommand_initValidators, _EntraM365GroupTeamifyCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
+import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
-class AadM365GroupTeamifyCommand extends GraphCommand {
+class EntraM365GroupTeamifyCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_TEAMIFY;
     }
     get description() {
         return 'Creates a new Microsoft Teams team under existing Microsoft 365 group';
     }
+    alias() {
+        return [aadCommands.M365GROUP_TEAMIFY];
+    }
     constructor() {
         super();
-        _AadM365GroupTeamifyCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadM365GroupTeamifyCommand_instances, "m", _AadM365GroupTeamifyCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupTeamifyCommand_instances, "m", _AadM365GroupTeamifyCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupTeamifyCommand_instances, "m", _AadM365GroupTeamifyCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupTeamifyCommand_instances, "m", _AadM365GroupTeamifyCommand_initOptionSets).call(this);
+        _EntraM365GroupTeamifyCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupTeamifyCommand_instances, "m", _EntraM365GroupTeamifyCommand_initOptionSets).call(this);
     }
     async getGroupId(options) {
         if (options.id) {
@@ -85,28 +89,28 @@ class AadM365GroupTeamifyCommand extends GraphCommand {
         }
     }
 }
-_AadM365GroupTeamifyCommand_instances = new WeakSet(), _AadM365GroupTeamifyCommand_initTelemetry = function _AadM365GroupTeamifyCommand_initTelemetry() {
+_EntraM365GroupTeamifyCommand_instances = new WeakSet(), _EntraM365GroupTeamifyCommand_initTelemetry = function _EntraM365GroupTeamifyCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: typeof args.options.id !== 'undefined',
             mailNickname: typeof args.options.mailNickname !== 'undefined'
         });
     });
-}, _AadM365GroupTeamifyCommand_initOptions = function _AadM365GroupTeamifyCommand_initOptions() {
+}, _EntraM365GroupTeamifyCommand_initOptions = function _EntraM365GroupTeamifyCommand_initOptions() {
     this.options.unshift({
         option: '-i, --id [id]'
     }, {
         option: '--mailNickname [mailNickname]'
     });
-}, _AadM365GroupTeamifyCommand_initValidators = function _AadM365GroupTeamifyCommand_initValidators() {
+}, _EntraM365GroupTeamifyCommand_initValidators = function _EntraM365GroupTeamifyCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     });
-}, _AadM365GroupTeamifyCommand_initOptionSets = function _AadM365GroupTeamifyCommand_initOptionSets() {
+}, _EntraM365GroupTeamifyCommand_initOptionSets = function _EntraM365GroupTeamifyCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'mailNickname'] });
 };
-export default new AadM365GroupTeamifyCommand();
+export default new EntraM365GroupTeamifyCommand();
 //# sourceMappingURL=m365group-teamify.js.map

package/dist/m365/{aad → entra}/commands/m365group/m365group-user-add.js

@@ -3,15 +3,16 @@ 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 _AadM365GroupUserAddCommand_instances, _AadM365GroupUserAddCommand_initTelemetry, _AadM365GroupUserAddCommand_initOptions, _AadM365GroupUserAddCommand_initValidators, _AadM365GroupUserAddCommand_initOptionSets;
+var _EntraM365GroupUserAddCommand_instances, _EntraM365GroupUserAddCommand_initTelemetry, _EntraM365GroupUserAddCommand_initOptions, _EntraM365GroupUserAddCommand_initValidators, _EntraM365GroupUserAddCommand_initOptionSets;
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
+import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
-class AadM365GroupUserAddCommand extends GraphCommand {
+class EntraM365GroupUserAddCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_USER_ADD;
     }
@@ -19,15 +20,15 @@ class AadM365GroupUserAddCommand extends GraphCommand {
         return 'Adds user to specified Microsoft 365 Group or Microsoft Teams team';
     }
     alias() {
-        return [teamsCommands.USER_ADD];
+        return [teamsCommands.USER_ADD, aadCommands.M365GROUP_USER_ADD];
     }
     constructor() {
         super();
-        _AadM365GroupUserAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadM365GroupUserAddCommand_instances, "m", _AadM365GroupUserAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupUserAddCommand_instances, "m", _AadM365GroupUserAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupUserAddCommand_instances, "m", _AadM365GroupUserAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupUserAddCommand_instances, "m", _AadM365GroupUserAddCommand_initOptionSets).call(this);
+        _EntraM365GroupUserAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -60,7 +61,7 @@ class AadM365GroupUserAddCommand extends GraphCommand {
         }
     }
 }
-_AadM365GroupUserAddCommand_instances = new WeakSet(), _AadM365GroupUserAddCommand_initTelemetry = function _AadM365GroupUserAddCommand_initTelemetry() {
+_EntraM365GroupUserAddCommand_instances = new WeakSet(), _EntraM365GroupUserAddCommand_initTelemetry = function _EntraM365GroupUserAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             role: args.options.role,
@@ -68,7 +69,7 @@ _AadM365GroupUserAddCommand_instances = new WeakSet(), _AadM365GroupUserAddComma
             groupId: typeof args.options.groupId !== 'undefined'
         });
     });
-}, _AadM365GroupUserAddCommand_initOptions = function _AadM365GroupUserAddCommand_initOptions() {
+}, _EntraM365GroupUserAddCommand_initOptions = function _EntraM365GroupUserAddCommand_initOptions() {
     this.options.unshift({
         option: '-n, --userName <userName>'
     }, {
@@ -79,7 +80,7 @@ _AadM365GroupUserAddCommand_instances = new WeakSet(), _AadM365GroupUserAddComma
         option: '-r, --role [role]',
         autocomplete: ['Owner', 'Member']
     });
-}, _AadM365GroupUserAddCommand_initValidators = function _AadM365GroupUserAddCommand_initValidators() {
+}, _EntraM365GroupUserAddCommand_initValidators = function _EntraM365GroupUserAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
@@ -94,8 +95,8 @@ _AadM365GroupUserAddCommand_instances = new WeakSet(), _AadM365GroupUserAddComma
         }
         return true;
     });
-}, _AadM365GroupUserAddCommand_initOptionSets = function _AadM365GroupUserAddCommand_initOptionSets() {
+}, _EntraM365GroupUserAddCommand_initOptionSets = function _EntraM365GroupUserAddCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'teamId'] });
 };
-export default new AadM365GroupUserAddCommand();
+export default new EntraM365GroupUserAddCommand();
 //# sourceMappingURL=m365group-user-add.js.map

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

@@ -0,0 +1,154 @@
+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 _EntraM365GroupUserListCommand_instances, _EntraM365GroupUserListCommand_initTelemetry, _EntraM365GroupUserListCommand_initOptions, _EntraM365GroupUserListCommand_initOptionSets, _EntraM365GroupUserListCommand_initValidators;
+import { odata } from '../../../../utils/odata.js';
+import { validation } from '../../../../utils/validation.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { aadGroup } from '../../../../utils/aadGroup.js';
+import aadCommands from '../../aadCommands.js';
+class EntraM365GroupUserListCommand extends GraphCommand {
+    get name() {
+        return commands.M365GROUP_USER_LIST;
+    }
+    get description() {
+        return "Lists users for the specified Microsoft 365 group";
+    }
+    alias() {
+        return [aadCommands.M365GROUP_USER_LIST];
+    }
+    constructor() {
+        super();
+        _EntraM365GroupUserListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserListCommand_instances, "m", _EntraM365GroupUserListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserListCommand_instances, "m", _EntraM365GroupUserListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserListCommand_instances, "m", _EntraM365GroupUserListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserListCommand_instances, "m", _EntraM365GroupUserListCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            if (args.options.role === 'Guest') {
+                this.warn(logger, `Value 'Guest' for the option role is deprecated. Use --filter "userType eq 'Guest'" instead.`);
+            }
+            const groupId = await this.getGroupId(args.options, logger);
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+            if (!isUnifiedGroup) {
+                throw Error(`Specified group '${args.options.groupId || args.options.groupDisplayName}' is not a Microsoft 365 group.`);
+            }
+            let users = [];
+            if (!args.options.role || args.options.role === 'Owner') {
+                const owners = await this.getUsers(args.options, 'Owners', groupId, logger);
+                owners.forEach(owner => users.push({ ...owner, roles: ['Owner'], userType: 'Owner' }));
+            }
+            if (!args.options.role || args.options.role === 'Member' || args.options.role === 'Guest') {
+                const members = await this.getUsers(args.options, 'Members', groupId, logger);
+                members.forEach((member) => {
+                    const user = users.find((u) => u.id === member.id);
+                    if (user !== undefined) {
+                        user.roles.push('Member');
+                    }
+                    else {
+                        users.push({ ...member, roles: ['Member'] });
+                    }
+                });
+            }
+            if (args.options.role) {
+                users = users.filter(i => i.userType === args.options.role);
+            }
+            await logger.log(users);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getGroupId(options, logger) {
+        if (options.groupId) {
+            return options.groupId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving Group Id...');
+        }
+        return await aadGroup.getGroupIdByDisplayName(options.groupDisplayName);
+    }
+    async getUsers(options, role, groupId, logger) {
+        const { properties, filter } = options;
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving ${role} of the group with id ${groupId}`);
+        }
+        const selectProperties = properties ?
+            `${properties.split(',').filter(f => f.toLowerCase() !== 'id').concat('id').map(p => p.trim()).join(',')}` :
+            'id,displayName,userPrincipalName,givenName,surname,userType';
+        const allSelectProperties = selectProperties.split(',');
+        const propertiesWithSlash = allSelectProperties.filter(item => item.includes('/'));
+        const fieldsToExpand = [];
+        propertiesWithSlash.forEach(p => {
+            const propertiesSplit = p.split('/');
+            fieldsToExpand.push(`${propertiesSplit[0]}($select=${propertiesSplit[1]})`);
+        });
+        const fieldExpand = fieldsToExpand.join(',');
+        const expandParam = fieldExpand.length > 0 ? `&$expand=${fieldExpand}` : '';
+        const selectParam = allSelectProperties.filter(item => !item.includes('/'));
+        const endpoint = `${this.resource}/v1.0/groups/${groupId}/${role}/microsoft.graph.user?$select=${selectParam}${expandParam}`;
+        if (filter) {
+            // While using the filter, we need to specify the ConsistencyLevel header.
+            // Can be refactored when the header is no longer necessary.
+            const requestOptions = {
+                url: `${endpoint}&$filter=${encodeURIComponent(filter)}&$count=true`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    ConsistencyLevel: 'eventual'
+                },
+                responseType: 'json'
+            };
+            return await odata.getAllItems(requestOptions);
+        }
+        else {
+            return await odata.getAllItems(endpoint);
+        }
+    }
+}
+_EntraM365GroupUserListCommand_instances = new WeakSet(), _EntraM365GroupUserListCommand_initTelemetry = function _EntraM365GroupUserListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            role: typeof args.options.role !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined',
+            filter: typeof args.options.filter !== 'undefined'
+        });
+    });
+}, _EntraM365GroupUserListCommand_initOptions = function _EntraM365GroupUserListCommand_initOptions() {
+    this.options.unshift({
+        option: "-i, --groupId [groupId]"
+    }, {
+        option: "-n, --groupDisplayName [groupDisplayName]"
+    }, {
+        option: "-r, --role [type]",
+        autocomplete: ["Owner", "Member", "Guest"]
+    }, {
+        option: "-p, --properties [properties]"
+    }, {
+        option: "-f, --filter [filter]"
+    });
+}, _EntraM365GroupUserListCommand_initOptionSets = function _EntraM365GroupUserListCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['groupId', 'groupDisplayName']
+    });
+}, _EntraM365GroupUserListCommand_initValidators = function _EntraM365GroupUserListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        if (args.options.role) {
+            if (['Owner', 'Member', 'Guest'].indexOf(args.options.role) === -1) {
+                return `${args.options.role} is not a valid role value. Allowed values Owner|Member|Guest`;
+            }
+        }
+        return true;
+    });
+};
+export default new EntraM365GroupUserListCommand();
+//# sourceMappingURL=m365group-user-list.js.map

package/dist/m365/{aad → entra}/commands/m365group/m365group-user-remove.js

@@ -3,7 +3,7 @@ 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 _AadM365GroupUserRemoveCommand_instances, _AadM365GroupUserRemoveCommand_initTelemetry, _AadM365GroupUserRemoveCommand_initOptions, _AadM365GroupUserRemoveCommand_initValidators, _AadM365GroupUserRemoveCommand_initOptionSets;
+var _EntraM365GroupUserRemoveCommand_instances, _EntraM365GroupUserRemoveCommand_initTelemetry, _EntraM365GroupUserRemoveCommand_initOptions, _EntraM365GroupUserRemoveCommand_initValidators, _EntraM365GroupUserRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
@@ -11,8 +11,9 @@ import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
+import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
-class AadM365GroupUserRemoveCommand extends GraphCommand {
+class EntraM365GroupUserRemoveCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_USER_REMOVE;
     }
@@ -20,15 +21,15 @@ class AadM365GroupUserRemoveCommand extends GraphCommand {
         return 'Removes the specified user from specified Microsoft 365 Group or Microsoft Teams team';
     }
     alias() {
-        return [teamsCommands.USER_REMOVE];
+        return [teamsCommands.USER_REMOVE, aadCommands.M365GROUP_USER_REMOVE];
     }
     constructor() {
         super();
-        _AadM365GroupUserRemoveCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupUserRemoveCommand_instances, "m", _AadM365GroupUserRemoveCommand_initOptionSets).call(this);
+        _EntraM365GroupUserRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
@@ -99,7 +100,7 @@ class AadM365GroupUserRemoveCommand extends GraphCommand {
         }
     }
 }
-_AadM365GroupUserRemoveCommand_instances = new WeakSet(), _AadM365GroupUserRemoveCommand_initTelemetry = function _AadM365GroupUserRemoveCommand_initTelemetry() {
+_EntraM365GroupUserRemoveCommand_instances = new WeakSet(), _EntraM365GroupUserRemoveCommand_initTelemetry = function _EntraM365GroupUserRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             force: (!(!args.options.force)).toString(),
@@ -107,7 +108,7 @@ _AadM365GroupUserRemoveCommand_instances = new WeakSet(), _AadM365GroupUserRemov
             groupId: typeof args.options.groupId !== 'undefined'
         });
     });
-}, _AadM365GroupUserRemoveCommand_initOptions = function _AadM365GroupUserRemoveCommand_initOptions() {
+}, _EntraM365GroupUserRemoveCommand_initOptions = function _EntraM365GroupUserRemoveCommand_initOptions() {
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
@@ -117,7 +118,7 @@ _AadM365GroupUserRemoveCommand_instances = new WeakSet(), _AadM365GroupUserRemov
     }, {
         option: '-f, --force'
     });
-}, _AadM365GroupUserRemoveCommand_initValidators = function _AadM365GroupUserRemoveCommand_initValidators() {
+}, _EntraM365GroupUserRemoveCommand_initValidators = function _EntraM365GroupUserRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
@@ -127,8 +128,8 @@ _AadM365GroupUserRemoveCommand_instances = new WeakSet(), _AadM365GroupUserRemov
         }
         return true;
     });
-}, _AadM365GroupUserRemoveCommand_initOptionSets = function _AadM365GroupUserRemoveCommand_initOptionSets() {
+}, _EntraM365GroupUserRemoveCommand_initOptionSets = function _EntraM365GroupUserRemoveCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'teamId'] });
 };
-export default new AadM365GroupUserRemoveCommand();
+export default new EntraM365GroupUserRemoveCommand();
 //# sourceMappingURL=m365group-user-remove.js.map

package/dist/m365/{aad → entra}/commands/m365group/m365group-user-set.js

@@ -3,7 +3,7 @@ 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 _AadM365GroupUserSetCommand_instances, _AadM365GroupUserSetCommand_initTelemetry, _AadM365GroupUserSetCommand_initOptions, _AadM365GroupUserSetCommand_initValidators, _AadM365GroupUserSetCommand_initOptionSets;
+var _EntraM365GroupUserSetCommand_instances, _EntraM365GroupUserSetCommand_initTelemetry, _EntraM365GroupUserSetCommand_initOptions, _EntraM365GroupUserSetCommand_initValidators, _EntraM365GroupUserSetCommand_initOptionSets;
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -11,7 +11,8 @@ import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
 import { aadGroup } from '../../../../utils/aadGroup.js';
-class AadM365GroupUserSetCommand extends GraphCommand {
+import aadCommands from '../../aadCommands.js';
+class EntraM365GroupUserSetCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_USER_SET;
     }
@@ -19,15 +20,15 @@ class AadM365GroupUserSetCommand extends GraphCommand {
         return 'Updates role of the specified user in the specified Microsoft 365 Group or Microsoft Teams team';
     }
     alias() {
-        return [teamsCommands.USER_SET];
+        return [teamsCommands.USER_SET, aadCommands.M365GROUP_USER_SET];
     }
     constructor() {
         super();
-        _AadM365GroupUserSetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _AadM365GroupUserSetCommand_instances, "m", _AadM365GroupUserSetCommand_initOptionSets).call(this);
+        _EntraM365GroupUserSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
         try {
@@ -118,7 +119,7 @@ class AadM365GroupUserSetCommand extends GraphCommand {
         return await odata.getAllItems(endpoint);
     }
 }
-_AadM365GroupUserSetCommand_instances = new WeakSet(), _AadM365GroupUserSetCommand_initTelemetry = function _AadM365GroupUserSetCommand_initTelemetry() {
+_EntraM365GroupUserSetCommand_instances = new WeakSet(), _EntraM365GroupUserSetCommand_initTelemetry = function _EntraM365GroupUserSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             teamId: typeof args.options.teamId !== 'undefined',
@@ -126,7 +127,7 @@ _AadM365GroupUserSetCommand_instances = new WeakSet(), _AadM365GroupUserSetComma
             role: args.options.role
         });
     });
-}, _AadM365GroupUserSetCommand_initOptions = function _AadM365GroupUserSetCommand_initOptions() {
+}, _EntraM365GroupUserSetCommand_initOptions = function _EntraM365GroupUserSetCommand_initOptions() {
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
@@ -137,7 +138,7 @@ _AadM365GroupUserSetCommand_instances = new WeakSet(), _AadM365GroupUserSetComma
         option: '-r, --role <role>',
         autocomplete: ['Owner', 'Member']
     });
-}, _AadM365GroupUserSetCommand_initValidators = function _AadM365GroupUserSetCommand_initValidators() {
+}, _EntraM365GroupUserSetCommand_initValidators = function _EntraM365GroupUserSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.teamId && !validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
@@ -150,8 +151,8 @@ _AadM365GroupUserSetCommand_instances = new WeakSet(), _AadM365GroupUserSetComma
         }
         return true;
     });
-}, _AadM365GroupUserSetCommand_initOptionSets = function _AadM365GroupUserSetCommand_initOptionSets() {
+}, _EntraM365GroupUserSetCommand_initOptionSets = function _EntraM365GroupUserSetCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'teamId'] });
 };
-export default new AadM365GroupUserSetCommand();
+export default new EntraM365GroupUserSetCommand();
 //# sourceMappingURL=m365group-user-set.js.map

package/dist/m365/{aad → entra}/commands/oauth2grant/oauth2grant-add.js

@@ -3,23 +3,27 @@ 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 _AadOAuth2GrantAddCommand_instances, _AadOAuth2GrantAddCommand_initOptions, _AadOAuth2GrantAddCommand_initValidators;
+var _EntraOAuth2GrantAddCommand_instances, _EntraOAuth2GrantAddCommand_initOptions, _EntraOAuth2GrantAddCommand_initValidators;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
+import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
-class AadOAuth2GrantAddCommand extends GraphCommand {
+class EntraOAuth2GrantAddCommand extends GraphCommand {
     get name() {
         return commands.OAUTH2GRANT_ADD;
     }
     get description() {
         return 'Grant the specified service principal OAuth2 permissions to the specified resource';
     }
+    alias() {
+        return [aadCommands.OAUTH2GRANT_ADD];
+    }
     constructor() {
         super();
-        _AadOAuth2GrantAddCommand_instances.add(this);
-        __classPrivateFieldGet(this, _AadOAuth2GrantAddCommand_instances, "m", _AadOAuth2GrantAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _AadOAuth2GrantAddCommand_instances, "m", _AadOAuth2GrantAddCommand_initValidators).call(this);
+        _EntraOAuth2GrantAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraOAuth2GrantAddCommand_instances, "m", _EntraOAuth2GrantAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraOAuth2GrantAddCommand_instances, "m", _EntraOAuth2GrantAddCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         if (this.verbose) {
@@ -47,7 +51,7 @@ class AadOAuth2GrantAddCommand extends GraphCommand {
         }
     }
 }
-_AadOAuth2GrantAddCommand_instances = new WeakSet(), _AadOAuth2GrantAddCommand_initOptions = function _AadOAuth2GrantAddCommand_initOptions() {
+_EntraOAuth2GrantAddCommand_instances = new WeakSet(), _EntraOAuth2GrantAddCommand_initOptions = function _EntraOAuth2GrantAddCommand_initOptions() {
     this.options.unshift({
         option: '-i, --clientId <clientId>'
     }, {
@@ -55,7 +59,7 @@ _AadOAuth2GrantAddCommand_instances = new WeakSet(), _AadOAuth2GrantAddCommand_i
     }, {
         option: '-s, --scope <scope>'
     });
-}, _AadOAuth2GrantAddCommand_initValidators = function _AadOAuth2GrantAddCommand_initValidators() {
+}, _EntraOAuth2GrantAddCommand_initValidators = function _EntraOAuth2GrantAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.clientId)) {
             return `${args.options.clientId} is not a valid GUID`;
@@ -66,5 +70,5 @@ _AadOAuth2GrantAddCommand_instances = new WeakSet(), _AadOAuth2GrantAddCommand_i
         return true;
     });
 };
-export default new AadOAuth2GrantAddCommand();
+export default new EntraOAuth2GrantAddCommand();
 //# sourceMappingURL=oauth2grant-add.js.map