@pnp/cli-microsoft365 9.0.0-beta.62575a1 → 9.0.0-beta.872d524

package/dist/m365/entra/commands/m365group/m365group-conversation-post-list.js

@@ -51,7 +51,7 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand {
         if (args.options.groupId) {
             return formatting.encodeQueryParameter(args.options.groupId);
         }
-        const group = await entraGroup.getGroupByDisplayName(args.options.groupDisplayName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.groupName);
         return group.id;
     }
 }
@@ -59,14 +59,14 @@ _EntraM365GroupConversationPostListCommand_instances = new WeakSet(), _EntraM365
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined'
+            groupName: typeof args.options.groupName !== 'undefined'
         });
     });
 }, _EntraM365GroupConversationPostListCommand_initOptions = function _EntraM365GroupConversationPostListCommand_initOptions() {
     this.options.unshift({
         option: '-i, --groupId [groupId]'
     }, {
-        option: '-d, --groupDisplayName [groupDisplayName]'
+        option: '-d, --groupName [groupName]'
     }, {
         option: '-t, --threadId <threadId>'
     });
@@ -78,7 +78,7 @@ _EntraM365GroupConversationPostListCommand_instances = new WeakSet(), _EntraM365
         return true;
     });
 }, _EntraM365GroupConversationPostListCommand_initOptionSets = function _EntraM365GroupConversationPostListCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'groupDisplayName'] });
+    this.optionSets.push({ options: ['groupId', 'groupName'] });
 };
 export default new EntraM365GroupConversationPostListCommand();
 //# sourceMappingURL=m365group-conversation-post-list.js.map

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

