@pnp/cli-microsoft365 10.0.0-beta.58f28f9 → 10.0.0-beta.67e608f

package/dist/m365/entra/commands/m365group/m365group-set.js

@@ -12,9 +12,11 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
-import aadCommands from '../../aadCommands.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import auth from '../../../../Auth.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
 class EntraM365GroupSetCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_SET;
@@ -22,9 +24,6 @@ class EntraM365GroupSetCommand extends GraphCommand {
     get description() {
         return 'Updates Microsoft 365 Group properties';
     }
-    alias() {
-        return [aadCommands.M365GROUP_SET];
-    }
     constructor() {
         super();
         _EntraM365GroupSetCommand_instances.add(this);
@@ -36,7 +35,6 @@ class EntraM365GroupSetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.M365GROUP_SET, commands.M365GROUP_SET);
         try {
             if ((args.options.allowExternalSenders !== undefined || args.options.autoSubscribeNewMembers !== undefined) && accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken)) {
                 throw `Option 'allowExternalSenders' and 'autoSubscribeNewMembers' can only be used when using delegated permissions.`;
@@ -102,59 +100,13 @@ class EntraM365GroupSetCommand extends GraphCommand {
             else if (this.debug) {
                 await logger.logToStderr('logoPath not set. Skipping');
             }
-            if (args.options.owners) {
-                const owners = args.options.owners.split(',').map(o => o.trim());
-                if (this.verbose) {
-                    await logger.logToStderr('Retrieving user information to set group owners...');
-                }
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                    headers: {
-                        'content-type': 'application/json'
-                    },
-                    responseType: 'json'
-                };
-                const res = await request.get(requestOptions);
-                await Promise.all(res.value.map(u => request.post({
-                    url: `${this.resource}/v1.0/groups/${groupId}/owners/$ref`,
-                    headers: {
-                        'content-type': 'application/json'
-                    },
-                    responseType: 'json',
-                    data: {
-                        "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
-                    }
-                })));
-            }
-            else if (this.debug) {
-                await logger.logToStderr('Owners not set. Skipping');
-            }
-            if (args.options.members) {
-                const members = args.options.members.split(',').map(o => o.trim());
-                if (this.verbose) {
-                    await logger.logToStderr('Retrieving user information to set group members...');
-                }
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/users?$filter=${members.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                    headers: {
-                        'content-type': 'application/json'
-                    },
-                    responseType: 'json'
-                };
-                const res = await request.get(requestOptions);
-                await Promise.all(res.value.map(u => request.post({
-                    url: `${this.resource}/v1.0/groups/${groupId}/members/$ref`,
-                    headers: {
-                        'content-type': 'application/json'
-                    },
-                    responseType: 'json',
-                    data: {
-                        "@odata.id": `https://graph.microsoft.com/v1.0/users/${u.id}`
-                    }
-                })));
+            const ownerIds = await this.getUserIds(logger, args.options.ownerIds, args.options.ownerUserNames);
+            const memberIds = await this.getUserIds(logger, args.options.memberIds, args.options.memberUserNames);
+            if (ownerIds.length > 0) {
+                await this.updateUsers(logger, groupId, 'owners', ownerIds);
             }
-            else if (this.debug) {
-                await logger.logToStderr('Members not set. Skipping');
+            if (memberIds.length > 0) {
+                await this.updateUsers(logger, groupId, 'members', memberIds);
             }
         }
         catch (err) {
@@ -186,6 +138,87 @@ class EntraM365GroupSetCommand extends GraphCommand {
                 return 'image/jpeg';
         }
     }
+    async getUserIds(logger, userIds, userNames) {
+        if (userIds) {
+            return formatting.splitAndTrim(userIds);
+        }
+        if (userNames) {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving user IDs...`);
+            }
+            return entraUser.getUserIdsByUpns(formatting.splitAndTrim(userNames));
+        }
+        return [];
+    }
+    async updateUsers(logger, groupId, role, userIds) {
+        const groupUsers = await odata.getAllItems(`${this.resource}/v1.0/groups/${groupId}/${role}/microsoft.graph.user?$select=id`);
+        const userIdsToAdd = userIds.filter(userId => !groupUsers.some(groupUser => groupUser.id === userId));
+        const userIdsToRemove = groupUsers.filter(groupUser => !userIds.some(userId => groupUser.id === userId)).map(user => user.id);
+        if (this.verbose) {
+            await logger.logToStderr(`Adding ${userIdsToAdd.length} ${role}...`);
+        }
+        for (let i = 0; i < userIdsToAdd.length; i += 400) {
+            const userIdsBatch = userIdsToAdd.slice(i, i + 400);
+            const batchRequestOptions = this.getBatchRequestOptions();
+            // only 20 requests per one batch are allowed
+            for (let j = 0; j < userIdsBatch.length; j += 20) {
+                // only 20 users can be added in one request
+                const userIdsChunk = userIdsBatch.slice(j, j + 20);
+                batchRequestOptions.data.requests.push({
+                    id: j + 1,
+                    method: 'PATCH',
+                    url: `/groups/${groupId}`,
+                    headers: {
+                        'content-type': 'application/json;odata.metadata=none',
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    body: {
+                        [`${role}@odata.bind`]: userIdsChunk.map(u => `${this.resource}/v1.0/directoryObjects/${u}`)
+                    }
+                });
+            }
+            const res = await request.post(batchRequestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 204) {
+                    throw response.body;
+                }
+            }
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Removing ${userIdsToRemove.length} ${role}...`);
+        }
+        for (let i = 0; i < userIdsToRemove.length; i += 20) {
+            const userIdsBatch = userIdsToRemove.slice(i, i + 20);
+            const batchRequestOptions = this.getBatchRequestOptions();
+            userIdsBatch.map(userId => {
+                batchRequestOptions.data.requests.push({
+                    id: userId,
+                    method: 'DELETE',
+                    url: `/groups/${groupId}/${role}/${userId}/$ref`
+                });
+            });
+            const res = await request.post(batchRequestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 204) {
+                    throw response.body;
+                }
+            }
+        }
+    }
+    getBatchRequestOptions() {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/$batch`,
+            headers: {
+                'content-type': 'application/json;odata.metadata=none',
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                requests: []
+            }
+        };
+        return requestOptions;
+    }
 }
 _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_initTelemetry = function _EntraM365GroupSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -194,8 +227,10 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
             displayName: typeof args.options.displayName !== 'undefined',
             newDisplayName: typeof args.options.newDisplayName !== 'undefined',
             description: typeof args.options.description !== 'undefined',
-            owners: typeof args.options.owners !== 'undefined',
-            members: typeof args.options.members !== 'undefined',
+            ownerIds: typeof args.options.ownerIds !== 'undefined',
+            ownerUserNames: typeof args.options.ownerUserNames !== 'undefined',
+            memberIds: typeof args.options.memberIds !== 'undefined',
+            memberUserNames: typeof args.options.memberUserNames !== 'undefined',
             isPrivate: !!args.options.isPrivate,
             logoPath: typeof args.options.logoPath !== 'undefined',
             allowExternalSenders: !!args.options.allowExternalSenders,
@@ -214,9 +249,13 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
     }, {
         option: '-d, --description [description]'
     }, {
-        option: '--owners [owners]'
+        option: '--ownerIds [ownerIds]'
     }, {
-        option: '--members [members]'
+        option: '--ownerUserNames [ownerUserNames]'
+    }, {
+        option: '--memberIds [memberIds]'
+    }, {
+        option: '--memberUserNames [memberUserNames]'
     }, {
         option: '--isPrivate [isPrivate]',
         autocomplete: ['true', 'false']
@@ -237,17 +276,31 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
     });
 }, _EntraM365GroupSetCommand_initOptionSets = function _EntraM365GroupSetCommand_initOptionSets() {
     this.optionSets.push({ options: ['id', 'displayName'] });
+    this.optionSets.push({
+        options: ['ownerIds', 'ownerUserNames'],
+        runsWhen: (args) => {
+            return args.options.ownerIds !== undefined || args.options.ownerUserNames !== undefined;
+        }
+    });
+    this.optionSets.push({
+        options: ['memberIds', 'memberUserNames'],
+        runsWhen: (args) => {
+            return args.options.memberIds !== undefined || args.options.memberUserNames !== undefined;
+        }
+    });
 }, _EntraM365GroupSetCommand_initTypes = function _EntraM365GroupSetCommand_initTypes() {
     this.types.boolean.push('isPrivate', 'allowEternalSenders', 'autoSubscribeNewMembers', 'hideFromAddressLists', 'hideFromOutlookClients');
-    this.types.string.push('id', 'displayName', 'newDisplayName', 'description', 'owners', 'members', 'logoPath');
+    this.types.string.push('id', 'displayName', 'newDisplayName', 'description', 'ownerIds', 'ownerUserNames', 'memberIds', 'memberUserNames', 'logoPath');
 }, _EntraM365GroupSetCommand_initValidators = function _EntraM365GroupSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!args.options.newDisplayName &&
             args.options.description === undefined &&
-            !args.options.members &&
-            !args.options.owners &&
+            args.options.ownerIds === undefined &&
+            args.options.ownerUserNames === undefined &&
+            args.options.memberIds === undefined &&
+            args.options.memberUserNames === undefined &&
             args.options.isPrivate === undefined &&
-            !args.options.logoPath &&
+            args.options.logoPath === undefined &&
             args.options.allowExternalSenders === undefined &&
             args.options.autoSubscribeNewMembers === undefined &&
             args.options.hideFromAddressLists === undefined &&
@@ -257,16 +310,28 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
         if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        if (args.options.owners) {
-            const isValidArray = validation.isValidUserPrincipalNameArray(args.options.owners);
-            if (isValidArray !== true) {
-                return `Option 'owners' contains one or more invalid UPNs: ${isValidArray}.`;
+        if (args.options.ownerIds) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ownerIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'ownerIds': ${isValidGUIDArrayResult}.`;
+            }
+        }
+        if (args.options.ownerUserNames) {
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.ownerUserNames);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for the option 'ownerUserNames': ${isValidUPNArrayResult}.`;
+            }
+        }
+        if (args.options.memberIds) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.memberIds);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'memberIds': ${isValidGUIDArrayResult}.`;
             }
         }
