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

package/dist/cli/cli.js

@@ -60,7 +60,7 @@ function getSettingWithDefaultValue(settingName, defaultValue) {
     }
 }
 function getClientId() {
-    return cli.getSettingWithDefaultValue(settingsNames.clientId, process.env.CLIMICROSOFT365_ENTRAAPPID || process.env.CLIMICROSOFT365_AADAPPID);
+    return cli.getSettingWithDefaultValue(settingsNames.clientId, process.env.CLIMICROSOFT365_ENTRAAPPID);
 }
 function getTenant() {
     return cli.getSettingWithDefaultValue(settingsNames.tenantId, process.env.CLIMICROSOFT365_TENANT || 'common');

package/dist/m365/app/commands/permission/permission-add.js

@@ -33,12 +33,12 @@ class AppPermissionAddCommand extends AppCommand {
             const appObject = await this.getAppObject();
             const servicePrincipals = await odata.getAllItems(`${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,appRoles,id,oauth2PermissionScopes,servicePrincipalNames`);
             const appPermissions = [];
-            if (args.options.delegatedPermission) {
-                const delegatedPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.delegatedPermission, ScopeType.Scope, appPermissions, logger);
+            if (args.options.delegatedPermissions) {
+                const delegatedPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.delegatedPermissions, ScopeType.Scope, appPermissions, logger);
                 this.addPermissionsToResourceArray(delegatedPermissions, appObject.requiredResourceAccess);
             }
-            if (args.options.applicationPermission) {
-                const applicationPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.applicationPermission, ScopeType.Role, appPermissions, logger);
+            if (args.options.applicationPermissions) {
+                const applicationPermissions = await this.getRequiredResourceAccessForApis(servicePrincipals, args.options.applicationPermissions, ScopeType.Role, appPermissions, logger);
                 this.addPermissionsToResourceArray(applicationPermissions, appObject.requiredResourceAccess);
             }
             const addPermissionsRequestOptions = {
@@ -198,17 +198,17 @@ _AppPermissionAddCommand_instances = new WeakSet(), _AppPermissionAddCommand_ini
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
-            applicationPermission: typeof args.options.applicationPermission !== 'undefined',
-            delegatedPermission: typeof args.options.delegatedPermission !== 'undefined',
+            applicationPermissions: typeof args.options.applicationPermissions !== 'undefined',
+            delegatedPermissions: typeof args.options.delegatedPermissions !== 'undefined',
             grantAdminConsent: !!args.options.grantAdminConsent
         });
     });
 }, _AppPermissionAddCommand_initOptions = function _AppPermissionAddCommand_initOptions() {
-    this.options.unshift({ option: '--appId [appId]' }, { option: '--applicationPermission [applicationPermission]' }, { option: '--delegatedPermission [delegatedPermission]' }, { option: '--grantAdminConsent' });
+    this.options.unshift({ option: '--appId [appId]' }, { option: '--applicationPermissions [applicationPermissions]' }, { option: '--delegatedPermissions [delegatedPermissions]' }, { option: '--grantAdminConsent' });
 }, _AppPermissionAddCommand_initOptionSets = function _AppPermissionAddCommand_initOptionSets() {
     this.optionSets.push({
-        options: ['applicationPermission', 'delegatedPermission'],
-        runsWhen: (args) => args.options.delegatedPermission === undefined && args.options.applicationPermission === undefined
+        options: ['applicationPermissions', 'delegatedPermissions'],
+        runsWhen: (args) => args.options.delegatedPermissions === undefined && args.options.applicationPermissions === undefined
     });
 };
 export default new AppPermissionAddCommand();

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

