@pnp/cli-microsoft365 7.7.0-beta.d874bca → 7.8.0-beta.3152fc7

package/dist/m365/spo/commands/page/page-add.js

@@ -4,7 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoPageAddCommand_instances, _SpoPageAddCommand_initTelemetry, _SpoPageAddCommand_initOptions, _SpoPageAddCommand_initValidators;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -12,8 +11,6 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoFileGetCommand from '../file/file-get.js';
-import spoListItemSetCommand from '../listitem/listitem-set.js';
 import { Page, supportedPageLayouts, supportedPromoteAs } from './Page.js';
 class SpoPageAddCommand extends SpoCommand {
     get name() {
@@ -64,7 +61,8 @@ class SpoPageAddCommand extends SpoCommand {
             };
             const template = await request.post(requestOptions);
             itemId = template.UniqueId;
-            const listItemId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+            const file = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
+            const listItemId = file.Id;
             const pageProps = await Page.checkout(pageName, args.options.webUrl, logger, this.debug, this.verbose);
             if (pageProps) {
                 pageId = pageProps.Id;
@@ -93,15 +91,11 @@ class SpoPageAddCommand extends SpoCommand {
                         break;
                     case 'NewsPage':
                         const listItemSetOptions = {
-                            webUrl: args.options.webUrl,
-                            listUrl: listServerRelativeUrl,
-                            id: listItemId,
-                            systemUpdate: true,
-                            FirstPublishedDate: new Date().toISOString(),
-                            verbose: this.verbose,
-                            debug: this.debug
+                            FirstPublishedDate: new Date().toISOString()
                         };
-                        await cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
+                        const listUrl = urlUtil.getServerRelativePath(args.options.webUrl, listServerRelativeUrl);
+                        const requestUrl = `${args.options.webUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listUrl)}')`;
+                        await spo.systemUpdateListItem(requestUrl, listItemId, logger, this.verbose, listItemSetOptions);
                         break;
                     case 'Template':
                         requestOptions.url = `${args.options.webUrl}/_api/SitePages/Pages(${listItemId})/SavePageAsTemplate`;
@@ -212,18 +206,6 @@ class SpoPageAddCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getFileListItemId(webUrl, serverRelativeFileUrl) {
-        const fileGetOptions = {
-            webUrl: webUrl,
-            url: serverRelativeFileUrl,
-            asListItem: true,
-            verbose: this.verbose,
-            debug: this.debug
-        };
-        const fileGetOutput = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...fileGetOptions, _: [] } });
-        const fileGetOutputJson = JSON.parse(fileGetOutput.stdout);
-        return fileGetOutputJson.Id;
-    }
 }
 _SpoPageAddCommand_instances = new WeakSet(), _SpoPageAddCommand_initTelemetry = function _SpoPageAddCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/page/page-set.js

