@pnp/cli-microsoft365 7.4.0 → 7.5.0-beta.0ae7da4

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

@@ -0,0 +1,145 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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;
+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 {
+    get name() {
+        return commands.GROUP_USER_ADD;
+    }
+    get description() {
+        return 'Adds a user to a Microsoft Entra ID group';
+    }
+    constructor() {
+        super();
+        _EntraGroupUserAddCommand_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);
+    }
+    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}...`);
+            }
+            const groupId = await this.getGroupId(logger, args.options);
+            const userIds = await this.getUserIds(logger, args.options);
+            for (let i = 0; i < userIds.length; i += 400) {
+                const userIdsBatch = userIds.slice(i, i + 400);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/$batch`,
+                    headers: {
+                        'content-type': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        requests: []
+                    }
+                };
+                for (let j = 0; j < userIdsBatch.length; j += 20) {
+                    const userIdsChunk = userIdsBatch.slice(j, j + 20);
+                    requestOptions.data.requests.push({
+                        id: j + 1,
+                        method: 'PATCH',
+                        url: `/groups/${groupId}`,
+                        headers: {
+                            'content-type': 'application/json;odata.metadata=none'
+                        },
+                        body: {
+                            [`${args.options.role === 'Member' ? 'members' : 'owners'}@odata.bind`]: userIdsChunk.map(u => `${this.resource}/v1.0/directoryObjects/${u}`)
+                        }
+                    });
+                }
+                const res = await request.post(requestOptions);
+                for (const response of res.responses) {
+                    if (response.status !== 204) {
+                        throw response.body;
+                    }
+                }
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getGroupId(logger, options) {
+        if (options.groupId) {
+            return options.groupId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving ID of group ${options.groupDisplayName}...`);
+        }
+        return entraGroup.getGroupIdByDisplayName(options.groupDisplayName);
+    }
+    async getUserIds(logger, options) {
+        if (options.ids) {
+            return options.ids.split(',').map(i => i.trim());
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving ID(s) of user(s)...');
+        }
+        return entraUser.getUserIdsByUpns(options.userNames.split(',').map(u => u.trim()));
+    }
+}
+_EntraGroupUserAddCommand_instances = new WeakSet(), _EntraGroupUserAddCommand_initTelemetry = function _EntraGroupUserAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            ids: typeof args.options.ids !== 'undefined',
+            userNames: typeof args.options.userNames !== 'undefined'
+        });
+    });
+}, _EntraGroupUserAddCommand_initOptions = function _EntraGroupUserAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --groupId [groupId]'
+    }, {
+        option: '-n, --groupDisplayName [groupDisplayName]'
+    }, {
+        option: '--ids [ids]'
+    }, {
+        option: '--userNames [userNames]'
+    }, {
+        option: '-r, --role <role>',
+        autocomplete: this.roleValues
+    });
+}, _EntraGroupUserAddCommand_initValidators = function _EntraGroupUserAddCommand_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.`;
+        }
+        if (args.options.ids) {
+            const ids = args.options.ids.split(',').map(i => i.trim());
+            if (!validation.isValidGuidArray(ids)) {
+                const invalidGuid = ids.find(id => !validation.isValidGuid(id));
+                return `'${invalidGuid}' is not a valid GUID for option 'ids'.`;
+            }
+        }
+        if (args.options.userNames) {
+            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(args.options.userNames.split(',').map(u => u.trim()));
+            if (isValidUserPrincipalNameArray !== true) {
+                return `User principal name '${isValidUserPrincipalNameArray}' is invalid for option 'userNames'.`;
+            }
+        }
+        if (this.roleValues.indexOf(args.options.role) === -1) {
+            return `Option 'role' must be one of the following values: ${this.roleValues.join(', ')}.`;
+        }
+        return true;
+    });
+}, _EntraGroupUserAddCommand_initOptionSets = function _EntraGroupUserAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['groupId', 'groupDisplayName'] }, { options: ['ids', 'userNames'] });
+}, _EntraGroupUserAddCommand_initTypes = function _EntraGroupUserAddCommand_initTypes() {
+    this.types.string.push('groupId', 'groupDisplayName', 'ids', 'userNames', 'role');
+};
+export default new EntraGroupUserAddCommand();
+//# sourceMappingURL=group-user-add.js.map

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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;
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -64,7 +64,7 @@ class EntraGroupUserListCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr('Retrieving Group Id...');
         }
