@pnp/cli-microsoft365 10.0.0-beta.04ac437 → 10.0.0-beta.0b765ef

package/dist/Auth.js

@@ -117,7 +117,7 @@ export class Auth {
     async restoreAuth() {
         // check if auth has been restored previously
         if (this._connection.active) {
-            return Promise.resolve();
+            return;
         }
         try {
             const connection = await this.getConnectionInfoFromStorage();
@@ -473,7 +473,7 @@ export class Auth {
             }
             if (userName && process.env.ACC_CLOUD) {
                 // reject for now since the Azure Cloud Shell does not support user-managed identity 
-                return Promise.reject('Azure Cloud Shell does not support user-managed identity. You can execute the command without the --userName option to login with user identity');
+                throw 'Azure Cloud Shell does not support user-managed identity. You can execute the command without the --userName option to login with user identity';
             }
             requestOptions.url = `${process.env.IDENTITY_ENDPOINT}?resource=${encodeURIComponent(resource)}`;
         }
@@ -483,7 +483,7 @@ export class Auth {
             }
             if (userName && process.env.ACC_CLOUD) {
                 // reject for now since the Azure Cloud Shell does not support user-managed identity 
-                return Promise.reject('Azure Cloud Shell does not support user-managed identity. You can execute the command without the --userName option to login with user identity');
+                throw 'Azure Cloud Shell does not support user-managed identity. You can execute the command without the --userName option to login with user identity';
             }
             requestOptions.url = `${process.env.MSI_ENDPOINT}?resource=${encodeURIComponent(resource)}`;
         }

package/dist/AuthServer.js

@@ -26,7 +26,7 @@ export class AuthServer {
                 await this.logger.logToStderr(url);
                 await this.logger.logToStderr('');
             }
-            this.openUrl(url);
+            await this.openUrl(url);
         };
         this.httpRequest = async (request, response) => {
             if (this.debug) {
@@ -80,19 +80,19 @@ export class AuthServer {
     get server() {
         return this.httpServer;
     }
-    openUrl(url) {
-        browserUtil.open(url)
-            .then(async (_) => {
+    async openUrl(url) {
+        try {
+            await browserUtil.open(url);
             await this.logger.logToStderr("To sign in, use the web browser that just has been opened. Please sign-in there.");
-        })
-            .catch(_ => {
+        }
+        catch {
             const errorResponse = {
                 error: "Can't open the default browser",
                 errorDescription: "Was not able to open a browser instance. Try again later or use a different authentication method."
             };
             this.reject(errorResponse);
             this.httpServer.close();
-        });
+        }
     }
 }
 export default new AuthServer();

package/dist/api.js

@@ -3,7 +3,7 @@ export async function executeCommand(commandName, options, listener) {
     cli.loadAllCommandsInfo();
     await cli.loadCommandFromArgs(commandName.split(' '));
     if (!cli.commandToExecute) {
-        return Promise.reject(`Command not found: ${commandName}`);
+        throw `Command not found: ${commandName}`;
     }
     return cli.executeCommandWithOutput(cli.commandToExecute.command, { options: options ?? {} }, listener);
 }

package/dist/config.js

@@ -14,6 +14,7 @@ export default {
         'https://graph.microsoft.com/ChannelMessage.Send',
         'https://graph.microsoft.com/ChannelSettings.ReadWrite.All',
         'https://graph.microsoft.com/Chat.ReadWrite',
+        'https://graph.microsoft.com/Community.ReadWrite.All',
         'https://graph.microsoft.com/Directory.AccessAsUser.All',
         'https://graph.microsoft.com/Directory.ReadWrite.All',
         'https://graph.microsoft.com/ExternalConnection.ReadWrite.All',

package/dist/m365/cli/commands/cli-doctor.js

@@ -31,8 +31,8 @@ class CliDoctorCommand extends Command {
             },
             cliVersion: app.packageJson().version,
             nodeVersion: process.version,
-            cliAadAppId: auth.connection.appId,
-            cliAadAppTenant: validation.isValidGuid(auth.connection.tenant) ? 'single' : auth.connection.tenant,
+            cliEntraAppId: auth.connection.appId,
+            cliEntraAppTenant: validation.isValidGuid(auth.connection.tenant) ? 'single' : auth.connection.tenant,
             authMode: auth.connection.authType,
             cliEnvironment: process.env.CLIMICROSOFT365_ENV ? process.env.CLIMICROSOFT365_ENV : '',
             cliConfig: cli.getConfig().all,

package/dist/m365/cli/commands.js

@@ -11,7 +11,6 @@ export default {
     CONFIG_SET: `${prefix} config set`,
     CONSENT: `${prefix} consent`,
     DOCTOR: `${prefix} doctor`,
-    ISSUE: `${prefix} issue`,
-    RECONSENT: `${prefix} reconsent`
+    ISSUE: `${prefix} issue`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/entra/commands/group/{group-user-add.js → group-member-add.js}

@@ -3,34 +3,34 @@ 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 _EntraGroupUserAddCommand_instances, _EntraGroupUserAddCommand_initTelemetry, _EntraGroupUserAddCommand_initOptions, _EntraGroupUserAddCommand_initValidators, _EntraGroupUserAddCommand_initOptionSets, _EntraGroupUserAddCommand_initTypes;
+var _EntraGroupMemberAddCommand_instances, _EntraGroupMemberAddCommand_initTelemetry, _EntraGroupMemberAddCommand_initOptions, _EntraGroupMemberAddCommand_initValidators, _EntraGroupMemberAddCommand_initOptionSets, _EntraGroupMemberAddCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class EntraGroupUserAddCommand extends GraphCommand {
+class EntraGroupMemberAddCommand extends GraphCommand {
     get name() {
-        return commands.GROUP_USER_ADD;
+        return commands.GROUP_MEMBER_ADD;
     }
     get description() {
-        return 'Adds a user to a Microsoft Entra ID group';
+        return 'Adds a member to a Microsoft Entra ID group';
     }
     constructor() {
         super();
-        _EntraGroupUserAddCommand_instances.add(this);
+        _EntraGroupMemberAddCommand_instances.add(this);
         this.roleValues = ['Owner', 'Member'];
-        __classPrivateFieldGet(this, _EntraGroupUserAddCommand_instances, "m", _EntraGroupUserAddCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserAddCommand_instances, "m", _EntraGroupUserAddCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserAddCommand_instances, "m", _EntraGroupUserAddCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserAddCommand_instances, "m", _EntraGroupUserAddCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserAddCommand_instances, "m", _EntraGroupUserAddCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberAddCommand_instances, "m", _EntraGroupMemberAddCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
             if (this.verbose) {
-                await logger.logToStderr(`Adding user(s) ${args.options.ids || args.options.userNames} to group ${args.options.groupId || args.options.groupDisplayName}...`);
+                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userNames} to group ${args.options.groupId || args.options.groupDisplayName}...`);
             }
             const groupId = await this.getGroupId(logger, args.options);
             const userIds = await this.getUserIds(logger, args.options);
@@ -91,7 +91,7 @@ class EntraGroupUserAddCommand extends GraphCommand {
         return entraUser.getUserIdsByUpns(options.userNames.split(',').map(u => u.trim()));
     }
 }
-_EntraGroupUserAddCommand_instances = new WeakSet(), _EntraGroupUserAddCommand_initTelemetry = function _EntraGroupUserAddCommand_initTelemetry() {
+_EntraGroupMemberAddCommand_instances = new WeakSet(), _EntraGroupMemberAddCommand_initTelemetry = function _EntraGroupMemberAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
@@ -100,7 +100,7 @@ _EntraGroupUserAddCommand_instances = new WeakSet(), _EntraGroupUserAddCommand_i
             userNames: typeof args.options.userNames !== 'undefined'
         });
     });
-}, _EntraGroupUserAddCommand_initOptions = function _EntraGroupUserAddCommand_initOptions() {
+}, _EntraGroupMemberAddCommand_initOptions = function _EntraGroupMemberAddCommand_initOptions() {
     this.options.unshift({
         option: '-i, --groupId [groupId]'
     }, {
@@ -113,7 +113,7 @@ _EntraGroupUserAddCommand_instances = new WeakSet(), _EntraGroupUserAddCommand_i
         option: '-r, --role <role>',
         autocomplete: this.roleValues
     });
-}, _EntraGroupUserAddCommand_initValidators = function _EntraGroupUserAddCommand_initValidators() {
+}, _EntraGroupMemberAddCommand_initValidators = function _EntraGroupMemberAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID for option groupId.`;
@@ -135,10 +135,10 @@ _EntraGroupUserAddCommand_instances = new WeakSet(), _EntraGroupUserAddCommand_i
         }
         return true;
     });
-}, _EntraGroupUserAddCommand_initOptionSets = function _EntraGroupUserAddCommand_initOptionSets() {
+}, _EntraGroupMemberAddCommand_initOptionSets = function _EntraGroupMemberAddCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'groupDisplayName'] }, { options: ['ids', 'userNames'] });
-}, _EntraGroupUserAddCommand_initTypes = function _EntraGroupUserAddCommand_initTypes() {
+}, _EntraGroupMemberAddCommand_initTypes = function _EntraGroupMemberAddCommand_initTypes() {
     this.types.string.push('groupId', 'groupDisplayName', 'ids', 'userNames', 'role');
 };
-export default new EntraGroupUserAddCommand();
-//# sourceMappingURL=group-user-add.js.map
+export default new EntraGroupMemberAddCommand();
+//# sourceMappingURL=group-member-add.js.map

package/dist/m365/entra/commands/group/{group-user-list.js → group-member-list.js}

@@ -3,19 +3,19 @@ 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 _EntraGroupUserListCommand_instances, _EntraGroupUserListCommand_initTelemetry, _EntraGroupUserListCommand_initOptions, _EntraGroupUserListCommand_initOptionSets, _EntraGroupUserListCommand_initValidators;
+var _EntraGroupMemberListCommand_instances, _EntraGroupMemberListCommand_initTelemetry, _EntraGroupMemberListCommand_initOptions, _EntraGroupMemberListCommand_initOptionSets, _EntraGroupMemberListCommand_initValidators;
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import aadCommands from '../../aadCommands.js';
-class EntraGroupUserListCommand extends GraphCommand {
+class EntraGroupMemberListCommand extends GraphCommand {
     get name() {
-        return commands.GROUP_USER_LIST;
+        return commands.GROUP_MEMBER_LIST;
     }
     get description() {
-        return 'Lists users of a specific Entra group';
+        return 'Lists members of a specific Entra group';
     }
     alias() {
         return [aadCommands.GROUP_USER_LIST];
@@ -25,14 +25,14 @@ class EntraGroupUserListCommand extends GraphCommand {
     }
     constructor() {
         super();
-        _EntraGroupUserListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraGroupUserListCommand_instances, "m", _EntraGroupUserListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserListCommand_instances, "m", _EntraGroupUserListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserListCommand_instances, "m", _EntraGroupUserListCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserListCommand_instances, "m", _EntraGroupUserListCommand_initValidators).call(this);
+        _EntraGroupMemberListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberListCommand_instances, "m", _EntraGroupMemberListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberListCommand_instances, "m", _EntraGroupMemberListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberListCommand_instances, "m", _EntraGroupMemberListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberListCommand_instances, "m", _EntraGroupMemberListCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.GROUP_USER_LIST, commands.GROUP_USER_LIST);
+        await this.showDeprecationWarning(logger, aadCommands.GROUP_USER_LIST, commands.GROUP_MEMBER_LIST);
         try {
             const groupId = await this.getGroupId(args.options, logger);
             const users = [];
@@ -86,7 +86,7 @@ class EntraGroupUserListCommand extends GraphCommand {
         });
         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}`;
+        const endpoint = `${this.resource}/v1.0/groups/${groupId}/${role}?$select=${selectParam}${expandParam}`;
         let users = [];
         if (filter) {
             // While using the filter, we need to specify the ConsistencyLevel header.
@@ -107,7 +107,7 @@ class EntraGroupUserListCommand extends GraphCommand {
         return users;
     }
 }
-_EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand_initTelemetry = function _EntraGroupUserListCommand_initTelemetry() {
+_EntraGroupMemberListCommand_instances = new WeakSet(), _EntraGroupMemberListCommand_initTelemetry = function _EntraGroupMemberListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
@@ -117,7 +117,7 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
             filter: typeof args.options.filter !== 'undefined'
         });
     });
-}, _EntraGroupUserListCommand_initOptions = function _EntraGroupUserListCommand_initOptions() {
+}, _EntraGroupMemberListCommand_initOptions = function _EntraGroupMemberListCommand_initOptions() {
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
@@ -130,11 +130,11 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
     }, {
         option: "-f, --filter [filter]"
     });
-}, _EntraGroupUserListCommand_initOptionSets = function _EntraGroupUserListCommand_initOptionSets() {
+}, _EntraGroupMemberListCommand_initOptionSets = function _EntraGroupMemberListCommand_initOptionSets() {
     this.optionSets.push({
         options: ['groupId', 'groupName']
     });
-}, _EntraGroupUserListCommand_initValidators = function _EntraGroupUserListCommand_initValidators() {
+}, _EntraGroupMemberListCommand_initValidators = function _EntraGroupMemberListCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
@@ -147,5 +147,5 @@ _EntraGroupUserListCommand_instances = new WeakSet(), _EntraGroupUserListCommand
         return true;
     });
 };
-export default new EntraGroupUserListCommand();
-//# sourceMappingURL=group-user-list.js.map
+export default new EntraGroupMemberListCommand();
+//# sourceMappingURL=group-member-list.js.map

package/dist/m365/entra/commands/group/{group-user-set.js → group-member-set.js}

@@ -3,34 +3,34 @@ 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 _EntraGroupUserSetCommand_instances, _EntraGroupUserSetCommand_initTelemetry, _EntraGroupUserSetCommand_initOptions, _EntraGroupUserSetCommand_initValidators, _EntraGroupUserSetCommand_initOptionSets, _EntraGroupUserSetCommand_initTypes;
+var _EntraGroupMemberSetCommand_instances, _EntraGroupMemberSetCommand_initTelemetry, _EntraGroupMemberSetCommand_initOptions, _EntraGroupMemberSetCommand_initValidators, _EntraGroupMemberSetCommand_initOptionSets, _EntraGroupMemberSetCommand_initTypes;
 import request from '../../../../request.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-class EntraGroupUserSetCommand extends GraphCommand {
+class EntraGroupMemberSetCommand extends GraphCommand {
     get name() {
-        return commands.GROUP_USER_SET;
+        return commands.GROUP_MEMBER_SET;
     }
     get description() {
-        return 'Updates role of users in a Microsoft Entra ID group';
+        return 'Updates the role of members in a Microsoft Entra ID group';
     }
     constructor() {
         super();
-        _EntraGroupUserSetCommand_instances.add(this);
+        _EntraGroupMemberSetCommand_instances.add(this);
         this.roleValues = ['Owner', 'Member'];
-        __classPrivateFieldGet(this, _EntraGroupUserSetCommand_instances, "m", _EntraGroupUserSetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserSetCommand_instances, "m", _EntraGroupUserSetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserSetCommand_instances, "m", _EntraGroupUserSetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserSetCommand_instances, "m", _EntraGroupUserSetCommand_initOptionSets).call(this);
-        __classPrivateFieldGet(this, _EntraGroupUserSetCommand_instances, "m", _EntraGroupUserSetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraGroupMemberSetCommand_instances, "m", _EntraGroupMemberSetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
             if (this.verbose) {
-                await logger.logToStderr(`Adding user(s) ${args.options.ids || args.options.userNames} to group ${args.options.groupId || args.options.groupDisplayName}...`);
+                await logger.logToStderr(`Adding member(s) ${args.options.ids || args.options.userNames} to role ${args.options.role} of group ${args.options.groupId || args.options.groupDisplayName}...`);
             }
             const groupId = await this.getGroupId(logger, args.options);
             const userIds = await this.getUserIds(logger, args.options);
@@ -66,7 +66,7 @@ class EntraGroupUserSetCommand extends GraphCommand {
         const userIdsToRemove = [];
         const currentRole = options.role === 'Member' ? 'owners' : 'members';
         if (this.verbose) {
-            await logger.logToStderr(`Removing users from the old role '${currentRole}'.`);
+            await logger.logToStderr(`Removing members from the old role '${currentRole}'.`);
         }
         for (let i = 0; i < userIds.length; i += 20) {
             const userIdsBatch = userIds.slice(i, i + 20);
@@ -153,7 +153,7 @@ class EntraGroupUserSetCommand extends GraphCommand {
         return requestOptions;
     }
 }
-_EntraGroupUserSetCommand_instances = new WeakSet(), _EntraGroupUserSetCommand_initTelemetry = function _EntraGroupUserSetCommand_initTelemetry() {
+_EntraGroupMemberSetCommand_instances = new WeakSet(), _EntraGroupMemberSetCommand_initTelemetry = function _EntraGroupMemberSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             groupId: typeof args.options.groupId !== 'undefined',
@@ -162,7 +162,7 @@ _EntraGroupUserSetCommand_instances = new WeakSet(), _EntraGroupUserSetCommand_i
             userNames: typeof args.options.userNames !== 'undefined'
         });
     });
-}, _EntraGroupUserSetCommand_initOptions = function _EntraGroupUserSetCommand_initOptions() {
+}, _EntraGroupMemberSetCommand_initOptions = function _EntraGroupMemberSetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --groupId [groupId]'
     }, {
@@ -175,7 +175,7 @@ _EntraGroupUserSetCommand_instances = new WeakSet(), _EntraGroupUserSetCommand_i
         option: '-r, --role <role>',
         autocomplete: this.roleValues
     });
-}, _EntraGroupUserSetCommand_initValidators = function _EntraGroupUserSetCommand_initValidators() {
+}, _EntraGroupMemberSetCommand_initValidators = function _EntraGroupMemberSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID for option groupId.`;
@@ -197,10 +197,10 @@ _EntraGroupUserSetCommand_instances = new WeakSet(), _EntraGroupUserSetCommand_i
         }
         return true;
     });