@@ -32,7 +32,7 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_RECYCLEBINITEM_LIST, commands.M365GROUP_RECYCLEBINITEM_LIST);
         try {
             const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
-            const displayNameFilter = args.options.groupDisplayName ? ` and startswith(DisplayName,'${formatting.encodeQueryParameter(args.options.groupDisplayName).replace(/'/g, `''`)}')` : '';
+            const displayNameFilter = args.options.groupName ? ` and startswith(DisplayName,'${formatting.encodeQueryParameter(args.options.groupName).replace(/'/g, `''`)}')` : '';
             const mailNicknameFilter = args.options.groupMailNickname ? ` and startswith(MailNickname,'${formatting.encodeQueryParameter(args.options.groupMailNickname).replace(/'/g, `''`)}')` : '';
             const topCount = '&$top=100';
             const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
@@ -47,13 +47,13 @@ class EntraM365GroupRecycleBinItemListCommand extends GraphCommand {
 _EntraM365GroupRecycleBinItemListCommand_instances = new WeakSet(), _EntraM365GroupRecycleBinItemListCommand_initTelemetry = function _EntraM365GroupRecycleBinItemListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
             groupMailNickname: typeof args.options.groupMailNickname !== 'undefined'
         });
     });
 }, _EntraM365GroupRecycleBinItemListCommand_initOptions = function _EntraM365GroupRecycleBinItemListCommand_initOptions() {
     this.options.unshift({
-        option: '-d, --groupDisplayName [groupDisplayName]'
+        option: '-d, --groupName [groupName]'
     }, {
         option: '-m, --groupMailNickname [groupMailNickname]'
     });

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

@@ -3,14 +3,15 @@ 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 _EntraM365GroupUserAddCommand_instances, _EntraM365GroupUserAddCommand_initTelemetry, _EntraM365GroupUserAddCommand_initOptions, _EntraM365GroupUserAddCommand_initValidators, _EntraM365GroupUserAddCommand_initOptionSets;
+var _EntraM365GroupUserAddCommand_instances, _EntraM365GroupUserAddCommand_initTelemetry, _EntraM365GroupUserAddCommand_initOptions, _EntraM365GroupUserAddCommand_initValidators, _EntraM365GroupUserAddCommand_initOptionSets, _EntraM365GroupUserAddCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
-import { formatting } from '../../../../utils/formatting.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 {
     get name() {
@@ -25,79 +26,155 @@ class EntraM365GroupUserAddCommand extends GraphCommand {
     constructor() {
         super();
         _EntraM365GroupUserAddCommand_instances.add(this);
+        this.allowedRoles = ['owner', 'member'];
         __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);
+        __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);
+        if (args.options.userName) {
+            await this.warn(logger, `Option 'userName' is deprecated. Please use 'ids' or 'userNames' instead.`);
+        }
         try {
-            const providedGroupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+            const userNames = args.options.userNames || args.options.userName;
+            const providedGroupId = await this.getGroupId(logger, args);
             const isUnifiedGroup = await entraGroup.isUnifiedGroup(providedGroupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${providedGroupId}' is not a Microsoft 365 group.`);
             }
-            let requestOptions = {
-                url: `${this.resource}/v1.0/users/${formatting.encodeQueryParameter(args.options.userName)}/id`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            const endpoint = `${this.resource}/v1.0/groups/${providedGroupId}/${((typeof args.options.role !== 'undefined') ? args.options.role : '').toLowerCase() === 'owner' ? 'owners' : 'members'}/$ref`;
-            requestOptions = {
-                url: endpoint,
+            const userIds = await this.getUserIds(logger, args.options.ids, userNames);
+            if (this.verbose) {
+                await logger.logToStderr(`Adding user(s) ${args.options.ids || userNames} to group ${args.options.groupId || args.options.groupName || args.options.teamId || args.options.teamName}...`);
+            }
+            await this.addUsers(providedGroupId, userIds, args.options.role);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getGroupId(logger, args) {
+        if (args.options.groupId) {
+            return args.options.groupId;
+        }
+        if (args.options.teamId) {
+            return args.options.teamId;
+        }
+        const name = args.options.groupName || args.options.teamName;
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving Group ID by display name...');
+        }
+        return entraGroup.getGroupIdByDisplayName(name);
+    }
+    async getUserIds(logger, userIds, userNames) {
+        if (userIds) {
+            return formatting.splitAndTrim(userIds);
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving user ID(s) by username(s)...');
+        }
+        return entraUser.getUserIdsByUpns(formatting.splitAndTrim(userNames));
+    }
+    async addUsers(groupId, userIds, role) {
+        for (let i = 0; i < userIds.length; i += 400) {
+            const userIdsBatch = userIds.slice(i, i + 400);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/$batch`,
                 headers: {
-                    'accept': 'application/json;odata.metadata=none'
+                    'content-type': 'application/json;odata.metadata=none'
                 },
                 responseType: 'json',
-                data: { "@odata.id": "https://graph.microsoft.com/v1.0/directoryObjects/" + res.value }
+                data: {
+                    requests: []
+                }
             };
-            await request.post(requestOptions);
-        }
-        catch (err) {
-            this.handleRejectedODataJsonPromise(err);
+            for (let j = 0; j < userIdsBatch.length; j += 20) {
+                const userIdsChunk = userIdsBatch.slice(j, j + 20);
+                requestOptions.data.requests.push({
+                    id: j + 1,
+                    method: 'PATCH',
+                    url: `/groups/${groupId}`,
+                    headers: {
+                        'content-type': 'application/json;odata.metadata=none'
+                    },
+                    body: {
+                        [`${((typeof role !== 'undefined') ? role : '').toLowerCase() === 'owner' ? 'owners' : 'members'}@odata.bind`]: userIdsChunk.map(u => `${this.resource}/v1.0/directoryObjects/${u}`)
+                    }
+                });
+            }
+            const res = await request.post(requestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 204) {
+                    throw response.body;
+                }
+            }
         }
     }
 }
 _EntraM365GroupUserAddCommand_instances = new WeakSet(), _EntraM365GroupUserAddCommand_initTelemetry = function _EntraM365GroupUserAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            role: args.options.role,
+            role: args.options.role !== 'undefined',
             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',
+            ids: typeof args.options.ids !== 'undefined',
+            userNames: typeof args.options.userNames !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
         });
     });
 }, _EntraM365GroupUserAddCommand_initOptions = function _EntraM365GroupUserAddCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --userName <userName>'
+        option: '-n, --userName [userName]'
     }, {
-        option: "-i, --groupId [groupId]"
+        option: '--ids [ids]'
     }, {
-        option: "--teamId [teamId]"
+        option: '--userNames [userNames]'
+    }, {
+        option: '-i, --groupId [groupId]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--teamId [teamId]'
+    }, {
+        option: '--teamName [teamName]'
     }, {
         option: '-r, --role [role]',
-        autocomplete: ['Owner', 'Member']
+        autocomplete: this.allowedRoles
     });
 }, _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`;
+            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.role) {
-            if (['owner', 'member'].indexOf(args.options.role.toLowerCase()) === -1) {
-                return `${args.options.role} is not a valid role value. Allowed values Owner|Member`;
+        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.role && !this.allowedRoles.some(role => role.toLowerCase() === args.options.role.toLowerCase())) {
+            return `'${args.options.role}' is not a valid role. Allowed values are: ${this.allowedRoles.join(',')}`;
+        }
         return true;
     });
 }, _EntraM365GroupUserAddCommand_initOptionSets = function _EntraM365GroupUserAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'teamId'] });
