@pnp/cli-microsoft365 10.0.0-beta.d126736 → 10.0.0-beta.da65889

package/dist/m365/commands/login.js

@@ -21,7 +21,8 @@ const options = globalOptionsZod
     appId: z.string().optional(),
     tenant: z.string().optional(),
     secret: zod.alias('s', z.string().optional()),
-    connectionName: z.string().optional()
+    connectionName: z.string().optional(),
+    ensure: z.boolean().optional()
 })
     .strict();
 class LoginCommand extends Command {
@@ -67,75 +68,16 @@ class LoginCommand extends Command {
         });
     }
     async commandAction(logger, args) {
-        // disconnect before re-connecting
         if (this.debug) {
             await logger.logToStderr(`Logging out from Microsoft 365...`);
         }
-        const deactivate = () => auth.connection.deactivate();
-        const getCertificate = (options) => {
-            // command args take precedence over settings
-            if (options.certificateFile) {
-                return fs.readFileSync(options.certificateFile).toString('base64');
-            }
-            if (options.certificateBase64Encoded) {
-                return options.certificateBase64Encoded;
-            }
-            return cli.getConfig().get(settingsNames.clientCertificateFile) ||
-                cli.getConfig().get(settingsNames.clientCertificateBase64Encoded);
-        };
-        const login = async () => {
-            if (this.verbose) {
-                await logger.logToStderr(`Signing in to Microsoft 365...`);
-            }
-            const authType = args.options.authType || cli.getSettingWithDefaultValue(settingsNames.authType, 'deviceCode');
-            auth.connection.appId = args.options.appId || cli.getClientId();
-            auth.connection.tenant = args.options.tenant || cli.getTenant();
-            auth.connection.name = args.options.connectionName;
-            switch (authType) {
-                case 'password':
-                    auth.connection.authType = AuthType.Password;
-                    auth.connection.userName = args.options.userName;
-                    auth.connection.password = args.options.password;
-                    break;
-                case 'certificate':
-                    auth.connection.authType = AuthType.Certificate;
-                    auth.connection.certificate = getCertificate(args.options);
-                    auth.connection.thumbprint = args.options.thumbprint;
-                    auth.connection.password = args.options.password ?? cli.getConfig().get(settingsNames.clientCertificatePassword);
-                    break;
-                case 'identity':
-                    auth.connection.authType = AuthType.Identity;
-                    auth.connection.userName = args.options.userName;
-                    break;
-                case 'browser':
-                    auth.connection.authType = AuthType.Browser;
-                    break;
-                case 'secret':
-                    auth.connection.authType = AuthType.Secret;
-                    auth.connection.secret = args.options.secret || cli.getConfig().get(settingsNames.clientSecret);
-                    break;
-            }
-            auth.connection.cloudType = args.options.cloud;
-            try {
-                await auth.ensureAccessToken(auth.defaultResource, logger, this.debug);
-                auth.connection.active = true;
-            }
-            catch (error) {
-                if (this.debug) {
-                    await logger.logToStderr('Error:');
-                    await logger.logToStderr(error);
-                    await logger.logToStderr('');
-                }
-                throw new CommandError(error.message);
-            }
-            const details = auth.getConnectionDetails(auth.connection);
-            if (this.debug) {
-                details.accessToken = JSON.stringify(auth.connection.accessTokens, null, 2);
-            }
-            await logger.log(details);
-        };
-        deactivate();
-        await login();
+        if (this.shouldLogin(args.options)) {
+            auth.connection.deactivate();
+            await this.login(logger, args);
+        }
+        else {
+            await this.ensureAccessToken(logger);
+        }
     }
     async action(logger, args) {
         try {
@@ -147,6 +89,117 @@ class LoginCommand extends Command {
         await this.initAction(args, logger);
         await this.commandAction(logger, args);
     }
+    shouldLogin(options) {
+        if (!auth.connection.active) {
+            return true;
+        }
+        if (!options.ensure) {
+            return true;
+        }
+        const authType = options.authType || cli.getSettingWithDefaultValue(settingsNames.authType, 'deviceCode');
+        if (authType !== auth.connection.authType) {
+            return true;
+        }
+        if (options.cloud !== auth.connection.cloudType) {
+            return true;
+        }
+        if (options.appId && options.appId !== auth.connection.appId) {
+            return true;
+        }
+        if (options.tenant && options.tenant !== auth.connection.tenant) {
+            return true;
+        }
+        if (authType === AuthType.Password && (options.password && options.userName !== auth.connection.userName)) {
+            return true;
+        }
+        if (authType === AuthType.Certificate && (options.certificateFile && (auth.connection.certificate !== fs.readFileSync(options.certificateFile, 'base64')))) {
+            return true;
+        }
+        if (authType === AuthType.Identity && (options.userName && options.userName !== auth.connection.userName)) {
+            return true;
+        }
+        if (authType === AuthType.Secret && (options.secret && options.secret !== auth.connection.secret)) {
+            return true;
+        }
+        const now = new Date();
+        const accessToken = auth.connection.accessTokens[auth.defaultResource];
+        const expiresOn = accessToken && accessToken.expiresOn ?
+            // if expiresOn is serialized from the service file, it's set as a string
+            // if it's coming from MSAL, it's a Date
+            typeof accessToken.expiresOn === 'string' ? new Date(accessToken.expiresOn) : accessToken.expiresOn
+            : new Date(0);
+        if (expiresOn < now) {
+            return true;
+        }
+        return false;
+    }
+    async ensureAccessToken(logger) {
+        try {
+            await auth.ensureAccessToken(auth.defaultResource, logger, this.debug);
+            auth.connection.active = true;
+        }
+        catch (error) {
+            if (this.debug) {
+                await logger.logToStderr('Error:');
+                await logger.logToStderr(error);
+                await logger.logToStderr('');
+            }
+            throw new CommandError(error.message);
+        }
+    }
+    getCertificate(options) {
+        // command args take precedence over settings
+        if (options.certificateFile) {
+            return fs.readFileSync(options.certificateFile).toString('base64');
+        }
+        if (options.certificateBase64Encoded) {
+            return options.certificateBase64Encoded;
+        }
+        return cli.getConfig().get(settingsNames.clientCertificateFile) ||
+            cli.getConfig().get(settingsNames.clientCertificateBase64Encoded);
+    }
+    ;
+    async login(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr(`Signing in to Microsoft 365...`);
+        }
+        const authType = args.options.authType || cli.getSettingWithDefaultValue(settingsNames.authType, 'deviceCode');
+        auth.connection.appId = args.options.appId || cli.getClientId();
+        auth.connection.tenant = args.options.tenant || cli.getTenant();
+        auth.connection.name = args.options.connectionName;
+        switch (authType) {
+            case 'password':
+                auth.connection.authType = AuthType.Password;
+                auth.connection.userName = args.options.userName;
+                auth.connection.password = args.options.password;
+                break;
+            case 'certificate':
+                auth.connection.authType = AuthType.Certificate;
+                auth.connection.certificate = this.getCertificate(args.options);
+                auth.connection.thumbprint = args.options.thumbprint;
+                auth.connection.password = args.options.password ?? cli.getConfig().get(settingsNames.clientCertificatePassword);
+                break;
+            case 'identity':
+                auth.connection.authType = AuthType.Identity;
+                auth.connection.userName = args.options.userName;
+                break;
+            case 'browser':
+                auth.connection.authType = AuthType.Browser;
+                break;
+            case 'secret':
+                auth.connection.authType = AuthType.Secret;
+                auth.connection.secret = args.options.secret || cli.getConfig().get(settingsNames.clientSecret);
+                break;
+        }
+        auth.connection.cloudType = args.options.cloud;
+        await this.ensureAccessToken(logger);
+        const details = auth.getConnectionDetails(auth.connection);
+        if (this.debug) {
+            details.accessToken = JSON.stringify(auth.connection.accessTokens, null, 2);
+        }
+        await logger.log(details);
+    }
+    ;
 }
 export default new LoginCommand();
 //# sourceMappingURL=login.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.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`,