@@ -23,12 +23,8 @@ class CliConsentCommand extends AnonymousCommand {
     }
     async commandAction(logger, args) {
         let scope = '';
-        switch (args.options.service) {
-            case 'yammer':
-                await this.warn(logger, 'The yammer service is deprecated. Please use the VivaEngage service instead.');
-            case 'VivaEngage':
-                scope = 'https://api.yammer.com/user_impersonation';
-                break;
+        if (args.options.service === 'VivaEngage') {
+            scope = 'https://api.yammer.com/user_impersonation';
         }
         await logger.log(`To consent permissions for executing ${args.options.service} commands, navigate in your web browser to https://login.microsoftonline.com/${cli.getTenant()}/oauth2/v2.0/authorize?client_id=${cli.getClientId()}&response_type=code&scope=${encodeURIComponent(scope)}`);
     }
@@ -50,7 +46,7 @@ _CliConsentCommand_instances = new WeakSet(), _CliConsentCommand_initTelemetry =
     });
 }, _CliConsentCommand_initValidators = function _CliConsentCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.service !== 'VivaEngage' && args.options.service !== 'yammer') {
+        if (args.options.service !== 'VivaEngage') {
             return `${args.options.service} is not a valid value for the service option. Allowed values: VivaEngage`;
         }
         return true;

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/config/config-set.js

@@ -36,7 +36,6 @@ class CliConfigSetCommand extends AnonymousCommand {
             case settingsNames.printErrorsAsPlainText:
             case settingsNames.prompt:
             case settingsNames.showHelpOnFailure:
-            case settingsNames.showSpinner:
                 value = args.options.value === 'true';
                 break;
             default:

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/commands/setupPresets.js

@@ -4,8 +4,7 @@ export const interactivePreset = {
     output: 'text',
     printErrorsAsPlainText: true,
     prompt: true,
-    showHelpOnFailure: true,
-    showSpinner: true
+    showHelpOnFailure: true
 };
 export const scriptingPreset = {
     autoOpenLinksInBrowser: false,
@@ -13,8 +12,7 @@ export const scriptingPreset = {
     output: 'json',
     printErrorsAsPlainText: false,
     prompt: false,
-    showHelpOnFailure: false,
-    showSpinner: false
+    showHelpOnFailure: false
 };
 export const powerShellPreset = {
     errorOutput: 'stdout'

package/dist/m365/commands/status.js

@@ -30,8 +30,8 @@ class StatusCommand extends Command {
             const connections = await auth.getAllConnections();
             if (this.verbose) {
                 const message = connections.length > 0
-                    ? `Logged out from Microsoft 365, signed in connections available`
-                    : 'Logged out from Microsoft 365';
+                    ? `Logged out, signed in connections available`
+                    : 'Logged out';
                 await logger.logToStderr(message);
             }
             else {

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-add.js

@@ -30,12 +30,12 @@ class EntraEnterpriseAppAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraEnterpriseAppAddCommand_instances, "m", _EntraEnterpriseAppAddCommand_initOptionSets).call(this);
     }
     async getAppId(args) {
-        if (args.options.appId) {
-            return args.options.appId;
+        if (args.options.id) {
+            return args.options.id;
         }
         let spMatchQuery = '';
-        if (args.options.appName) {
-            spMatchQuery = `displayName eq '${formatting.encodeQueryParameter(args.options.appName)}'`;
+        if (args.options.displayName) {
+            spMatchQuery = `displayName eq '${formatting.encodeQueryParameter(args.options.displayName)}'`;
         }
         else if (args.options.objectId) {
             spMatchQuery = `id eq '${formatting.encodeQueryParameter(args.options.objectId)}'`;
@@ -54,7 +54,7 @@ class EntraEnterpriseAppAddCommand extends GraphCommand {
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('appId', response.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.appName}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.displayName}' found.`, resultAsKeyValuePair);
             return result.appId;
         }
         return spItem.appId;
@@ -85,31 +85,31 @@ class EntraEnterpriseAppAddCommand extends GraphCommand {
 _EntraEnterpriseAppAddCommand_instances = new WeakSet(), _EntraEnterpriseAppAddCommand_initTelemetry = function _EntraEnterpriseAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            appId: (!(!args.options.appId)).toString(),
-            appName: (!(!args.options.appName)).toString(),
+            id: (!(!args.options.id)).toString(),
+            displayName: (!(!args.options.displayName)).toString(),
             objectId: (!(!args.options.objectId)).toString()
         });
     });
 }, _EntraEnterpriseAppAddCommand_initOptions = function _EntraEnterpriseAppAddCommand_initOptions() {
     this.options.unshift({
-        option: '--appId [appId]'
+        option: '-i, --id [id]'
     }, {
-        option: '--appName [appName]'
+        option: '-n, --displayName [displayName]'
     }, {
         option: '--objectId [objectId]'
     });
 }, _EntraEnterpriseAppAddCommand_initValidators = function _EntraEnterpriseAppAddCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid appId GUID`;
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.objectId && !validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid objectId GUID`;
+            return `${args.options.objectId} is not a valid GUID`;
         }
         return true;
     });
 }, _EntraEnterpriseAppAddCommand_initOptionSets = function _EntraEnterpriseAppAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appName', 'objectId'] });
+    this.optionSets.push({ options: ['id', 'displayName', 'objectId'] });
 };
 export default new EntraEnterpriseAppAddCommand();
 //# sourceMappingURL=enterpriseapp-add.js.map

package/dist/m365/entra/commands/enterpriseapp/enterpriseapp-get.js