-        if (args.options.members) {
-            const isValidArray = validation.isValidUserPrincipalNameArray(args.options.members);
-            if (isValidArray !== true) {
-                return `Option 'members' contains one or more invalid UPNs: ${isValidArray}.`;
+        if (args.options.memberUserNames) {
+            const isValidUPNArrayResult = validation.isValidUserPrincipalNameArray(args.options.memberUserNames);
+            if (isValidUPNArrayResult !== true) {
+                return `The following user principal names are invalid for the option 'memberUserNames': ${isValidUPNArrayResult}.`;
             }
         }
         if (args.options.logoPath) {

package/dist/m365/entra/commands/m365group/m365group-teamify.js

@@ -10,7 +10,6 @@ import { entraGroup } from '../../../../utils/entraGroup.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 EntraM365GroupTeamifyCommand extends GraphCommand {
     get name() {
@@ -19,9 +18,6 @@ class EntraM365GroupTeamifyCommand extends GraphCommand {
     get description() {
         return 'Creates a new Microsoft Teams team under existing Microsoft 365 group';
     }
-    alias() {
-        return [aadCommands.M365GROUP_TEAMIFY];
-    }
     constructor() {
         super();
         _EntraM365GroupTeamifyCommand_instances.add(this);
@@ -54,7 +50,6 @@ class EntraM365GroupTeamifyCommand extends GraphCommand {
         return groupItem.id;
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.M365GROUP_TEAMIFY, commands.M365GROUP_TEAMIFY);
         try {
             const groupId = await this.getGroupId(args.options);
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);

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

@@ -9,8 +9,6 @@ import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import teamsCommands from '../../../teams/commands.js';
-import aadCommands from '../../aadCommands.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import commands from '../../commands.js';
 class EntraM365GroupUserAddCommand extends GraphCommand {
@@ -20,9 +18,6 @@ class EntraM365GroupUserAddCommand extends GraphCommand {
     get description() {
         return 'Adds user to specified Microsoft 365 Group or Microsoft Teams team';
     }
-    alias() {
-        return [teamsCommands.USER_ADD, aadCommands.M365GROUP_USER_ADD];
-    }
     constructor() {
         super();
         _EntraM365GroupUserAddCommand_instances.add(this);
@@ -34,7 +29,6 @@ class EntraM365GroupUserAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraM365GroupUserAddCommand_instances, "m", _EntraM365GroupUserAddCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_ADD, commands.M365GROUP_USER_ADD);
         try {
             const providedGroupId = await this.getGroupId(logger, args);
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(providedGroupId);

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

@@ -9,7 +9,6 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
-import aadCommands from '../../aadCommands.js';
 class EntraM365GroupUserListCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_USER_LIST;
@@ -17,9 +16,6 @@ class EntraM365GroupUserListCommand extends GraphCommand {
     get description() {
         return "Lists users for the specified Microsoft 365 group";
     }
-    alias() {
-        return [aadCommands.M365GROUP_USER_LIST];
-    }
     constructor() {
         super();
         _EntraM365GroupUserListCommand_instances.add(this);
@@ -29,7 +25,6 @@ class EntraM365GroupUserListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraM365GroupUserListCommand_instances, "m", _EntraM365GroupUserListCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_LIST, commands.M365GROUP_USER_LIST);
         try {
             const groupId = await this.getGroupId(args.options, logger);
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);

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

@@ -3,15 +3,14 @@ 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 _EntraM365GroupUserRemoveCommand_instances, _EntraM365GroupUserRemoveCommand_initTelemetry, _EntraM365GroupUserRemoveCommand_initOptions, _EntraM365GroupUserRemoveCommand_initValidators, _EntraM365GroupUserRemoveCommand_initOptionSets;
+var _EntraM365GroupUserRemoveCommand_instances, _EntraM365GroupUserRemoveCommand_initTelemetry, _EntraM365GroupUserRemoveCommand_initOptions, _EntraM365GroupUserRemoveCommand_initValidators, _EntraM365GroupUserRemoveCommand_initOptionSets, _EntraM365GroupUserRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
+import { entraUser } from '../../../../utils/entraUser.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 EntraM365GroupUserRemoveCommand extends GraphCommand {
     get name() {
@@ -20,9 +19,6 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes the specified user from specified Microsoft 365 Group or Microsoft Teams team';
     }
-    alias() {
-        return [teamsCommands.USER_REMOVE, aadCommands.M365GROUP_USER_REMOVE];
-    }
     constructor() {
         super();
         _EntraM365GroupUserRemoveCommand_instances.add(this);
@@ -30,61 +26,23 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand {
         __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);
+        __classPrivateFieldGet(this, _EntraM365GroupUserRemoveCommand_instances, "m", _EntraM365GroupUserRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_REMOVE, commands.M365GROUP_USER_REMOVE);
-        const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+        if (args.options.userName) {
+            await this.warn(logger, `Option 'userName' is deprecated. Please use 'ids' or 'userNames' instead.`);
+        }
         const removeUser = async () => {
             try {
+                const groupId = await this.getGroupId(logger, args.options.groupId, args.options.teamId, args.options.groupName, args.options.teamName);
                 const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
                 if (!isUnifiedGroup) {
                     throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
                 }
-                // retrieve user
-                const user = await request.get({
-                    url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userName)}/id`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                });
-                // used to verify if the group exists or not
-                await request.get({
-                    url: `${this.resource}/v1.0/groups/${groupId}/id`,
-                    headers: {
-                        'accept': 'application/json;odata.metadata=none'
-                    }
-                });
-                try {
-                    // try to delete the user from the owners. Accepted error is 404
-                    await request.delete({
-                        url: `${this.resource}/v1.0/groups/${groupId}/owners/${user.value}/$ref`,
-                        headers: {
-                            'accept': 'application/json;odata.metadata=none'
-                        }
-                    });
-                }
-                catch (err) {
-                    // the 404 error is accepted
-                    if (err.response.status !== 404) {
-                        throw err.response.data;
-                    }
-                }
-                // try to delete the user from the members. Accepted error is 404
-                try {
-                    await request.delete({
-                        url: `${this.resource}/v1.0/groups/${groupId}/members/${user.value}/$ref`,
-                        headers: {
-                            'accept': 'application/json;odata.metadata=none'
-                        }
-                    });
-                }
-                catch (err) {
-                    // the 404 error is accepted
-                    if (err.response.status !== 404) {
-                        throw err.response.data;
-                    }
-                }
+                const userNames = args.options.userNames || args.options.userName;
+                const userIds = await this.getUserIds(logger, args.options.ids, userNames);
+                await this.removeUsersFromGroup(groupId, userIds, 'owners');
+                await this.removeUsersFromGroup(groupId, userIds, 'members');
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -94,43 +52,116 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand {
             await removeUser();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove ${args.options.userName} from the ${(typeof args.options.groupId !== 'undefined' ? 'group' : 'team')} ${groupId}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove ${args.options.userName || args.options.userNames || args.options.ids} from ${args.options.groupId || args.options.groupName || args.options.teamId || args.options.teamName}?` });
             if (result) {
                 await removeUser();
             }
         }
     }
+    async getGroupId(logger, groupId, teamId, groupName, teamName) {
+        const id = groupId || teamId;
+        if (id) {
+            return id;
+        }
+        const name = groupName ?? teamName;
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving Group ID by display name ${name}...`);
+        }
+        return entraGroup.getGroupIdByDisplayName(name);
+    }
+    async getUserIds(logger, userIds, userNames) {
+        if (userIds) {
+            return formatting.splitAndTrim(userIds);
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving user IDs for {userNames}...`);
+        }
+        return entraUser.getUserIdsByUpns(formatting.splitAndTrim(userNames));
+    }
+    async removeUsersFromGroup(groupId, userIds, role) {
+        for (const userId of userIds) {
+            try {
+                await request.delete({
+                    url: `${this.resource}/v1.0/groups/${groupId}/${role}/${userId}/$ref`,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none'
+                    }
+                });
+            }
+            catch (err) {
+                // the 404 error is accepted
+                if (err.response.status !== 404) {
+                    throw err.response.data;
+                }
+            }
+        }
+    }
 }
 _EntraM365GroupUserRemoveCommand_instances = new WeakSet(), _EntraM365GroupUserRemoveCommand_initTelemetry = function _EntraM365GroupUserRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            force: (!(!args.options.force)).toString(),
+            force: !!args.options.force,
             teamId: typeof args.options.teamId !== 'undefined',
-            groupId: typeof args.options.groupId !== 'undefined'
+            groupId: typeof args.options.groupId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            ids: typeof args.options.ids !== 'undefined',
+            userNames: typeof args.options.userNames !== 'undefined'
         });
     });
 }, _EntraM365GroupUserRemoveCommand_initOptions = function _EntraM365GroupUserRemoveCommand_initOptions() {
     this.options.unshift({
-        option: "-i, --groupId [groupId]"
+        option: '-i, --groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
     }, {
-        option: "--teamId [teamId]"
+        option: '--teamId [teamId]'
     }, {
-        option: '-n, --userName <userName>'
+        option: '--teamName [teamName]'
+    }, {
+        option: '-n, --userName [userName]'
+    }, {
+        option: '--ids [ids]'
+    }, {
+        option: '--userNames [userNames]'
     }, {
         option: '-f, --force'
     });
 }, _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`;
+            return `${args.options.teamId} is not a valid GUID for option 'teamId'.`;
         }
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
-            return `${args.options.groupId} is not a valid GUID`;
+            return `${args.options.groupId} is not a valid GUID for option 'groupId'.`;
+        }
+        if (args.options.ids) {
+            const isValidGUIDArrayResult = validation.isValidGuidArray(args.options.ids);
+            if (isValidGUIDArrayResult !== true) {
+                return `The following GUIDs are invalid for the option 'ids': ${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.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `The specified userName '${args.options.userName}' is not a valid user principal name.`;
         }
         return true;
     });
 }, _EntraM365GroupUserRemoveCommand_initOptionSets = function _EntraM365GroupUserRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'teamId'] });