-}, _EntraGroupUserSetCommand_initOptionSets = function _EntraGroupUserSetCommand_initOptionSets() {
+}, _EntraGroupMemberSetCommand_initOptionSets = function _EntraGroupMemberSetCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'groupDisplayName'] }, { options: ['ids', 'userNames'] });
-}, _EntraGroupUserSetCommand_initTypes = function _EntraGroupUserSetCommand_initTypes() {
+}, _EntraGroupMemberSetCommand_initTypes = function _EntraGroupMemberSetCommand_initTypes() {
     this.types.string.push('groupId', 'groupDisplayName', 'ids', 'userNames', 'role');
 };
-export default new EntraGroupUserSetCommand();
-//# sourceMappingURL=group-user-set.js.map
+export default new EntraGroupMemberSetCommand();
+//# sourceMappingURL=group-member-set.js.map

package/dist/m365/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 _EntraM365GroupSetCommand_instances, _EntraM365GroupSetCommand_initTelemetry, _EntraM365GroupSetCommand_initOptions, _EntraM365GroupSetCommand_initTypes, _EntraM365GroupSetCommand_initValidators;
+var _EntraM365GroupSetCommand_instances, _EntraM365GroupSetCommand_initTelemetry, _EntraM365GroupSetCommand_initOptions, _EntraM365GroupSetCommand_initOptionSets, _EntraM365GroupSetCommand_initTypes, _EntraM365GroupSetCommand_initValidators;
 import { setTimeout } from 'timers/promises';
 import fs from 'fs';
 import path from 'path';