@@ -30,15 +30,15 @@ class EntraEnterpriseAppGetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initOptionSets).call(this);
     }
     async getSpId(args) {
-        if (args.options.appObjectId) {
-            return args.options.appObjectId;
+        if (args.options.objectId) {
+            return args.options.objectId;
         }
         let spMatchQuery = '';
-        if (args.options.appDisplayName) {
-            spMatchQuery = `displayName eq '${formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
+        if (args.options.displayName) {
+            spMatchQuery = `displayName eq '${formatting.encodeQueryParameter(args.options.displayName)}'`;
         }
-        else if (args.options.appId) {
-            spMatchQuery = `appId eq '${formatting.encodeQueryParameter(args.options.appId)}'`;
+        else if (args.options.id) {
+            spMatchQuery = `appId eq '${formatting.encodeQueryParameter(args.options.id)}'`;
         }
         const idRequestOptions = {
             url: `${this.resource}/v1.0/servicePrincipals?$filter=${spMatchQuery}`,
@@ -54,7 +54,7 @@ class EntraEnterpriseAppGetCommand extends GraphCommand {
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.appDisplayName}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.displayName}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return spItem.id;
@@ -85,31 +85,31 @@ class EntraEnterpriseAppGetCommand extends GraphCommand {
 _EntraEnterpriseAppGetCommand_instances = new WeakSet(), _EntraEnterpriseAppGetCommand_initTelemetry = function _EntraEnterpriseAppGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            appId: (!(!args.options.appId)).toString(),
-            appDisplayName: (!(!args.options.appDisplayName)).toString(),
-            appObjectId: (!(!args.options.appObjectId)).toString()
+            id: (!(!args.options.id)).toString(),
+            displayName: (!(!args.options.displayName)).toString(),
+            objectId: (!(!args.options.objectId)).toString()
         });
     });
 }, _EntraEnterpriseAppGetCommand_initOptions = function _EntraEnterpriseAppGetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --appId [appId]'
+        option: '-i, --id [id]'
     }, {
-        option: '-n, --appDisplayName [appDisplayName]'
+        option: '-n, --displayName [displayName]'
     }, {
-        option: '--appObjectId [appObjectId]'
+        option: '--objectId [objectId]'
     });
 }, _EntraEnterpriseAppGetCommand_initValidators = function _EntraEnterpriseAppGetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.appId && !validation.isValidGuid(args.options.appId)) {
-            return `${args.options.appId} is not a valid appId GUID`;
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
         }
-        if (args.options.appObjectId && !validation.isValidGuid(args.options.appObjectId)) {
-            return `${args.options.appObjectId} is not a valid objectId GUID`;
+        if (args.options.objectId && !validation.isValidGuid(args.options.objectId)) {
+            return `${args.options.objectId} is not a valid GUID`;
         }
         return true;
     });
 }, _EntraEnterpriseAppGetCommand_initOptionSets = function _EntraEnterpriseAppGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appDisplayName', 'appObjectId'] });
+    this.optionSets.push({ options: ['id', 'displayName', 'objectId'] });
 };
 export default new EntraEnterpriseAppGetCommand();
 //# sourceMappingURL=enterpriseapp-get.js.map

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

@@ -61,7 +61,7 @@ _EntraEnterpriseAppListCommand_instances = new WeakSet(), _EntraEnterpriseAppLis
     });
 }, _EntraEnterpriseAppListCommand_initOptions = function _EntraEnterpriseAppListCommand_initOptions() {
     this.options.unshift({
-        option: '--displayName [displayName]'
+        option: '-n, --displayName [displayName]'
     }, {
         option: '--tag [tag]'
     });

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 = [];
@@ -65,7 +65,7 @@ class EntraGroupUserListCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr('Retrieving Group Id...');
         }
-        return await entraGroup.getGroupIdByDisplayName(options.groupDisplayName);
+        return await entraGroup.getGroupIdByDisplayName(options.groupName);
     }
     async getUsers(options, role, groupId, logger) {
         const { properties, filter } = options;
@@ -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,21 +107,21 @@ 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',
-            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
             role: typeof args.options.role !== 'undefined',
             properties: typeof args.options.properties !== 'undefined',
             filter: typeof args.options.filter !== 'undefined'
         });
     });
-}, _EntraGroupUserListCommand_initOptions = function _EntraGroupUserListCommand_initOptions() {
+}, _EntraGroupMemberListCommand_initOptions = function _EntraGroupMemberListCommand_initOptions() {
     this.options.unshift({
         option: "-i, --groupId [groupId]"
     }, {
-        option: "-n, --groupDisplayName [groupDisplayName]"
+        option: "-n, --groupName [groupName]"
     }, {
         option: "-r, --role [role]",
         autocomplete: ["Owner", "Member"]
@@ -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', 'groupDisplayName']
+        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-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