package/docs/docs/cmd/entra/group/group-member-add.mdx

@@ -0,0 +1,62 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# entra group member add
+
+Adds a member to a Microsoft Entra ID group
+
+## Usage
+
+```sh
+m365 entra group member add [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --groupId [groupId]`
+: The ID of the Microsoft Entra group. Specify `groupId` or `groupDisplayName` but not both.
+
+`-n, --groupDisplayName [groupDisplayName]`
+: The display name of the Microsoft Entra group. Specify `groupId` or `groupDisplayName` but not both.
+
+`--ids [ids]`
+: Microsoft Entra IDs of users. You can also pass a comma-separated list of IDs. Specify either `ids` or `userNames` but not both.
+
+`--userNames [userNames]`
+: The user principal names of users. You can also pass a comma-separated list of UPNs. Specify either `ids` or `userNames` but not both.
+
+`-r, --role <role>`
+: The role to be assigned to the new users. Valid values: `Owner`, `Member`.
+```
+
+<Global />
+
+## Examples
+
+Add a single member specified by ID as a member to a group specified by display name.
+
+```sh
+m365 entra group member add --groupDisplayName Developers --ids 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
+```
+
+Add multiple members specified by ID as members to a group specified by ID.
+
+```sh
+m365 entra group member add --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --ids "098b9f52-f48c-4401-819f-29c33794c3f5,f1e06e31-3abf-4746-83c2-1513d71f38b8" --role Member
+```
+
+Add a single member specified by UPN as an owner to a group specified by display name.
+
+```sh
+m365 entra group member add --groupDisplayName Developers --userNames john.doe@contoso.com --role Owner
+```
+
+Adds multiple members specified by UPN as owners to a group specified by ID.
+
+```sh
+m365 entra group member add --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --userNames "john.doe@contoso.com,adele.vance@contoso.com" --role Owner
+```
+
+## Response
+
+The command won't return a response on success.

package/docs/docs/cmd/entra/group/{group-user-list.mdx → group-member-list.mdx}

@@ -2,14 +2,14 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# entra group user list
+# entra group member list
 
-Lists users of a specific Entra group
+Lists members of a specific Entra group
 
 ## Usage
 
 ```sh