@@ -31,8 +31,9 @@ class EntraM365GroupSetCommand extends GraphCommand {
         this.pollingInterval = 500;
         __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);
+        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraM365GroupSetCommand_instances, "m", _EntraM365GroupSetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.M365GROUP_SET, commands.M365GROUP_SET);
@@ -40,23 +41,24 @@ class EntraM365GroupSetCommand extends GraphCommand {
             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.`;
             }
-            const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
+            const groupId = args.options.id || await entraGroup.getGroupIdByDisplayName(args.options.displayName);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
-                throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
+                throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
             }
             if (this.verbose) {
-                await logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id}...`);
+                await logger.logToStderr(`Updating Microsoft 365 Group ${args.options.id || args.options.displayName}...`);
             }
-            if (args.options.displayName || args.options.description !== undefined || args.options.isPrivate !== undefined) {
+            if (args.options.newDisplayName || args.options.description !== undefined || args.options.isPrivate !== undefined) {
                 const update = {
-                    displayName: args.options.displayName,
+                    displayName: args.options.newDisplayName,
                     description: args.options.description !== '' ? args.options.description : null
                 };
                 if (args.options.isPrivate !== undefined) {
                     update.visibility = args.options.isPrivate ? 'Private' : 'Public';
                 }
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${args.options.id}`,
+                    url: `${this.resource}/v1.0/groups/${groupId}`,
                     headers: {
                         'accept': 'application/json;odata.metadata=none'
                     },
@@ -74,7 +76,7 @@ class EntraM365GroupSetCommand extends GraphCommand {
                     hideFromOutlookClients: args.options.hideFromOutlookClients
                 };
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${args.options.id}`,
+                    url: `${this.resource}/v1.0/groups/${groupId}`,
                     headers: {
                         accept: 'application/json;odata.metadata=none'
                     },
@@ -89,7 +91,7 @@ class EntraM365GroupSetCommand extends GraphCommand {
                     await logger.logToStderr(`Setting group logo ${fullPath}...`);
                 }
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${args.options.id}/photo/$value`,
+                    url: `${this.resource}/v1.0/groups/${groupId}/photo/$value`,
                     headers: {
                         'content-type': this.getImageContentType(fullPath)
                     },
@@ -114,7 +116,7 @@ class EntraM365GroupSetCommand extends GraphCommand {
                 };
                 const res = await request.get(requestOptions);
                 await Promise.all(res.value.map(u => request.post({
-                    url: `${this.resource}/v1.0/groups/${args.options.id}/owners/$ref`,
+                    url: `${this.resource}/v1.0/groups/${groupId}/owners/$ref`,
                     headers: {
                         'content-type': 'application/json'
                     },
@@ -141,7 +143,7 @@ class EntraM365GroupSetCommand extends GraphCommand {
                 };
                 const res = await request.get(requestOptions);
                 await Promise.all(res.value.map(u => request.post({
-                    url: `${this.resource}/v1.0/groups/${args.options.id}/members/$ref`,
+                    url: `${this.resource}/v1.0/groups/${groupId}/members/$ref`,
                     headers: {
                         'content-type': 'application/json'
                     },
@@ -188,7 +190,9 @@ class EntraM365GroupSetCommand extends GraphCommand {
 _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_initTelemetry = function _EntraM365GroupSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
             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',
@@ -202,9 +206,11 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
     });
 }, _EntraM365GroupSetCommand_initOptions = function _EntraM365GroupSetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
+        option: '-i, --id [id]'
     }, {
         option: '-n, --displayName [displayName]'
+    }, {
+        option: '--newDisplayName [newDisplayName]'
     }, {
         option: '-d, --description [description]'
     }, {
@@ -229,12 +235,14 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
         option: '--hideFromOutlookClients [hideFromOutlookClients]',
         autocomplete: ['true', 'false']
     });
+}, _EntraM365GroupSetCommand_initOptionSets = function _EntraM365GroupSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'displayName'] });
 }, _EntraM365GroupSetCommand_initTypes = function _EntraM365GroupSetCommand_initTypes() {
     this.types.boolean.push('isPrivate', 'allowEternalSenders', 'autoSubscribeNewMembers', 'hideFromAddressLists', 'hideFromOutlookClients');
-    this.types.string.push('id', 'displayName', 'description', 'owners', 'members', 'logoPath');
+    this.types.string.push('id', 'displayName', 'newDisplayName', 'description', 'owners', 'members', 'logoPath');
 }, _EntraM365GroupSetCommand_initValidators = function _EntraM365GroupSetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!args.options.displayName &&
+        if (!args.options.newDisplayName &&
             args.options.description === undefined &&
             !args.options.members &&
             !args.options.owners &&
@@ -246,7 +254,7 @@ _EntraM365GroupSetCommand_instances = new WeakSet(), _EntraM365GroupSetCommand_i
             args.options.hideFromOutlookClients === undefined) {
             return 'Specify at least one option to update.';
         }
-        if (!validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.owners) {

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

@@ -35,19 +35,15 @@ class EntraM365GroupUserAddCommand extends GraphCommand {
     }
     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 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.`);
             }
