@pnp/cli-microsoft365 7.5.0-beta.23612bc → 7.5.0-beta.940b241

package/dist/m365/entra/commands/{sp/sp-get.js → enterpriseapp/enterpriseapp-get.js}

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _EntraSpGetCommand_instances, _EntraSpGetCommand_initTelemetry, _EntraSpGetCommand_initOptions, _EntraSpGetCommand_initValidators, _EntraSpGetCommand_initOptionSets;
+var _EntraEnterpriseAppGetCommand_instances, _EntraEnterpriseAppGetCommand_initTelemetry, _EntraEnterpriseAppGetCommand_initOptions, _EntraEnterpriseAppGetCommand_initValidators, _EntraEnterpriseAppGetCommand_initOptionSets;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -11,23 +11,23 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
-class EntraSpGetCommand extends GraphCommand {
+class EntraEnterpriseAppGetCommand extends GraphCommand {
     get name() {
-        return commands.SP_GET;
+        return commands.ENTERPRISEAPP_GET;
     }
     get description() {
-        return 'Gets information about the specific service principal';
+        return 'Gets information about an Enterprise Application';
     }
     alias() {
-        return [aadCommands.SP_GET];
+        return [aadCommands.SP_GET, commands.SP_GET];
     }
     constructor() {
         super();
-        _EntraSpGetCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraSpGetCommand_instances, "m", _EntraSpGetCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraSpGetCommand_instances, "m", _EntraSpGetCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _EntraSpGetCommand_instances, "m", _EntraSpGetCommand_initValidators).call(this);
-        __classPrivateFieldGet(this, _EntraSpGetCommand_instances, "m", _EntraSpGetCommand_initOptionSets).call(this);
+        _EntraEnterpriseAppGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppGetCommand_instances, "m", _EntraEnterpriseAppGetCommand_initOptionSets).call(this);
     }
     async getSpId(args) {
         if (args.options.appObjectId) {
@@ -50,18 +50,18 @@ class EntraSpGetCommand extends GraphCommand {
         const response = await request.get(idRequestOptions);
         const spItem = response.value[0];
         if (!spItem) {
-            throw `The specified Azure AD app does not exist`;
+            throw `The specified Entra app does not exist`;
         }
         if (response.value.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-            const result = await cli.handleMultipleResultsFound(`Multiple Azure AD apps with name '${args.options.appDisplayName}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple Entra apps with name '${args.options.appDisplayName}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return spItem.id;
     }
     async commandAction(logger, args) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving service principal information...`);
+            await logger.logToStderr(`Retrieving enterprise application information...`);
         }
         try {
             const id = await this.getSpId(args);
@@ -81,7 +81,7 @@ class EntraSpGetCommand extends GraphCommand {
         }
     }
 }
-_EntraSpGetCommand_instances = new WeakSet(), _EntraSpGetCommand_initTelemetry = function _EntraSpGetCommand_initTelemetry() {
+_EntraEnterpriseAppGetCommand_instances = new WeakSet(), _EntraEnterpriseAppGetCommand_initTelemetry = function _EntraEnterpriseAppGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: (!(!args.options.appId)).toString(),
@@ -89,7 +89,7 @@ _EntraSpGetCommand_instances = new WeakSet(), _EntraSpGetCommand_initTelemetry =
             appObjectId: (!(!args.options.appObjectId)).toString()
         });
     });
-}, _EntraSpGetCommand_initOptions = function _EntraSpGetCommand_initOptions() {
+}, _EntraEnterpriseAppGetCommand_initOptions = function _EntraEnterpriseAppGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --appId [appId]'
     }, {
@@ -97,7 +97,7 @@ _EntraSpGetCommand_instances = new WeakSet(), _EntraSpGetCommand_initTelemetry =
     }, {
         option: '--appObjectId [appObjectId]'
     });