@@ -5,7 +5,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoPageSetCommand_instances, _SpoPageSetCommand_initTelemetry, _SpoPageSetCommand_initOptions, _SpoPageSetCommand_initTypes, _SpoPageSetCommand_initValidators;
 import { Auth } from '../../../../Auth.js';
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -13,8 +12,6 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoFileGetCommand from '../file/file-get.js';
-import spoListItemSetCommand from '../listitem/listitem-set.js';
 import { Page, supportedPageLayouts, supportedPromoteAs } from './Page.js';
 class SpoPageSetCommand extends SpoCommand {
     get name() {
@@ -49,6 +46,8 @@ class SpoPageSetCommand extends SpoCommand {
         }
         const listServerRelativeUrl = `${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages`;
         const serverRelativeFileUrl = `${listServerRelativeUrl}/${pageName}`;
+        const listUrl = urlUtil.getServerRelativePath(args.options.webUrl, listServerRelativeUrl);
+        const requestUrl = `${args.options.webUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listUrl)}')`;
         const needsToSavePage = !!args.options.title || !!args.options.description;
         try {
             const requestDigestResult = await spo.getRequestDigest(args.options.webUrl);
@@ -65,21 +64,16 @@ class SpoPageSetCommand extends SpoCommand {
                 authorByline = page.AuthorByline;
             }
             if (args.options.layoutType) {
-                const itemId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+                const file = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
+                const itemId = file.Id;
                 const listItemSetOptions = {
-                    webUrl: args.options.webUrl,
-                    listUrl: listServerRelativeUrl,
-                    id: itemId,
-                    systemUpdate: true,
-                    PageLayoutType: args.options.layoutType,
-                    verbose: this.verbose,
-                    debug: this.debug
+                    PageLayoutType: args.options.layoutType
                 };
                 if (args.options.layoutType === 'Article') {
                     listItemSetOptions.PromotedState = 0;
                     listItemSetOptions.BannerImageUrl = `${resource}/_layouts/15/images/sitepagethumbnail.png, /_layouts/15/images/sitepagethumbnail.png`;
                 }
-                await cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
+                await spo.systemUpdateListItem(requestUrl, itemId, logger, this.verbose, listItemSetOptions);
             }
             if (args.options.promoteAs) {
                 const requestOptions = {
@@ -101,21 +95,17 @@ class SpoPageSetCommand extends SpoCommand {
                         await request.post(requestOptions);
                         break;
                     case 'NewsPage':
-                        const newsPageItemId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+                        const newsPageItem = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
+                        const newsPageItemId = newsPageItem.Id;
                         const listItemSetOptions = {
-                            webUrl: args.options.webUrl,
-                            listUrl: listServerRelativeUrl,
-                            id: newsPageItemId,
-                            systemUpdate: true,
                             PromotedState: 2,
-                            FirstPublishedDate: new Date().toISOString(),
-                            verbose: this.verbose,
-                            debug: this.debug
+                            FirstPublishedDate: new Date().toISOString()
                         };
-                        await cli.executeCommand(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
+                        await spo.systemUpdateListItem(requestUrl, newsPageItemId, logger, this.verbose, listItemSetOptions);
                         break;
                     case 'Template':
-                        const templateItemId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+                        const templateItem = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
+                        const templateItemId = templateItem.Id;
                         requestOptions.headers = {
                             'X-RequestDigest': requestDigest,
                             'content-type': 'application/json;odata=nometadata',
@@ -210,17 +200,12 @@ class SpoPageSetCommand extends SpoCommand {
                 await request.post(requestOptions);
             }
             if (args.options.demoteFrom === 'NewsPage') {
-                const fileId = await this.getFileListItemId(args.options.webUrl, serverRelativeFileUrl);
+                const file = await spo.getFileAsListItemByUrl(args.options.webUrl, serverRelativeFileUrl, logger, this.verbose);
+                const fileId = file.Id;
                 const listItemSetOptions = {
-                    webUrl: args.options.webUrl,
-                    listUrl: listServerRelativeUrl,
-                    id: fileId,
-                    systemUpdate: true,
-                    PromotedState: 0,
-                    verbose: this.verbose,
-                    debug: this.debug
+                    PromotedState: 0
                 };
-                await cli.executeCommandWithOutput(spoListItemSetCommand, { options: { ...listItemSetOptions, _: [] } });
+                await spo.systemUpdateListItem(requestUrl, fileId, logger, this.verbose, listItemSetOptions);
             }
             let requestOptions;
             if (!args.options.publish) {
@@ -254,18 +239,6 @@ class SpoPageSetCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getFileListItemId(webUrl, serverRelativeFileUrl) {
-        const fileGetOptions = {
-            webUrl: webUrl,
-            url: serverRelativeFileUrl,
-            asListItem: true,
-            verbose: this.verbose,
-            debug: this.debug
-        };
-        const fileGetOutput = await cli.executeCommandWithOutput(spoFileGetCommand, { options: { ...fileGetOptions, _: [] } });
-        const fileGetOutputJson = JSON.parse(fileGetOutput.stdout);
-        return fileGetOutputJson.Id;
-    }
 }
 _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry = function _SpoPageSetCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/site/site-apppermission-remove.js

@@ -15,7 +15,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
         return commands.SITE_APPPERMISSION_REMOVE;
     }
     get description() {
-        return 'Removes an application permission from the site';
+        return 'Removes a specific application permission from a site';
     }
     constructor() {
         super();
@@ -48,7 +48,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
     }
     async getPermissionIds(siteId, options) {
         if (options.id) {
-            return Promise.resolve([options.id]);
+            return [options.id];
         }
         const permissionsObject = await this.getPermissions(siteId);
         let permissions = permissionsObject.value;
@@ -61,7 +61,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
         const spRequestOptions = {
             url: `${this.resource}/v1.0/sites/${siteId}/permissions/${permissionId}`,
             headers: {
-                'accept': 'application/json;odata.metadata=none'
+                accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
@@ -69,16 +69,16 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         if (args.options.force) {
-            await this.removeSiteAppPermission(logger, args.options);
+            await this.removeSiteAppPermission(args.options);
         }
         else {
             const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?` });
             if (result) {
-                await this.removeSiteAppPermission(logger, args.options);
+                await this.removeSiteAppPermission(args.options);
             }
         }
     }
-    async removeSiteAppPermission(logger, options) {
+    async removeSiteAppPermission(options) {
         try {
             const siteId = await spo.getSpoGraphSiteId(options.siteUrl);
             const permissionIdsToRemove = await this.getPermissionIds(siteId, options);
@@ -86,8 +86,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
             for (const permissionId of permissionIdsToRemove) {
                 tasks.push(this.removePermissions(siteId, permissionId));
             }
-            const response = await Promise.all(tasks);
-            await logger.log(response);
+            await Promise.all(tasks);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -100,7 +99,7 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
             appId: typeof args.options.appId !== 'undefined',
             appDisplayName: typeof args.options.appDisplayName !== 'undefined',
             id: typeof args.options.id !== 'undefined',
-            force: (!!args.options.force).toString()
+            force: !!args.options.force
         });
     });
 }, _SpoSiteAppPermissionRemoveCommand_initOptions = function _SpoSiteAppPermissionRemoveCommand_initOptions() {

package/dist/utils/prompt.js

@@ -3,6 +3,8 @@ import { cli } from '../cli/cli.js';
 let inquirerInput;
 let inquirerConfirm;
 let inquirerSelect;
+;
+;
 export const prompt = {
     /* c8 ignore next 9 */
     async forInput(config) {

package/dist/utils/spo.js

@@ -1,3 +1,4 @@
+import os from 'os';
 import url from 'url';
 import { urlUtil } from "./urlUtil.js";
 import { validation } from "./validation.js";
@@ -1231,6 +1232,113 @@ export const spo = {
         };
         await request.post(requestOptions);
     },
+    /**
+    * Gets a file as list item by url
+    * @param absoluteListUrl The absolute url to the list
+    * @param url The url of the file
+    * @param logger The logger object
+    * @param verbose If in verbose mode
+    * @returns The list item object
+    */
+    async getFileAsListItemByUrl(absoluteListUrl, url, logger, verbose) {
+        if (verbose && logger) {
+            logger.logToStderr(`Getting the file properties with url ${url}`);
+        }
+        const serverRelativePath = urlUtil.getServerRelativePath(absoluteListUrl, url);
+        const requestUrl = `${absoluteListUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl=@f)?$expand=ListItemAllFields&@f='${formatting.encodeQueryParameter(serverRelativePath)}'`;
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const file = await request.get(requestOptions);
+        return file.ListItemAllFields;
+    },
+    /**
+    * Updates a list item with system update
+    * @param absoluteListUrl The absolute base URL without query parameters, pointing to the specific list where the item resides. This URL should represent the list.
+    * @param itemId The id of the list item
+    * @param properties An object of the properties that should be updated
+    * @param contentTypeName The name of the content type to update
+    * @param logger The logger object
+    * @param verbose If in verbose mode
+    * @returns The updated list item object
+    */
+    async systemUpdateListItem(absoluteListUrl, itemId, logger, verbose, properties, contentTypeName) {
+        if (!properties && !contentTypeName) {
+            // Neither properties nor contentTypeName provided, no need to proceed
+            throw 'Either properties or contentTypeName must be provided for systemUpdateListItem.';
+        }
+        const parsedUrl = new URL(absoluteListUrl);
+        const serverRelativeSiteMatch = absoluteListUrl.match(new RegExp('/sites/[^/]+'));
+        const webUrl = `${parsedUrl.protocol}//${parsedUrl.host}${serverRelativeSiteMatch ?? ''}`;
+        if (verbose && logger) {
+            logger.logToStderr(`Getting list id...`);
+        }
+        const listRequestOptions = {
+            url: `${absoluteListUrl}?$select=Id`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const list = await request.get(listRequestOptions);
+        const listId = list.Id;
+        if (verbose && logger) {
+            logger.logToStderr(`Getting request digest for systemUpdate request`);
+        }
+        const res = await spo.getRequestDigest(webUrl);
+        const formDigestValue = res.FormDigestValue;
+        const objectIdentity = await spo.requestObjectIdentity(webUrl, logger, verbose);
+        let index = 0;
+        const requestBodyOptions = properties ? Object.keys(properties).map(key => `
+    <Method Name="ParseAndSetFieldValue" Id="${++index}" ObjectPathId="147">
+      <Parameters>
+        <Parameter Type="String">${key}</Parameter>
+        <Parameter Type="String">${properties[key].toString()}</Parameter>
+      </Parameters>
+    </Method>`) : [];
+        const additionalContentType = contentTypeName ? `
+    <Method Name="ParseAndSetFieldValue" Id="${++index}" ObjectPathId="147">
+      <Parameters>
+        <Parameter Type="String">ContentType</Parameter>
+        <Parameter Type="String">${contentTypeName}</Parameter>
+      </Parameters>
+    </Method>` : '';
+        const requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009">
+      <Actions>
+        ${requestBodyOptions.join('')}${additionalContentType}
+        <Method Name="SystemUpdate" Id="${++index}" ObjectPathId="147" />
+      </Actions>
+      <ObjectPaths>
+        <Identity Id="147" Name="${objectIdentity}:list:${listId}:item:${itemId},1" />
+      </ObjectPaths>
+    </Request>`;
+        const requestOptions = {
+            url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'Content-Type': 'text/xml',
+                'X-RequestDigest': formDigestValue
+            },
+            data: requestBody
+        };
+        const response = await request.post(requestOptions);
+        if (response.indexOf("ErrorMessage") > -1) {
+            throw `Error occurred in systemUpdate operation - ${response}`;
+        }
+        const id = Number(itemId);
+        const requestOptionsItems = {
+            url: `${absoluteListUrl}/items(${id})`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const itemsResponse = await request.get(requestOptionsItems);
+        return (itemsResponse);
+    },
     /**
      * Removes the retention label from the items in the given list.
      * @param webUrl The url of the web
@@ -1334,6 +1442,86 @@ export const spo = {
         };
         const site = await request.get(requestOptions);
         return site.id;
+    },
+    /**
+     * Retrieves the ObjectIdentity from a SharePoint site
+     * @param webUrl web url
+     * @param logger The logger object
+     * @param verbose If in verbose mode
+     * @return The ObjectIdentity as string
+     */
+    async requestObjectIdentity(webUrl, logger, verbose) {
+        const res = await spo.getRequestDigest(webUrl);
+        const formDigestValue = res.FormDigestValue;
+        const requestOptions = {
+            url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': formDigestValue
+            },
+            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="1" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
+        };
+        const response = await request.post(requestOptions);
+        if (verbose) {
+            logger.logToStderr('Attempt to get _ObjectIdentity_ key values');
+        }
+        const json = JSON.parse(response);
+        const contents = json.find(x => { return x.ErrorInfo; });
+        if (contents && contents.ErrorInfo) {
+            throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+        }
+        const identityObject = json.find(x => { return x._ObjectIdentity_; });
+        if (identityObject) {
+            return identityObject._ObjectIdentity_;
+        }
+        throw 'Cannot proceed. _ObjectIdentity_ not found'; // this is not supposed to happen
+    },
+    /**
+    * Updates a list item without system update
+    * @param absoluteListUrl The absolute base URL without query parameters, pointing to the specific list where the item resides. This URL should represent the list.
+    * @param itemId The id of the list item
+    * @param properties An object of the properties that should be updated
+    * @param contentTypeName The name of the content type to update
+    * @returns The updated listitem object
+    */
+    async updateListItem(absoluteListUrl, itemId, properties, contentTypeName) {
+        const requestBodyOptions = [
+            ...(properties
+                ? Object.keys(properties).map((key) => ({
+                    FieldName: key,
+                    FieldValue: properties[key].toString()
+                }))
+                : [])
+        ];
+        const requestBody = {
+            formValues: requestBodyOptions
+        };
+        contentTypeName && requestBody.formValues.push({
+            FieldName: 'ContentType',
+            FieldValue: contentTypeName
+        });
+        const requestOptions = {
+            url: `${absoluteListUrl}/items(${itemId})/ValidateUpdateListItem()`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            data: requestBody,
+            responseType: 'json'
+        };
+        const response = await request.post(requestOptions);
+        // Response is from /ValidateUpdateListItem POST call, perform get on updated item to get all field values
+        const fieldValues = response.value;
+        if (fieldValues.some(f => f.HasException)) {
+            throw `Updating the items has failed with the following errors: ${os.EOL}${fieldValues.filter(f => f.HasException).map(f => { return `- ${f.FieldName} - ${f.ErrorMessage}`; }).join(os.EOL)}`;
+        }
+        const requestOptionsItems = {
+            url: `${absoluteListUrl}/items(${itemId})`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const itemsResponse = await request.get(requestOptionsItems);
+        return (itemsResponse);
     }
 };
 //# sourceMappingURL=spo.js.map

package/docs/docs/cmd/entra/user/user-list.mdx

@@ -21,6 +21,9 @@ m365 aad user list [options]
 ## Options
 
 ```md definition-list
+`--type [type]`
+: Filter the results to only users of a given type: `Member` or `Guest`. By default, all users are listed.
+
 `-p, --properties [properties]`
 : Comma-separated list of properties to retrieve
 ```
@@ -29,7 +32,9 @@ m365 aad user list [options]
 
 ## Remarks
 
-Using the `--properties` option, you can specify a comma-separated list of user properties to retrieve from the Microsoft Graph. If you don't specify any properties, the command will retrieve user's display name and account name.
+Using the `--properties` option, you can specify a comma-separated list of user properties to retrieve from the Microsoft Graph. If you don't specify any properties, the command will retrieve user's display name, account name, id, and mail.
+
+When the `properties` option includes values with a `/`, for example: `manager/displayName`, an additional `$expand` query parameter will be included on `manager`.
 
 To filter the list of users, include additional options that match the user property that you want to filter with. For example `--displayName Patt` will return all users whose `displayName` starts with `Patt`. Multiple filters will be combined using the `and` operator.
 
@@ -37,30 +42,42 @@ Certain properties cannot be returned within a user collection. The following pr
 
 ## Examples
 
-List all users in the tenant
+List all users in the tenant.
 
 ```sh
 m365 entra user list
 ```
 
-List all users in the tenant. For each one return the display name and e-mail address
+List all guest users in the tenant.
+
+```sh
+m365 entra user list --type Guest
+```
+
+List all users in the tenant. For each one return the display name and e-mail address.
 
 ```sh
 m365 entra user list --properties "displayName,mail"
 ```
 
-Show users whose display name starts with _Patt_
+Show users whose display name starts with _Patt_.
 
 ```sh
 m365 entra user list --displayName Patt
 ```
 
-Show all account managers whose display name starts with _Patt_
+Show all account managers whose display name starts with _Patt_.
 
 ```sh
 m365 entra user list --displayName Patt --jobTitle 'Account manager'
 ```
 
+List users from the tenant. For each one return the display name, e-mail address, and manager information.
+
+```sh
+m365 entra user list --properties "displayName,mail,manager/*"
+```
+
 ## Response
 
 <Tabs>
@@ -69,8 +86,10 @@ m365 entra user list --displayName Patt --jobTitle 'Account manager'
   ```json
   [
     {
-      "userPrincipalName": "John@contoso.onmicrosoft.com",
-      "displayName": "John Doe"
+      "id": "1f5595b2-aa07-445d-9801-a45ea18160b2",
+      "displayName": "John Doe",
+      "mail": "John@contoso.onmicrosoft.com",
+      "userPrincipalName": "John@contoso.onmicrosoft.com"
     }
   ]
   ```
@@ -79,17 +98,17 @@ m365 entra user list --displayName Patt --jobTitle 'Account manager'
   <TabItem value="Text">
 
   ```text
-  userPrincipalName                         displayName
-  ----------------------------------------  -------------------------
-  John@contoso.onmicrosoft.com              John Doe
+  id                                    displayName         mail                                 userPrincipalName
+  ------------------------------------  ------------------  -----------------------------------  ------------------------------------------
+  1f5595b2-aa07-445d-9801-a45ea18160b2  John Doe            John@contoso.onmicrosoft.com         John@contoso.onmicrosoft.com
   ```
 
   </TabItem>
   <TabItem value="CSV">
 
   ```csv
-  userPrincipalName,displayName
-  John@contoso.onmicrosoft.com,John Doe
+  id,displayName,mail,userPrincipalName
+  1f5595b2-aa07-445d-9801-a45ea18160b2,John Doe,John@contoso.onmicrosoft.com,John@contoso.onmicrosoft.com
   ```
 
   </TabItem>
@@ -100,12 +119,14 @@ m365 entra user list --displayName Patt --jobTitle 'Account manager'
 
   Date: 2023-06-02
 
-  ## John Doe
+  ## John Doe (1f5595b2-aa07-445d-9801-a45ea18160b2)
 
   Property | Value
   ---------|-------
-  userPrincipalName | John@contoso.onmicrosoft.com
+  id | 1f5595b2-aa07-445d-9801-a45ea18160b2
   displayName | John Doe
+  mail | John@contoso.onmicrosoft.com
+  userPrincipalName | John@contoso.onmicrosoft.com  
   ```
 
   </TabItem>
@@ -113,4 +134,4 @@ m365 entra user list --displayName Patt --jobTitle 'Account manager'
 
 ## More information
 
-- Microsoft Graph User properties: [https://developer.microsoft.com/en-us/graph/docs/api-reference/v1.0/resources/user#properties](https://developer.microsoft.com/en-us/graph/docs/api-reference/v1.0/resources/user#properties)
+- Microsoft Graph User properties: [https://learn.microsoft.com/graph/api/resources/user?view=graph-rest-1.0#properties](https://learn.microsoft.com/graph/api/resources/user?view=graph-rest-1.0#properties)