-m365 entra group user list [options]
+m365 entra group member list [options]
 ```
 
 ## Alias
@@ -28,13 +28,13 @@ m365 aad group user list [options]
 : The display name of the Entra group. Specify `groupId` or `groupName` but not both.
 
 `-r, --role [role]`
-: Filter the results to only users with the given role: `Owner`, `Member`.
+: Filter the results to only members with the given role: `Owner`, `Member`.
 
 `-p, --properties [properties]`
 : Comma-separated list of properties to retrieve.
 
 `-f, --filter [filter]`
-: OData filter to use to query the list of users with.
+: OData filter to use to query the list of members with.
 ```
 
 <Global />
@@ -45,34 +45,34 @@ When the `properties` option includes values with a `/`, for example: `manager/d
 
 ## Examples
 
-List all group users from a group specified by ID.
+List all group members from a group specified by ID.
 
 ```sh
-m365 entra group user list --groupId 03cba9da-3974-46c1-afaf-79caa2e45bbe
+m365 entra group member list --groupId 03cba9da-3974-46c1-afaf-79caa2e45bbe
 ```
 
 List all owners from a group specified by display name.
 
 ```sh
-m365 entra group user list --groupName Developers --role Owner
+m365 entra group member list --groupName Developers --role Owner
 ```
 
-List all group users from a group specified by name. For each one return the display name, e-mail address, and manager display name.
+List all group members from a group specified by name. For each one return the display name, e-mail address, and manager display name.
 
 ```sh
-m365 entra group user list --groupName Developers --properties "displayName,mail,manager/displayName"
+m365 entra group member list --groupName Developers --properties "displayName,mail,manager/displayName"
 ```
 
-List all group users from a group specified by name. For each one return the display name, e-mail address, and manager information.
+List all group members from a group specified by name. For each one return the display name, e-mail address, and manager information.
 
 ```sh
-m365 entra group user list --groupName Developers --properties "displayName,mail,manager/*"
+m365 entra group member list --groupName Developers --properties "displayName,mail,manager/*"
 ```
 
-List all group members that are guest users.
+List all group members that are guest members.
 
 ```sh
-m365 entra group user list --groupName Developers --filter "userType eq 'Guest'"
+m365 entra group member list --groupName Developers --filter "userType eq 'Guest'"
 ```
 
 ## Response