-}, _EntraSpGetCommand_initValidators = function _EntraSpGetCommand_initValidators() {
+}, _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`;
@@ -107,8 +107,8 @@ _EntraSpGetCommand_instances = new WeakSet(), _EntraSpGetCommand_initTelemetry =
         }
         return true;
     });
-}, _EntraSpGetCommand_initOptionSets = function _EntraSpGetCommand_initOptionSets() {
+}, _EntraEnterpriseAppGetCommand_initOptionSets = function _EntraEnterpriseAppGetCommand_initOptionSets() {
     this.optionSets.push({ options: ['appId', 'appDisplayName', 'appObjectId'] });
 };
-export default new EntraSpGetCommand();
-//# sourceMappingURL=sp-get.js.map
+export default new EntraEnterpriseAppGetCommand();
+//# sourceMappingURL=enterpriseapp-get.js.map

package/dist/m365/entra/commands/{sp/sp-list.js → enterpriseapp/enterpriseapp-list.js}

@@ -3,33 +3,33 @@ 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 _EntraSpListCommand_instances, _EntraSpListCommand_initTelemetry, _EntraSpListCommand_initOptions;
+var _EntraEnterpriseAppListCommand_instances, _EntraEnterpriseAppListCommand_initTelemetry, _EntraEnterpriseAppListCommand_initOptions;
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
-class EntraSpListCommand extends GraphCommand {
+class EntraEnterpriseAppListCommand extends GraphCommand {
     get name() {
-        return commands.SP_LIST;
+        return commands.ENTERPRISEAPP_LIST;
     }
     defaultProperties() {
         return ['appId', 'displayName', 'tag'];
     }
     get description() {
-        return 'Lists the service principals in the directory';
+        return 'Lists the enterprise applications (or service principals) in Entra ID';
     }
     alias() {
-        return [aadCommands.SP_LIST];
+        return [aadCommands.SP_LIST, commands.SP_LIST];
     }
     constructor() {
         super();
-        _EntraSpListCommand_instances.add(this);
-        __classPrivateFieldGet(this, _EntraSpListCommand_instances, "m", _EntraSpListCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _EntraSpListCommand_instances, "m", _EntraSpListCommand_initOptions).call(this);
+        _EntraEnterpriseAppListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppListCommand_instances, "m", _EntraEnterpriseAppListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraEnterpriseAppListCommand_instances, "m", _EntraEnterpriseAppListCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving service principal information...`);
+            await logger.logToStderr(`Retrieving enterprise application information...`);
         }
         try {
             let requestUrl = `${this.resource}/v1.0/servicePrincipals`;
@@ -51,19 +51,19 @@ class EntraSpListCommand extends GraphCommand {
         }
     }
 }
-_EntraSpListCommand_instances = new WeakSet(), _EntraSpListCommand_initTelemetry = function _EntraSpListCommand_initTelemetry() {
+_EntraEnterpriseAppListCommand_instances = new WeakSet(), _EntraEnterpriseAppListCommand_initTelemetry = function _EntraEnterpriseAppListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             displayName: typeof args.options.displayName !== 'undefined',
             tag: typeof args.options.tag !== 'undefined'
         });
     });
-}, _EntraSpListCommand_initOptions = function _EntraSpListCommand_initOptions() {
+}, _EntraEnterpriseAppListCommand_initOptions = function _EntraEnterpriseAppListCommand_initOptions() {
     this.options.unshift({
         option: '--displayName [displayName]'
     }, {
         option: '--tag [tag]'
     });
 };
-export default new EntraSpListCommand();
-//# sourceMappingURL=sp-list.js.map
+export default new EntraEnterpriseAppListCommand();
+//# sourceMappingURL=enterpriseapp-list.js.map

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

