@pnp/cli-microsoft365 4.3.0-beta.fd397f5 → 4.4.0-beta.f2c9817

package/dist/m365/base/AppCommand.js

@@ -0,0 +1,76 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const cli_1 = require("../../cli");
+const Command_1 = require("../../Command");
+const Utils_1 = require("../../Utils");
+class AppCommand extends Command_1.default {
+    get resource() {
+        return 'https://graph.microsoft.com';
+    }
+    action(logger, args, cb) {
+        const m365rcJsonPath = '.m365rc.json';
+        if (!fs.existsSync(m365rcJsonPath)) {
+            return cb(new Command_1.CommandError(`Could not find file: ${m365rcJsonPath}`));
+        }
+        try {
+            const m365rcJsonContents = fs.readFileSync(m365rcJsonPath, 'utf8');
+            if (!m365rcJsonContents) {
+                return cb(new Command_1.CommandError(`File ${m365rcJsonPath} is empty`));
+            }
+            this.m365rcJson = JSON.parse(m365rcJsonContents);
+        }
+        catch (e) {
+            return cb(new Command_1.CommandError(`Could not parse file: ${m365rcJsonPath}`));
+        }
+        if (!this.m365rcJson.apps ||
+            this.m365rcJson.apps.length === 0) {
+            return cb(new Command_1.CommandError(`No Azure AD apps found in ${m365rcJsonPath}`));
+        }
+        if (args.options.appId) {
+            if (!this.m365rcJson.apps.some(app => app.appId === args.options.appId)) {
+                return cb(new Command_1.CommandError(`App ${args.options.appId} not found in ${m365rcJsonPath}`));
+            }
+            this.appId = args.options.appId;
+            return super.action(logger, args, cb);
+        }
+        if (this.m365rcJson.apps.length === 1) {
+            this.appId = this.m365rcJson.apps[0].appId;
+            return super.action(logger, args, cb);
+        }
+        if (this.m365rcJson.apps.length > 1) {
+            cli_1.Cli.prompt({
+                message: `Multiple Azure AD apps found in ${m365rcJsonPath}. Which app would you like to use?`,
+                type: 'list',
+                choices: this.m365rcJson.apps.map((app, i) => {
+                    return {
+                        name: `${app.name} (${app.appId})`,
+                        value: i
+                    };
+                }),
+                default: 0,
+                name: 'appIdIndex'
+            }, (result) => {
+                this.appId = this.m365rcJson.apps[result.appIdIndex].appId;
+                super.action(logger, args, cb);
+            });
+        }
+    }
+    options() {
+        const options = [
+            {
+                option: '--appId [appId]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.appId && !Utils_1.default.isValidGuid(args.options.appId)) {
+            return `${args.options.appId} is not a valid GUID`;
+        }
+        return true;
+    }
+}
+exports.default = AppCommand;
+//# sourceMappingURL=AppCommand.js.map

package/dist/m365/cli/commands/config/config-set.js

@@ -21,6 +21,9 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
         switch (args.options.key) {
             case settingsNames_1.settingsNames.showHelpOnFailure:
             case settingsNames_1.settingsNames.printErrorsAsPlainText:
+            case settingsNames_1.settingsNames.csvHeader:
+            case settingsNames_1.settingsNames.csvQuoted:
+            case settingsNames_1.settingsNames.csvQuotedEmpty:
                 value = args.options.value === 'true';
                 break;
             default:
@@ -47,7 +50,7 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
         if (CliConfigSetCommand.optionNames.indexOf(args.options.key) < 0) {
             return `${args.options.key} is not a valid setting. Allowed values: ${CliConfigSetCommand.optionNames.join(', ')}`;
         }
-        const allowedOutputs = ['text', 'json'];
+        const allowedOutputs = ['text', 'json', 'csv'];
         if (args.options.key === settingsNames_1.settingsNames.output &&
             allowedOutputs.indexOf(args.options.value) === -1) {
             return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${allowedOutputs.join(', ')}`;

package/dist/m365/pa/cds-project-mutator.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const path = require("path");
-const xmldom_1 = require("xmldom");
+const xmldom_1 = require("@xmldom/xmldom");
 /*
  * Logic extracted from bolt.module.solution.dll
  * Version: 0.4.3

package/dist/m365/pa/commands/app/app-list.js

@@ -12,8 +12,14 @@ class PaAppListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
     defaultProperties() {
         return ['name', 'displayName'];
     }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.asAdmin = args.options.asAdmin === true;
+        telemetryProps.environment = typeof args.options.environment !== 'undefined';
+        return telemetryProps;
+    }
     commandAction(logger, args, cb) {
-        const url = `${this.resource}providers/Microsoft.PowerApps/apps?api-version=2017-08-01`;
+        const url = `${this.resource}providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environment ? '/environments/' + encodeURIComponent(args.options.environment) : ''}/apps?api-version=2017-08-01`;
         this
             .getAllItems(url, logger, true)
             .then(() => {
@@ -31,6 +37,27 @@ class PaAppListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
             cb();
         }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
     }
+    options() {
+        const options = [
+            {
+                option: '-e, --environment [environment]'
+            },
+            {
+                option: '--asAdmin'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.asAdmin && !args.options.environment) {
+            return 'When specifying the asAdmin option the environment option is required as well';
+        }
+        if (args.options.environment && !args.options.asAdmin) {
+            return 'When specifying the environment option the asAdmin option is required as well';
+        }
+        return true;
+    }
 }
 module.exports = new PaAppListCommand();
 //# sourceMappingURL=app-list.js.map

package/dist/m365/planner/commands/task/task-add.js

@@ -0,0 +1,288 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const Utils_1 = require("../../../../Utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class PlannerTaskAddCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.TASK_ADD;
+    }
+    get description() {
+        return 'Adds a new Microsoft Planner Task';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.planId = typeof args.options.planId !== 'undefined';
+        telemetryProps.planName = typeof args.options.planName !== 'undefined';
+        telemetryProps.ownerGroupId = typeof args.options.ownerGroupId !== 'undefined';
+        telemetryProps.ownerGroupName = typeof args.options.ownerGroupName !== 'undefined';
+        telemetryProps.bucketId = typeof args.options.bucketId !== 'undefined';
+        telemetryProps.bucketName = typeof args.options.bucketName !== 'undefined';
+        telemetryProps.startDateTime = typeof args.options.startDateTime !== 'undefined';
+        telemetryProps.dueDateTime = typeof args.options.dueDateTime !== 'undefined';
+        telemetryProps.percentComplete = typeof args.options.percentComplete !== 'undefined';
+        telemetryProps.assignedToUserIds = typeof args.options.assignedToUserIds !== 'undefined';
+        telemetryProps.assignedToUserNames = typeof args.options.assignedToUserNames !== 'undefined';
+        telemetryProps.description = typeof args.options.description !== 'undefined';
+        telemetryProps.orderHint = typeof args.options.orderHint !== 'undefined';
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getPlanId(args)
+            .then(planId => {
+            this.planId = planId;
+            return this.getBucketId(args, planId);
+        })
+            .then(bucketId => {
+            this.bucketId = bucketId;
+            return this.generateUserAssignments(args);
+        })
+            .then(assignments => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/tasks`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    planId: this.planId,
+                    bucketId: this.bucketId,
+                    title: args.options.title,
+                    startDateTime: args.options.startDateTime,
+                    dueDateTime: args.options.dueDateTime,
+                    percentComplete: args.options.percentComplete,
+                    assignments: assignments,
+                    orderHint: args.options.orderHint
+                }
+            };
+            return request_1.default.post(requestOptions);
+        })
+            .then(newTask => this.updateTaskDetails(args.options, newTask))
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    getTaskDetailsEtag(taskId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/planner/tasks/${encodeURIComponent(taskId)}/details`,
+            headers: {
+                accept: 'application/json'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((response) => {
+            const etag = response ? response['@odata.etag'] : undefined;
+            if (!etag) {
+                return Promise.reject(`Error fetching task details`);
+            }
+            return Promise.resolve(etag);
+        });
+    }
+    updateTaskDetails(options, newTask) {
+        const taskId = newTask.id;
+        if (!options.description) {
+            return Promise.resolve(newTask);
+        }
+        return this
+            .getTaskDetailsEtag(taskId)
+            .then(etag => {
+            const requestOptionsTaskDetails = {
+                url: `${this.resource}/v1.0/planner/tasks/${taskId}/details`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none',
+                    'If-Match': etag,
+                    'Prefer': 'return=representation'
+                },
+                responseType: 'json',
+                data: {
+                    description: options.description
+                }
+            };
+            return request_1.default.patch(requestOptionsTaskDetails);
+        })
+            .then(taskDetails => {
+            return Object.assign(Object.assign({}, newTask), taskDetails);
+        });
+    }
+    generateUserAssignments(args) {
+        const assignments = {};
+        if (!args.options.assignedToUserIds && !args.options.assignedToUserNames) {
+            return Promise.resolve(assignments);
+        }
+        return this
+            .getUserIds(args.options)
+            .then((userIds) => {
+            userIds.map(x => assignments[x] = {
+                '@odata.type': '#microsoft.graph.plannerAssignment',
+                orderHint: ' !'
+            });
+            return Promise.resolve(assignments);
+        });
+    }
+    getBucketId(args, planId) {
+        if (args.options.bucketId) {
+            return Promise.resolve(args.options.bucketId);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/planner/plans/${planId}/buckets`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((response) => {
+            const bucket = response.value.find(val => val.name === args.options.bucketName);
+            if (!bucket) {
+                return Promise.reject(`The specified bucket does not exist`);
+            }
+            return Promise.resolve(bucket.id);
+        });
+    }
+    getPlanId(args) {
+        if (args.options.planId) {
+            return Promise.resolve(args.options.planId);
+        }
+        return this
+            .getGroupId(args)
+            .then((groupId) => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/planner/plans?$filter=(owner eq '${groupId}')`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        }).then((response) => {
+            const plan = response.value.find(val => val.title === args.options.planName);
+            if (!plan) {
+                return Promise.reject(`The specified plan does not exist`);
+            }
+            return Promise.resolve(plan.id);
+        });
+    }
+    getGroupId(args) {
+        if (args.options.ownerGroupId) {
+            return Promise.resolve(args.options.ownerGroupId);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.ownerGroupName)}'`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const group = response.value[0];
+            if (!group) {
+                return Promise.reject(`The specified owner group does not exist`);
+            }
+            return Promise.resolve(group.id);
+        });
+    }
+    getUserIds(options) {
+        if (options.assignedToUserIds) {
+            return Promise.resolve(options.assignedToUserIds.split(','));
+        }
+        // Hitting this section means assignedToUserNames won't be undefined
+        const userNames = options.assignedToUserNames;
+        const userArr = userNames.split(',').map(o => o.trim());
+        let userIds = [];
+        const promises = userArr.map(user => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${Utils_1.default.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                headers: {
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
+        return Promise
+            .all(promises)
+            .then((usersRes) => {
+            let userUpns = [];
+            userUpns = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.userPrincipalName; });
+            userIds = usersRes.map(res => { var _a; return (_a = res.value[0]) === null || _a === void 0 ? void 0 : _a.id; });
+            // Find the members where no graph response was found
+            const invalidUsers = userArr.filter(user => !userUpns.some((upn) => (upn === null || upn === void 0 ? void 0 : upn.toLowerCase()) === user.toLowerCase()));
+            if (invalidUsers && invalidUsers.length > 0) {
+                return Promise.reject(`Cannot proceed with planner task creation. The following users provided are invalid : ${invalidUsers.join(',')}`);
+            }
+            return Promise.resolve(userIds);
+        });
+    }
+    options() {
+        const options = [
+            { option: '-t, --title <title>' },
+            { option: '--planId [planId]' },
+            { option: '--planName [planName]' },
+            { option: '--ownerGroupId [ownerGroupId]' },
+            { option: '--ownerGroupName [ownerGroupName]' },
+            { option: '--bucketId [bucketId]' },
+            { option: '--bucketName [bucketName]' },
+            { option: '--startDateTime [startDateTime]' },
+            { option: '--dueDateTime [dueDateTime]' },
+            { option: '--percentComplete [percentComplete]' },
+            { option: '--assignedToUserIds [assignedToUserIds]' },
+            { option: '--assignedToUserNames [assignedToUserNames]' },
+            { option: '--description [description]' },
+            { option: '--orderHint [orderHint]' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (!args.options.planId && !args.options.planName) {
+            return 'Specify either planId or planName';
+        }
+        if (args.options.planId && args.options.planName) {
+            return 'Specify either planId or planName but not both';
+        }
+        if (args.options.planName && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName when using planName';
+        }
+        if (args.options.planName && args.options.ownerGroupId && args.options.ownerGroupName) {
+            return 'Specify either ownerGroupId or ownerGroupName when using planName but not both';
+        }
+        if (args.options.ownerGroupId && !Utils_1.default.isValidGuid(args.options.ownerGroupId)) {
+            return `${args.options.ownerGroupId} is not a valid GUID`;
+        }
+        if (!args.options.bucketId && !args.options.bucketName) {
+            return 'Specify either bucketId or bucketName';
+        }
+        if (args.options.bucketId && args.options.bucketName) {
+            return 'Specify either bucketId or bucketName but not both';
+        }
+        if (args.options.startDateTime && !Utils_1.default.isValidISODateTime(args.options.startDateTime)) {
+            return 'The startDateTime is not a valid ISO date string';
+        }
+        if (args.options.dueDateTime && !Utils_1.default.isValidISODateTime(args.options.dueDateTime)) {
+            return 'The dueDateTime is not a valid ISO date string';
+        }
+        if (args.options.percentComplete && isNaN(args.options.percentComplete)) {
+            return `percentComplete is not a number`;
+        }
+        if (args.options.percentComplete && (args.options.percentComplete < 0 || args.options.percentComplete > 100)) {
+            return `percentComplete should be between 0 and 100 `;
+        }
+        if (args.options.assignedToUserIds && !Utils_1.default.isValidGuidArray(args.options.assignedToUserIds.split(','))) {
+            return 'assignedToUserIds contains invalid GUID';
+        }
+        if (args.options.assignedToUserIds && args.options.assignedToUserNames) {
+            return 'Specify either assignedToUserIds or assignedToUserNames but not both';
+        }
+        return true;
+    }
+}
+module.exports = new PlannerTaskAddCommand();
+//# sourceMappingURL=task-add.js.map

package/dist/m365/planner/commands.js

@@ -7,6 +7,7 @@ exports.default = {
     PLAN_ADD: `${prefix} plan add`,
     PLAN_GET: `${prefix} plan get`,
     PLAN_LIST: `${prefix} plan list`,
+    TASK_ADD: `${prefix} task add`,
     TASK_LIST: `${prefix} task list`
 };
 //# sourceMappingURL=commands.js.map

package/dist/m365/spo/commands/site/site-ensure.js

@@ -59,7 +59,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             if (this.debug) {
                 logger.logToStderr(err.stderr);
             }
-            if (err.error.message !== 'Request failed with status code 404') {
+            if (err.error.message !== '404 FILE NOT FOUND') {
                 return Promise.reject(err);
             }
             if (this.verbose) {

package/dist/m365/teams/commands/chat/chat-member-list.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Utils_1 = require("../../../../Utils");
+const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const commands_1 = require("../../commands");
+class TeamsChatMemberListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    get name() {
+        return commands_1.default.CHAT_MEMBER_LIST;
+    }
+    get description() {
+        return 'Lists all members from a chat';
+    }
+    defaultProperties() {
+        return ['userId', 'displayName', 'email'];
+    }
+    commandAction(logger, args, cb) {
+        const endpoint = `${this.resource}/v1.0/chats/${args.options.chatId}/members`;
+        this
+            .getAllItems(endpoint, logger, true)
+            .then(() => {
+            logger.log(this.items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --chatId <chatId>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (!Utils_1.default.isValidTeamsChatId(args.options.chatId)) {
+            return `${args.options.chatId} is not a valid Teams ChatId`;
+        }
+        return true;
+    }
+}
+module.exports = new TeamsChatMemberListCommand();
+//# sourceMappingURL=chat-member-list.js.map

package/dist/m365/teams/commands/message/message-get.js

@@ -13,7 +13,7 @@ class TeamsMessageGetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const requestOptions = {
-            url: `${this.resource}/beta/teams/${args.options.teamId}/channels/${args.options.channelId}/messages/${args.options.messageId}`,
+            url: `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${args.options.channelId}/messages/${args.options.messageId}`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

package/dist/m365/teams/commands.js

@@ -13,6 +13,7 @@ exports.default = {
     CHANNEL_LIST: `${prefix} channel list`,
     CHANNEL_REMOVE: `${prefix} channel remove`,
     CHANNEL_SET: `${prefix} channel set`,
+    CHAT_MEMBER_LIST: `${prefix} chat member list`,
     CONVERSATIONMEMBER_ADD: `${prefix} conversationmember add`,
     CONVERSATIONMEMBER_LIST: `${prefix} conversationmember list`,
     FUNSETTINGS_LIST: `${prefix} funsettings list`,

package/dist/request.js

@@ -16,7 +16,9 @@ class Request {
             decompress: true,
             responseType: 'text',
             /* c8 ignore next */
-            transformResponse: [data => data]
+            transformResponse: [data => data],
+            maxBodyLength: Infinity,
+            maxContentLength: Infinity
         });
         // since we're stubbing requests, request interceptor is never called in
         // tests, so let's exclude it from coverage
@@ -64,7 +66,7 @@ class Request {
             });
             // since we're stubbing requests, response interceptor is never called in
             // tests, so let's exclude it from coverage
-            /* c8 ignore next 22 */
+            /* c8 ignore next 26 */
             this.req.interceptors.response.use((response) => {
                 if (this._logger) {
                     this._logger.logToStderr('Response:');
@@ -73,19 +75,22 @@ class Request {
                         response.headers['content-type'].indexOf('json') > -1) {
                         properties.push('data');
                     }
-                    this._logger.logToStderr(JSON.stringify(Utils_1.default.filterObject(response, properties), null, 2));
+                    this._logger.logToStderr(JSON.stringify(Object.assign({ url: response.config.url }, Utils_1.default.filterObject(response, properties)), null, 2));
                 }
                 return response;
             }, (error) => {
                 if (this._logger) {
                     const properties = ['status', 'statusText', 'headers'];
                     this._logger.logToStderr('Request error:');
-                    this._logger.logToStderr(JSON.stringify(Object.assign(Object.assign({}, Utils_1.default.filterObject(error.response, properties)), { error: error.error }), null, 2));
+                    this._logger.logToStderr(JSON.stringify(Object.assign(Object.assign({ url: error.config.url }, Utils_1.default.filterObject(error.response, properties)), { error: error.error }), null, 2));
                 }
                 throw error;
             });
         }
     }
+    get logger() {
+        return this._logger;
+    }
     set logger(logger) {
         this._logger = logger;
     }

package/dist/settingsNames.js

@@ -5,7 +5,12 @@ const settingsNames = {
     errorOutput: 'errorOutput',
     output: 'output',
     printErrorsAsPlainText: 'printErrorsAsPlainText',
-    showHelpOnFailure: 'showHelpOnFailure'
+    showHelpOnFailure: 'showHelpOnFailure',
+    csvHeader: 'csvHeader',
+    csvEscape: 'csvEscape',
+    csvQuote: 'csvQuote',
+    csvQuoted: 'csvQuoted',
+    csvQuotedEmpty: 'csvQuotedEmpty'
 };
 exports.settingsNames = settingsNames;
 //# sourceMappingURL=settingsNames.js.map

package/docs/docs/cmd/_global.md

@@ -5,10 +5,10 @@
 : JMESPath query string. See [http://jmespath.org/](http://jmespath.org/) for more information and examples
 
 `-o, --output [output]`
-: Output type. `json,text`. Default `text`
+: Output type. `json,text,csv`. Default `json`
 
 `--verbose`
 : Runs command with verbose logging
 
 `--debug`
-: Runs command with debug logging
+: Runs command with debug logging

package/docs/docs/cmd/aad/group/group-list.md

@@ -0,0 +1,21 @@
+# aad group list
+
+Lists Azure AD groups
+
+## Usage
+
+```sh
+m365 aad group list [options]
+```
+
+## Options
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Lists all groups defined in Azure Active Directory.
+
+```sh
+m365 aad group list
+```

package/docs/docs/cmd/aad/user/user-get.md

@@ -11,10 +11,13 @@ m365 aad user get [options]
 ## Options
 
 `-i, --id [id]`
-: The ID of the user to retrieve information for. Specify `id` or `userName` but not both
+: The ID of the user to retrieve information for. Use either `id`, `userName` or `email`, but not all.
 
 `-n, --userName [userName]`
-: The name of the user to retrieve information for. Specify `id` or `userName` but not both
+: The name of the user to retrieve information for. Use either `id`, `userName` or `email`, but not all.
+
+`--email [email]`
+: The email of the user to retrieve information for. Use either `id`, `userName` or `email`, but not all.
 
 `-p, --properties [properties]`
 : Comma-separated list of properties to retrieve
@@ -23,9 +26,9 @@ m365 aad user get [options]
 
 ## Remarks
 
-You can retrieve information about a user, either by specifying that user's id or user name (`userPrincipalName`), but not both.
+You can retrieve information about a user, either by specifying that user's id, user name (`userPrincipalName`), or email (`mail`), but not all.
 
-If the user with the specified id or user name doesn't exist, you will get a `Resource 'xyz' does not exist or one of its queried reference-property objects are not present.` error.
+If the user with the specified id, user name, or email doesn't exist, you will get a `Resource 'xyz' does not exist or one of its queried reference-property objects are not present.` error.
 
 ## Examples
 
@@ -41,6 +44,12 @@ Get information about the user with user name _AarifS@contoso.onmicrosoft.com_
 m365 aad user get --userName AarifS@contoso.onmicrosoft.com
 ```
 
+Get information about the user with email _AarifS@contoso.onmicrosoft.com_
+
+```sh
+m365 aad user get --email AarifS@contoso.onmicrosoft.com
+```
+
 For the user with id _1caf7dcd-7e83-4c3a-94f7-932a1299c844_ retrieve the user name, e-mail address and full name
 
 ```sh