+    this.optionSets.push({
+        options: ['groupId', 'teamId', 'groupName', 'teamName']
+    }, {
+        options: ['userName', 'ids', 'userNames']
+    });
+}, _EntraM365GroupUserRemoveCommand_initTypes = function _EntraM365GroupUserRemoveCommand_initTypes() {
+    this.types.string.push('groupId', 'groupName', 'teamId', 'teamName', 'userName', 'ids', 'userNames');
+    this.types.boolean.push('force');
 };
 export default new EntraM365GroupUserRemoveCommand();
 //# sourceMappingURL=m365group-user-remove.js.map

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

@@ -8,11 +8,9 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import { formatting } from '../../../../utils/formatting.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { entraUser } from '../../../../utils/entraUser.js';
-import aadCommands from '../../aadCommands.js';
 class EntraM365GroupUserSetCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_USER_SET;
@@ -20,9 +18,6 @@ class EntraM365GroupUserSetCommand extends GraphCommand {
     get description() {
         return 'Updates role of the specified user in the specified Microsoft 365 Group or Microsoft Teams team';
     }
-    alias() {
-        return [teamsCommands.USER_SET, aadCommands.M365GROUP_USER_SET];
-    }
     constructor() {
         super();
         _EntraM365GroupUserSetCommand_instances.add(this);
@@ -34,18 +29,13 @@ class EntraM365GroupUserSetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraM365GroupUserSetCommand_instances, "m", _EntraM365GroupUserSetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_SET, commands.M365GROUP_USER_SET);
-        if (args.options.userName) {
-            await this.warn(logger, `Option 'userName' is deprecated. Please use 'ids' or 'userNames' instead.`);
-        }
         try {
-            const userNames = args.options.userNames || args.options.userName;
             const groupId = await this.getGroupId(logger, args);
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
             }
-            const userIds = await this.getUserIds(logger, args.options.ids, userNames);
+            const userIds = await this.getUserIds(logger, args.options.ids, args.options.userNames);
             // we can't simply switch the role
             // first add users to the new role
             await this.addUsers(groupId, userIds, args.options.role);
@@ -182,8 +172,6 @@ _EntraM365GroupUserSetCommand_instances = new WeakSet(), _EntraM365GroupUserSetC
     });
 }, _EntraM365GroupUserSetCommand_initOptions = function _EntraM365GroupUserSetCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --userName [userName]'
-    }, {
         option: '--ids [ids]'
     }, {
         option: '--userNames [userNames]'
@@ -226,9 +214,9 @@ _EntraM365GroupUserSetCommand_instances = new WeakSet(), _EntraM365GroupUserSetC
     });
 }, _EntraM365GroupUserSetCommand_initOptionSets = function _EntraM365GroupUserSetCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'groupName', 'teamId', 'teamName'] });
-    this.optionSets.push({ options: ['userName', 'ids', 'userNames'] });
+    this.optionSets.push({ options: ['ids', 'userNames'] });
 }, _EntraM365GroupUserSetCommand_initTypes = function _EntraM365GroupUserSetCommand_initTypes() {
-    this.types.string.push('userName', 'ids', 'userNames', 'groupId', 'groupName', 'teamId', 'teamName', 'role');
+    this.types.string.push('ids', 'userNames', 'groupId', 'groupName', 'teamId', 'teamName', 'role');
 };
 export default new EntraM365GroupUserSetCommand();
 //# sourceMappingURL=m365group-user-set.js.map