@@ -0,0 +1,224 @@
+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 _EntraGroupAddCommand_instances, _EntraGroupAddCommand_initOptions, _EntraGroupAddCommand_initValidators, _EntraGroupAddCommand_initTelemetry;
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import aadCommands from '../../aadCommands.js';
+import { validation } from '../../../../utils/validation.js';
+import request from '../../../../request.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+class EntraGroupAddCommand extends GraphCommand {
+    get name() {
+        return commands.GROUP_ADD;
+    }
+    get description() {
+        return 'Creates a Microsoft Entra group';
+    }
+    alias() {
+        return [aadCommands.GROUP_ADD];
+    }
+    allowUnknownOptions() {
+        return true;
+    }
+    constructor() {
+        super();
+        _EntraGroupAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraGroupAddCommand_instances, "m", _EntraGroupAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraGroupAddCommand_instances, "m", _EntraGroupAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraGroupAddCommand_instances, "m", _EntraGroupAddCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        let group;
+        let ownerIds = [];
+        let memberIds = [];
+        try {
+            const manifest = this.createRequestBody(args.options);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/groups`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: manifest
+            };
+            ownerIds = await this.getUserIds(logger, args.options.ownerIds, args.options.ownerUserNames);
+            memberIds = await this.getUserIds(logger, args.options.memberIds, args.options.memberUserNames);
+            group = await request.post(requestOptions);
+            if (ownerIds.length !== 0) {
+                await this.addUsers(group.id, 'owners', ownerIds);
+            }
+            if (memberIds.length !== 0) {
+                await this.addUsers(group.id, 'members', memberIds);
+            }
+            await logger.log(group);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    ;
+    createRequestBody(options) {
+        const requestBody = {
+            displayName: options.displayName,
+            description: options.description,
+            mailNickName: options.mailNickname ?? this.generateMailNickname(),
+            visibility: options.visibility ?? 'Public',
+            groupTypes: options.type === 'microsoft365' ? ['Unified'] : [],
+            mailEnabled: options.type === 'security' ? false : true,
+            securityEnabled: true
+        };
+        this.addUnknownOptionsToPayload(requestBody, options);
+        return requestBody;
+    }
+    generateMailNickname() {
+        return `Group${Math.floor(Math.random() * 1000000)}`;
+    }
+    async getUserIds(logger, userIds, userNames) {
+        if (userIds) {
+            return userIds.split(',').map(o => o.trim());
+        }
+        if (!userNames) {
+            if (this.verbose) {
+                await logger.logToStderr('No users to validate, skipping.');
+            }
+            return [];
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving user information.');
+        }
+        const userArr = userNames.split(',').map(o => o.trim());
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving ID(s) of user(s)...');
+        }
+        return entraUser.getUserIdsByUpns(userArr);
+    }
+    async addUsers(groupId, role, userIds) {
+        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: []
+                }
+            };
+            // only 20 requests per one batch are allowed
+            for (let j = 0; j < userIdsBatch.length; j += 20) {
+                // only 20 users can be added in one request
+                const userIdsChunk = userIdsBatch.slice(j, j + 20);
+                requestOptions.data.requests.push({
+                    id: j + 1,
+                    method: 'PATCH',
+                    url: `/groups/${groupId}`,
+                    headers: {
+                        'content-type': 'application/json;odata.metadata=none'
+                    },
+                    body: {
+                        [`${role}@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;
+                }
+            }
+        }
+    }
+}
+_EntraGroupAddCommand_instances = new WeakSet(), _EntraGroupAddCommand_initOptions = function _EntraGroupAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --displayName <displayName>'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '-t, --type <type>',
+        autocomplete: ['microsoft365', 'security']
+    }, {
+        option: '-m, --mailNickname [mailNickname]'
+    }, {
+        option: '--ownerIds [ownerIds]'
+    }, {
+        option: '--ownerUserNames [ownerUserNames]'
+    }, {
+        option: '--memberIds [memberIds]'
+    }, {
+        option: '--memberUserNames [memberUserNames]'
+    }, {
+        option: '--visibility [visibility]',
+        autocomplete: ['Public', 'Private', 'HiddenMembership']
+    });
+}, _EntraGroupAddCommand_initValidators = function _EntraGroupAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.displayName.length > 256) {
+            return `The maximum amount of characters for 'displayName' is 256.`;
+        }
+        if (args.options.mailNickname) {
+            if (!validation.isValidMailNickname(args.options.mailNickname)) {
+                return `Value for option 'mailNickname' must contain only characters in the ASCII character set 0-127 except the following: @ () \ [] " ; : <> , SPACE.`;
+            }
+            if (args.options.mailNickname.length > 64) {
+                return `The maximum amount of characters for 'mailNickname' is 64.`;
+            }
+        }
+        if (args.options.ownerIds) {
+            const ids = args.options.ownerIds.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 'ownerIds'.`;
+            }
+        }
+        if (args.options.ownerUserNames) {
+            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(args.options.ownerUserNames.split(',').map(u => u.trim()));
+            if (isValidUserPrincipalNameArray !== true) {
+                return `User principal name '${isValidUserPrincipalNameArray}' is invalid for option 'ownerUserNames'.`;
+            }
+        }
+        if (args.options.memberIds) {
+            const ids = args.options.memberIds.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 'memberIds'.`;
+            }
+        }
+        if (args.options.memberUserNames) {
+            const isValidUserPrincipalNameArray = validation.isValidUserPrincipalNameArray(args.options.memberUserNames.split(',').map(u => u.trim()));
+            if (isValidUserPrincipalNameArray !== true) {
+                return `User principal name '${isValidUserPrincipalNameArray}' is invalid for option 'memberUserNames'.`;
+            }
+        }
+        if (['microsoft365', 'security'].indexOf(args.options.type) === -1) {
+            return `Option 'type' must be one of the following values: microsoft365, security.`;
+        }
+        if (args.options.type === 'microsoft365' && !args.options.visibility) {
+            return `Option 'visibility' must be specified if the option 'type' is set to microsoft365`;
+        }
+        if (args.options.visibility && ['Public', 'Private', 'HiddenMembership'].indexOf(args.options.visibility) === -1) {
+            return `Option 'visibility' must be one of the following values: Public, Private, HiddenMembership.`;
+        }
+        return true;
+    });
+}, _EntraGroupAddCommand_initTelemetry = function _EntraGroupAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            displayName: typeof args.options.displayName !== 'undefined',
+            description: typeof args.options.description !== 'undefined',
+            type: typeof args.options.type !== 'undefined',
+            mailNickname: typeof args.options.mailNickname !== 'undefined',
+            ownerIds: typeof args.options.ownerIds !== 'undefined',
+            ownerUserNames: typeof args.options.ownerUserNames !== 'undefined',
+            memberIds: typeof args.options.memberIds !== 'undefined',
+            memberUserNames: typeof args.options.memberUserNames !== 'undefined',
+            visibility: typeof args.options.visibility !== 'undefined'
+        });
+    });
+};
+export default new EntraGroupAddCommand();
+//# sourceMappingURL=group-add.js.map

package/dist/m365/entra/commands/m365group/m365group-report-activitygroupcounts.js

@@ -6,7 +6,7 @@ class M365GroupReportActivityGroupCountsCommand extends PeriodBasedReport {
         return commands.M365GROUP_REPORT_ACTIVITYGROUPCOUNTS;
     }
     get description() {
-        return 'Get the daily total number of groups and how many of them were active based on email conversations, Yammer posts, and SharePoint file activities';
+        return 'Get the daily total number of groups and how many of them were active based on email conversations, Viva Engage posts, and SharePoint file activities';
     }
     alias() {
         return [aadCommands.M365GROUP_REPORT_ACTIVITYGROUPCOUNTS];

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) => {