-            const userIds = await this.getUserIds(logger, args.options.ids, userNames);
+            const userIds = await this.getUserIds(logger, args.options.ids, args.options.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 logger.logToStderr(`Adding user(s) ${args.options.ids || args.options.userNames} to group ${args.options.groupId || args.options.groupName || args.options.teamId || args.options.teamName}...`);
             }
             await this.addUsers(providedGroupId, userIds, args.options.role);
         }
@@ -122,14 +118,11 @@ _EntraM365GroupUserAddCommand_instances = new WeakSet(), _EntraM365GroupUserAddC
             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'
+            userNames: typeof args.options.userNames !== 'undefined'
         });
     });
 }, _EntraM365GroupUserAddCommand_initOptions = function _EntraM365GroupUserAddCommand_initOptions() {
     this.options.unshift({
-        option: '-n, --userName [userName]'
-    }, {
         option: '--ids [ids]'
     }, {
         option: '--userNames [userNames]'
@@ -172,9 +165,9 @@ _EntraM365GroupUserAddCommand_instances = new WeakSet(), _EntraM365GroupUserAddC
     });
 }, _EntraM365GroupUserAddCommand_initOptionSets = function _EntraM365GroupUserAddCommand_initOptionSets() {
     this.optionSets.push({ options: ['groupId', 'groupName', 'teamId', 'teamName'] });
-    this.optionSets.push({ options: ['userName', 'ids', 'userNames'] });
+    this.optionSets.push({ options: ['ids', 'userNames'] });
 }, _EntraM365GroupUserAddCommand_initTypes = function _EntraM365GroupUserAddCommand_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 EntraM365GroupUserAddCommand();
 //# sourceMappingURL=m365group-user-add.js.map