-        return await aadGroup.getGroupIdByDisplayName(options.groupDisplayName);
+        return await entraGroup.getGroupIdByDisplayName(options.groupDisplayName);
     }
     async getUsers(options, role, groupId, logger) {
         const { properties, filter } = options;

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

@@ -8,7 +8,7 @@ import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import aadCommands from '../../aadCommands.js';
 class EntraM365GroupConversationListCommand extends GraphCommand {
     get name() {
@@ -31,7 +31,7 @@ class EntraM365GroupConversationListCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.groupId);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.groupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${args.options.groupId}' is not a Microsoft 365 group.`);
             }

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

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _EntraM365GroupConversationPostListCommand_instances, _EntraM365GroupConversationPostListCommand_initTelemetry, _EntraM365GroupConversationPostListCommand_initOptions, _EntraM365GroupConversationPostListCommand_initValidators, _EntraM365GroupConversationPostListCommand_initOptionSets;
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
@@ -35,7 +35,7 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const retrievedgroupId = await this.getGroupId(args);
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(retrievedgroupId);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(retrievedgroupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${retrievedgroupId}' is not a Microsoft 365 group.`);
             }
@@ -50,7 +50,7 @@ class EntraM365GroupConversationPostListCommand extends GraphCommand {
         if (args.options.groupId) {
             return formatting.encodeQueryParameter(args.options.groupId);
         }
-        const group = await aadGroup.getGroupByDisplayName(args.options.groupDisplayName);
+        const group = await entraGroup.getGroupByDisplayName(args.options.groupDisplayName);
         return group.id;
     }
 }

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _EntraM365GroupGetCommand_instances, _EntraM365GroupGetCommand_initOptions, _EntraM365GroupGetCommand_initValidators;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import aadCommands from '../../aadCommands.js';
@@ -29,11 +29,11 @@ class EntraM365GroupGetCommand extends GraphCommand {
     async commandAction(logger, args) {
         let group;
         try {
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
             }
-            group = await aadGroup.getGroupById(args.options.id);
+            group = await entraGroup.getGroupById(args.options.id);
             if (args.options.includeSiteUrl) {
                 const requestOptions = {
                     url: `${this.resource}/v1.0/groups/${group.id}/drive?$select=webUrl`,

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

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraM365GroupRemoveCommand_instances, _EntraM365GroupRemoveCommand_initTelemetry, _EntraM365GroupRemoveCommand_initOptions, _EntraM365GroupRemoveCommand_initValidators;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -39,7 +39,7 @@ class EntraM365GroupRemoveCommand extends GraphCommand {
                 await logger.logToStderr(`Removing Microsoft 365 Group: ${args.options.id}...`);
             }
             try {
-                const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+                const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
                 if (!isUnifiedGroup) {
                     throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
                 }

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _EntraM365GroupRenewCommand_instances, _EntraM365GroupRenewCommand_initOptions, _EntraM365GroupRenewCommand_initValidators;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import aadCommands from '../../aadCommands.js';
@@ -31,7 +31,7 @@ class EntraM365GroupRenewCommand extends GraphCommand {
             await logger.logToStderr(`Renewing Microsoft 365 group's expiration: ${args.options.id}...`);
         }
         try {
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
             }

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

@@ -11,7 +11,7 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import aadCommands from '../../aadCommands.js';
 class EntraM365GroupSetCommand extends GraphCommand {
     get name() {
@@ -34,7 +34,7 @@ class EntraM365GroupSetCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         try {
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.id);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(args.options.id);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
             }

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

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraM365GroupTeamifyCommand_instances, _EntraM365GroupTeamifyCommand_initTelemetry, _EntraM365GroupTeamifyCommand_initOptions, _EntraM365GroupTeamifyCommand_initValidators, _EntraM365GroupTeamifyCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -56,7 +56,7 @@ class EntraM365GroupTeamifyCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const groupId = await this.getGroupId(args.options);
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
             }

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _EntraM365GroupUserAddCommand_instances, _EntraM365GroupUserAddCommand_initTelemetry, _EntraM365GroupUserAddCommand_initOptions, _EntraM365GroupUserAddCommand_initValidators, _EntraM365GroupUserAddCommand_initOptionSets;
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -33,7 +33,7 @@ class EntraM365GroupUserAddCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const providedGroupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(providedGroupId);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(providedGroupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${providedGroupId}' is not a Microsoft 365 group.`);
             }

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

@@ -8,7 +8,7 @@ import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import aadCommands from '../../aadCommands.js';
 class EntraM365GroupUserListCommand extends GraphCommand {
     get name() {
@@ -34,7 +34,7 @@ class EntraM365GroupUserListCommand extends GraphCommand {
                 this.warn(logger, `Value 'Guest' for the option role is deprecated. Use --filter "userType eq 'Guest'" instead.`);
             }
             const groupId = await this.getGroupId(args.options, logger);
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group '${args.options.groupId || args.options.groupDisplayName}' is not a Microsoft 365 group.`);
             }
@@ -71,7 +71,7 @@ class EntraM365GroupUserListCommand extends GraphCommand {
         if (this.verbose) {
             await logger.logToStderr('Retrieving Group Id...');
         }
-        return await aadGroup.getGroupIdByDisplayName(options.groupDisplayName);
+        return await entraGroup.getGroupIdByDisplayName(options.groupDisplayName);
     }
     async getUsers(options, role, groupId, logger) {
         const { properties, filter } = options;

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

@@ -6,7 +6,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraM365GroupUserRemoveCommand_instances, _EntraM365GroupUserRemoveCommand_initTelemetry, _EntraM365GroupUserRemoveCommand_initOptions, _EntraM365GroupUserRemoveCommand_initValidators, _EntraM365GroupUserRemoveCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -35,7 +35,7 @@ class EntraM365GroupUserRemoveCommand extends GraphCommand {
         const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
         const removeUser = async () => {
             try {
-                const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+                const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
                 if (!isUnifiedGroup) {
                     throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
                 }

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

@@ -10,7 +10,7 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import teamsCommands from '../../../teams/commands.js';
 import commands from '../../commands.js';
-import { aadGroup } from '../../../../utils/aadGroup.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
 import aadCommands from '../../aadCommands.js';
 class EntraM365GroupUserSetCommand extends GraphCommand {
     get name() {
@@ -33,7 +33,7 @@ class EntraM365GroupUserSetCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
+            const isUnifiedGroup = await entraGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
                 throw Error(`Specified group with id '${groupId}' is not a Microsoft 365 group.`);
             }

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

@@ -5,12 +5,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _EntraUserGetCommand_instances, _EntraUserGetCommand_initTelemetry, _EntraUserGetCommand_initOptions, _EntraUserGetCommand_initValidators, _EntraUserGetCommand_initOptionSets;
 import request from '../../../../request.js';
-import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import { cli } from '../../../../cli/cli.js';
 import aadCommands from '../../aadCommands.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { formatting } from '../../../../utils/formatting.js';
 class EntraUserGetCommand extends GraphCommand {
     get name() {
         return commands.USER_GET;
@@ -30,50 +30,50 @@ class EntraUserGetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserGetCommand_instances, "m", _EntraUserGetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const properties = args.options.properties ?
-            `&$select=${args.options.properties.split(',').map(p => formatting.encodeQueryParameter(p.trim())).join(',')}` :
-            '';
-        let requestUrl = `${this.resource}/v1.0/users`;
-        if (args.options.id) {
-            requestUrl += `?$filter=id eq '${formatting.encodeQueryParameter(args.options.id)}'${properties}`;
-        }
-        else if (args.options.userName) {
-            requestUrl += `?$filter=userPrincipalName eq '${formatting.encodeQueryParameter(args.options.userName)}'${properties}`;
-        }
-        else if (args.options.email) {
-            requestUrl += `?$filter=mail eq '${formatting.encodeQueryParameter(args.options.email)}'${properties}`;
-        }
-        if (args.options.withManager) {
-            requestUrl += '&$expand=manager($select=displayName,userPrincipalName,id,mail)';
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
         try {
-            const res = await request.get(requestOptions);
-            const identifier = args.options.id ? `id ${args.options.id}`
-                : args.options.userName ? `user name ${args.options.userName}`
-                    : `email ${args.options.email}`;
-            if (res.value.length === 0) {
-                throw `The specified user with ${identifier} does not exist`;
+            let userIdOrPrincipalName = args.options.id;
+            if (args.options.userName) {
+                // single user can be retrieved also by user principal name
+                userIdOrPrincipalName = formatting.encodeQueryParameter(args.options.userName);
             }
-            if (res.value.length > 1) {
-                const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', res.value);
-                const result = await cli.handleMultipleResultsFound(`Multiple users with ${identifier} found.`, resultAsKeyValuePair);
-                await logger.log(result);
-            }
-            else {
-                await logger.log(res.value[0]);
+            else if (args.options.email) {
+                userIdOrPrincipalName = await entraUser.getUserIdByEmail(args.options.email);
             }
+            const requestUrl = this.getRequestUrl(userIdOrPrincipalName, args.options);
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const user = await request.get(requestOptions);
+            await logger.log(user);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    getRequestUrl(userIdOrPrincipalName, options) {
+        const queryParameters = [];
+        if (options.properties) {
+            const allProperties = options.properties.split(',');
+            const selectProperties = allProperties.filter(prop => !prop.includes('/'));
+            if (selectProperties.length > 0) {
+                queryParameters.push(`$select=${selectProperties}`);
+            }
+        }
+        if (options.withManager) {
+            queryParameters.push('$expand=manager($select=displayName,userPrincipalName,id,mail)');
+        }
+        const queryString = queryParameters.length > 0
+            ? `?${queryParameters.join('&')}`
+            : '';
+        // user principal name can start with $ but it violates the OData URL convention, so it must be enclosed in parenthesis and single quotes
+        return userIdOrPrincipalName.startsWith('%24')
+            ? `${this.resource}/v1.0/users('${userIdOrPrincipalName}')${queryString}`
+            : `${this.resource}/v1.0/users/${userIdOrPrincipalName}${queryString}`;
+    }
 }
 _EntraUserGetCommand_instances = new WeakSet(), _EntraUserGetCommand_initTelemetry = function _EntraUserGetCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/entra/commands.js

@@ -14,15 +14,18 @@ export default {
     APP_REMOVE: `${prefix} app remove`,
     APP_SET: `${prefix} app set`,
     APP_PERMISSION_ADD: `${prefix} app permission add`,
+    APP_PERMISSION_LIST: `${prefix} app permission list`,
     APP_ROLE_ADD: `${prefix} app role add`,
     APP_ROLE_LIST: `${prefix} app role list`,
     APP_ROLE_REMOVE: `${prefix} app role remove`,
     APPROLEASSIGNMENT_ADD: `${prefix} approleassignment add`,
     APPROLEASSIGNMENT_LIST: `${prefix} approleassignment list`,
     APPROLEASSIGNMENT_REMOVE: `${prefix} approleassignment remove`,
+    GROUP_ADD: `${prefix} group add`,
     GROUP_GET: `${prefix} group get`,
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
+    GROUP_USER_ADD: `${prefix} group user add`,
     GROUP_USER_LIST: `${prefix} group user list`,
     GROUPSETTING_ADD: `${prefix} groupsetting add`,
     GROUPSETTING_GET: `${prefix} groupsetting get`,

package/dist/m365/external/commands/connection/connection-doctor.js

@@ -228,7 +228,8 @@ class ExternalConnectionDoctorCommand extends GraphCommand {
         const requestOptions = {
             url: `${this.resource}/v1.0/external/connections/${args.options.id}/schema`,
             headers: {
-                accept: 'application/json;odata.metadata=none'
+                accept: 'application/json;odata.metadata=none',
+                prefer: 'include-unknown-enum-members'
             },
             responseType: 'json'
         };