+    this.optionSets.push({ options: ['groupId', 'groupName', 'teamId', 'teamName'] });
+    this.optionSets.push({ options: ['userName', 'ids', 'userNames'] });
+}, _EntraM365GroupUserAddCommand_initTypes = function _EntraM365GroupUserAddCommand_initTypes() {
+    this.types.string.push('userName', 'ids', 'userNames', 'groupId', 'groupName', 'teamId', 'teamName', 'role');
 };
 export default new EntraM365GroupUserAddCommand();
 //# sourceMappingURL=m365group-user-add.js.map

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

@@ -31,9 +31,6 @@ class EntraM365GroupUserListCommand extends GraphCommand {
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_USER_LIST, commands.M365GROUP_USER_LIST);
         try {
-            if (args.options.role === 'Guest') {
-                await 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 entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
@@ -42,9 +39,9 @@ class EntraM365GroupUserListCommand extends GraphCommand {
             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' }));
+                owners.forEach(owner => users.push({ ...owner, roles: ['Owner'] }));
             }
-            if (!args.options.role || args.options.role === 'Member' || args.options.role === 'Guest') {
+            if (!args.options.role || args.options.role === 'Member') {
                 const members = await this.getUsers(args.options, 'Members', groupId, logger);
                 members.forEach((member) => {
                     const user = users.find((u) => u.id === member.id);
@@ -57,7 +54,7 @@ class EntraM365GroupUserListCommand extends GraphCommand {
                 });
             }
             if (args.options.role) {
-                users = users.filter(i => i.userType === args.options.role);
+                users = users.filter(i => i.roles.indexOf(args.options.role) > -1);
             }
             await logger.log(users);
         }
@@ -128,7 +125,7 @@ _EntraM365GroupUserListCommand_instances = new WeakSet(), _EntraM365GroupUserLis
         option: "-n, --groupDisplayName [groupDisplayName]"
     }, {
         option: "-r, --role [type]",
-        autocomplete: ["Owner", "Member", "Guest"]
+        autocomplete: ["Owner", "Member"]
     }, {
         option: "-p, --properties [properties]"
     }, {
@@ -144,8 +141,8 @@ _EntraM365GroupUserListCommand_instances = new WeakSet(), _EntraM365GroupUserLis
             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`;
+            if (['Owner', 'Member'].indexOf(args.options.role) === -1) {
+                return `${args.options.role} is not a valid role value. Allowed values Owner|Member`;
             }
         }
         return true;

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

@@ -3,14 +3,15 @@ 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 _EntraM365GroupUserSetCommand_instances, _EntraM365GroupUserSetCommand_initTelemetry, _EntraM365GroupUserSetCommand_initOptions, _EntraM365GroupUserSetCommand_initValidators, _EntraM365GroupUserSetCommand_initOptionSets;
+var _EntraM365GroupUserSetCommand_instances, _EntraM365GroupUserSetCommand_initTelemetry, _EntraM365GroupUserSetCommand_initOptions, _EntraM365GroupUserSetCommand_initValidators, _EntraM365GroupUserSetCommand_initOptionSets, _EntraM365GroupUserSetCommand_initTypes;
 import request from '../../../../request.js';
-import { odata } from '../../../../utils/odata.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() {
@@ -25,135 +26,209 @@ class EntraM365GroupUserSetCommand extends GraphCommand {
     constructor() {
         super();
         _EntraM365GroupUserSetCommand_instances.add(this);
+        this.allowedRoles = ['owner', 'member'];
         __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);
+        __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 groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+            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.`);
             }
-            let users = await this.getOwners(groupId, logger);
-            const membersAndGuests = await this.getMembersAndGuests(groupId, logger);
-            users = users.concat(membersAndGuests);
-            // Filter out duplicate added values for owners (as they are returned as members as well)
-            users = users.filter((groupUser, index, self) => index === self.findIndex((t) => (t.id === groupUser.id && t.displayName === groupUser.displayName)));
-            if (this.debug) {
-                await logger.logToStderr((typeof args.options.groupId !== 'undefined') ? 'Group owners and members:' : 'Team owners and members:');
-                await logger.logToStderr(users);
-                await logger.logToStderr('');
-            }
-            if (users.filter(i => args.options.userName.toUpperCase() === i.userPrincipalName.toUpperCase()).length <= 0) {
-                const userNotInGroup = (typeof args.options.groupId !== 'undefined') ?
-                    'The specified user does not belong to the given Microsoft 365 Group. Please use the \'m365group user add\' command to add new users.' :
-                    'The specified user does not belong to the given Microsoft Teams team. Please use the \'graph teams user add\' command to add new users.';
-                throw new Error(userNotInGroup);
-            }
-            if (args.options.role === "Owner") {
-                const foundMember = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Member');
-                if (foundMember !== undefined) {
-                    const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/$ref`;
-                    const requestOptions = {
-                        url: endpoint,
-                        headers: {
-                            'accept': 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json',
-                        data: { "@odata.id": "https://graph.microsoft.com/v1.0/directoryObjects/" + foundMember.id }
-                    };
-                    await request.post(requestOptions);
-                }
-                else {
-                    const userAlreadyOwner = (typeof args.options.groupId !== 'undefined') ?
-                        'The specified user is already an owner in the specified Microsoft 365 group, and thus cannot be promoted.' :
-                        'The specified user is already an owner in the specified Microsoft Teams team, and thus cannot be promoted.';
-                    throw new Error(userAlreadyOwner);
-                }
-            }
-            else {
-                const foundOwner = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Owner');
-                if (foundOwner !== undefined) {
-                    const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/${foundOwner.id}/$ref`;
-                    const requestOptions = {
-                        url: endpoint,
-                        headers: {
-                            'accept': 'application/json;odata.metadata=none'
-                        }
-                    };
-                    await request.delete(requestOptions);
-                }
-                else {
-                    const userAlreadyMember = (typeof args.options.groupId !== 'undefined') ?
-                        'The specified user is already a member in the specified Microsoft 365 group, and thus cannot be demoted.' :
-                        'The specified user is already a member in the specified Microsoft Teams team, and thus cannot be demoted.';
-                    throw new Error(userAlreadyMember);
-                }
-            }
+            const userIds = await this.getUserIds(logger, args.options.ids, userNames);
+            // we can't simply switch the role
+            // first add users to the new role
+            await this.addUsers(groupId, userIds, args.options.role);
+            // remove users from the old role
+            await this.removeUsersFromRole(logger, groupId, userIds, args.options.role);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getOwners(groupId, logger) {
+    async getGroupId(logger, args) {
+        if (args.options.groupId) {
+            return args.options.groupId;
+        }
+        if (args.options.teamId) {
+            return args.options.teamId;
+        }
+        const name = args.options.groupName || args.options.teamName;
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving owners of the group with id ${groupId}`);
-        }
-        const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
-        const users = await odata.getAllItems(endpoint);
-        // Currently there is a bug in the Microsoft Graph that returns Owners as
-        // userType 'member'. We therefore update all returned user as owner
-        users.forEach(user => {
-            user.userType = 'Owner';
-        });
-        return users;
+            await logger.logToStderr('Retrieving Group ID by display name...');
+        }
+        return entraGroup.getGroupIdByDisplayName(name);
+    }
+    async getUserIds(logger, userIds, userNames) {
+        if (userIds) {
+            return formatting.splitAndTrim(userIds);
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving user ID(s) by username(s)...');
+        }
+        return entraUser.getUserIdsByUpns(formatting.splitAndTrim(userNames));
     }
-    async getMembersAndGuests(groupId, logger) {
+    async removeUsersFromRole(logger, groupId, userIds, role) {
+        const userIdsToRemove = [];
+        const currentRole = (role.toLowerCase() === 'member') ? 'owners' : 'members';
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving members of the group with id ${groupId}`);
+            await logger.logToStderr(`Removing users from the old role '${currentRole}'.`);
+        }
+        for (let i = 0; i < userIds.length; i += 20) {
+            const userIdsBatch = userIds.slice(i, i + 20);
+            const requestOptions = this.getRequestOptions();
+            userIdsBatch.map(userId => {
+                requestOptions.data.requests.push({
+                    id: userId,
+                    method: 'GET',
+                    url: `/groups/${groupId}/${currentRole}/$count?$filter=id eq '${userId}'`,
+                    headers: {
+                        'ConsistencyLevel': 'eventual'
+                    }
+                });
+            });
+            // send batch request
+            const res = await request.post(requestOptions);
+            for (const response of res.responses) {
+                if (response.status === 200) {
+                    if (response.body === 1) {
+                        // user can be removed from current role
+                        userIdsToRemove.push(response.id);
+                    }
+                }
+                else {
+                    throw response.body;
+                }
+            }
+        }
+        for (let i = 0; i < userIdsToRemove.length; i += 20) {
+            const userIdsBatch = userIds.slice(i, i + 20);
+            const requestOptions = this.getRequestOptions();
+            userIdsBatch.map(userId => {
+                requestOptions.data.requests.push({
+                    id: userId,
+                    method: 'DELETE',
+                    url: `/groups/${groupId}/${currentRole}/${userId}/$ref`
+                });
+            });
+            const res = await request.post(requestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 204) {
+                    throw response.body;
+                }
+            }
+        }
+    }
+    async addUsers(groupId, userIds, role) {
+        for (let i = 0; i < userIds.length; i += 400) {
+            const userIdsBatch = userIds.slice(i, i + 400);
+            const requestOptions = this.getRequestOptions();
+            for (let j = 0; j < userIdsBatch.length; j += 20) {
+                const userIdsChunk = userIdsBatch.slice(j, j + 20);
+                requestOptions.data.requests.push({
+                    id: j + 1,
+                    method: 'PATCH',
+                    url: `/groups/${groupId}`,
+                    headers: {
+                        'content-type': 'application/json;odata.metadata=none'
+                    },
+                    body: {
+                        [`${role.toLowerCase() === 'member' ? 'members' : 'owners'}@odata.bind`]: userIdsChunk.map(u => `${this.resource}/v1.0/directoryObjects/${u}`)
+                    }
+                });
+            }
+            const res = await request.post(requestOptions);
+            for (const response of res.responses) {
+                if (response.status !== 204) {
+                    throw response.body;
+                }
+            }
         }
-        const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return await odata.getAllItems(endpoint);
+    }
+    getRequestOptions() {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/$batch`,
+            headers: {
+                'content-type': 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                requests: []
+            }
+        };
+        return requestOptions;
     }
 }
 _EntraM365GroupUserSetCommand_instances = new WeakSet(), _EntraM365GroupUserSetCommand_initTelemetry = function _EntraM365GroupUserSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             teamId: typeof args.options.teamId !== 'undefined',
+            teamName: typeof args.options.teamName !== 'undefined',
             groupId: typeof args.options.groupId !== 'undefined',
-            role: args.options.role
+            groupName: typeof args.options.groupName !== 'undefined',
+            ids: typeof args.options.ids !== 'undefined',
+            userNames: typeof args.options.userNames !== 'undefined'
         });
     });
 }, _EntraM365GroupUserSetCommand_initOptions = function _EntraM365GroupUserSetCommand_initOptions() {
     this.options.unshift({
-        option: "-i, --groupId [groupId]"
+        option: '-n, --userName [userName]'
+    }, {
+        option: '--ids [ids]'
+    }, {
+        option: '--userNames [userNames]'
+    }, {
+        option: '-i, --groupId [groupId]'
     }, {
-        option: "--teamId [teamId]"
+        option: '--groupName [groupName]'
     }, {
-        option: '-n, --userName <userName>'
+        option: '--teamId [teamId]'
+    }, {
+        option: '--teamName [teamName]'
     }, {
         option: '-r, --role <role>',
-        autocomplete: ['Owner', 'Member']
+        autocomplete: this.allowedRoles
     });
 }, _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`;
+            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 (['Owner', 'Member'].indexOf(args.options.role) === -1) {
-            return `${args.options.role} is not a valid role value. Allowed values Owner|Member`;
+        if (args.options.role && !this.allowedRoles.some(role => role.toLowerCase() === args.options.role.toLowerCase())) {
+            return `'${args.options.role}' is not a valid role. Allowed values are: ${this.allowedRoles.join(',')}`;
         }
         return true;
     });
 }, _EntraM365GroupUserSetCommand_initOptionSets = function _EntraM365GroupUserSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['groupId', 'teamId'] });
+    this.optionSets.push({ options: ['groupId', 'groupName', 'teamId', 'teamName'] });
+    this.optionSets.push({ options: ['userName', 'ids', 'userNames'] });
+}, _EntraM365GroupUserSetCommand_initTypes = function _EntraM365GroupUserSetCommand_initTypes() {
+    this.types.string.push('userName', 'ids', 'userNames', 'groupId', 'groupName', 'teamId', 'teamName', 'role');
 };
 export default new EntraM365GroupUserSetCommand();
 //# sourceMappingURL=m365group-user-set.js.map