package/dist/m365/entra/commands/oauth2grant/oauth2grant-list.js

@@ -4,8 +4,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _EntraOAuth2GrantListCommand_instances, _EntraOAuth2GrantListCommand_initOptions, _EntraOAuth2GrantListCommand_initValidators;
-import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import aadCommands from '../../aadCommands.js';
@@ -35,17 +35,8 @@ class EntraOAuth2GrantListCommand extends GraphCommand {
             await logger.logToStderr(`Retrieving list of OAuth grants for the service principal...`);
         }
         try {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/oauth2PermissionGrants?$filter=clientId eq '${formatting.encodeQueryParameter(args.options.spObjectId)}'`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            const res = await request.get(requestOptions);
-            if (res.value && res.value.length > 0) {
-                await logger.log(res.value);
-            }
+            const res = await odata.getAllItems(`${this.resource}/v1.0/oauth2PermissionGrants?$filter=clientId eq '${formatting.encodeQueryParameter(args.options.spObjectId)}'`);
+            await logger.log(res);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/entra/commands.js

@@ -41,9 +41,9 @@ export default {
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
     GROUP_SET: `${prefix} group set`,
-    GROUP_USER_ADD: `${prefix} group user add`,
-    GROUP_USER_LIST: `${prefix} group user list`,
-    GROUP_USER_SET: `${prefix} group user set`,
+    GROUP_MEMBER_ADD: `${prefix} group member add`,
+    GROUP_MEMBER_LIST: `${prefix} group member list`,
+    GROUP_MEMBER_SET: `${prefix} group member set`,
     GROUPSETTING_ADD: `${prefix} groupsetting add`,
     GROUPSETTING_GET: `${prefix} groupsetting get`,
     GROUPSETTING_LIST: `${prefix} groupsetting list`,