@pnp/cli-microsoft365 6.0.0-beta.09b5216 → 6.0.0-beta.22bbec5

package/dist/m365/yammer/commands/user/user-list.js

@@ -1,4 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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 _YammerUserListCommand_instances, _YammerUserListCommand_initTelemetry, _YammerUserListCommand_initOptions, _YammerUserListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const YammerCommand_1 = require("../../../base/YammerCommand");
@@ -6,7 +21,11 @@ const commands_1 = require("../../commands");
 class YammerUserListCommand extends YammerCommand_1.default {
     constructor() {
         super();
+        _YammerUserListCommand_instances.add(this);
         this.items = [];
+        __classPrivateFieldGet(this, _YammerUserListCommand_instances, "m", _YammerUserListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _YammerUserListCommand_instances, "m", _YammerUserListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _YammerUserListCommand_instances, "m", _YammerUserListCommand_initValidators).call(this);
     }
     get name() {
         return commands_1.default.USER_LIST;
@@ -14,15 +33,6 @@ class YammerUserListCommand extends YammerCommand_1.default {
     get description() {
         return 'Returns users from the current network';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.letter = args.options.letter !== undefined;
-        telemetryProps.sortBy = args.options.sortBy !== undefined;
-        telemetryProps.reverse = args.options.reverse !== undefined;
-        telemetryProps.limit = args.options.limit !== undefined;
-        telemetryProps.groupId = args.options.groupId !== undefined;
-        return telemetryProps;
-    }
     defaultProperties() {
         return ['id', 'full_name', 'email'];
     }
@@ -97,29 +107,32 @@ class YammerUserListCommand extends YammerCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '-g, --groupId [groupId]'
-            },
-            {
-                option: '-l, --letter [letter]'
-            },
-            {
-                option: '--reverse'
-            },
-            {
-                option: '--limit [limit]'
-            },
-            {
-                option: '--sortBy [sortBy]',
-                autocomplete: ['messages', 'followers']
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_YammerUserListCommand_instances = new WeakSet(), _YammerUserListCommand_initTelemetry = function _YammerUserListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            letter: args.options.letter !== undefined,
+            sortBy: args.options.sortBy !== undefined,
+            reverse: args.options.reverse !== undefined,
+            limit: args.options.limit !== undefined,
+            groupId: args.options.groupId !== undefined
+        });
+    });
+}, _YammerUserListCommand_initOptions = function _YammerUserListCommand_initOptions() {
+    this.options.unshift({
+        option: '-g, --groupId [groupId]'
+    }, {
+        option: '-l, --letter [letter]'
+    }, {
+        option: '--reverse'
+    }, {
+        option: '--limit [limit]'
+    }, {
+        option: '--sortBy [sortBy]',
+        autocomplete: ['messages', 'followers']
+    });
+}, _YammerUserListCommand_initValidators = function _YammerUserListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.groupId && typeof args.options.groupId !== 'number') {
             return `${args.options.groupId} is not a number`;
         }
@@ -136,7 +149,7 @@ class YammerUserListCommand extends YammerCommand_1.default {
             return `Only one char as value of 'letter' accepted.`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new YammerUserListCommand();
 //# sourceMappingURL=user-list.js.map

package/dist/m365/yammer/commands/yammer-search.js

@@ -1,4 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+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 _YammerSearchCommand_instances, _YammerSearchCommand_initTelemetry, _YammerSearchCommand_initOptions, _YammerSearchCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../request");
 const YammerCommand_1 = require("../../base/YammerCommand");
@@ -6,6 +21,7 @@ const commands_1 = require("../commands");
 class YammerSearchCommand extends YammerCommand_1.default {
     constructor() {
         super();
+        _YammerSearchCommand_instances.add(this);
         this.summary = {
             messages: 0,
             groups: 0,
@@ -16,6 +32,9 @@ class YammerSearchCommand extends YammerCommand_1.default {
         this.groups = [];
         this.topics = [];
         this.users = [];
+        __classPrivateFieldGet(this, _YammerSearchCommand_instances, "m", _YammerSearchCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _YammerSearchCommand_instances, "m", _YammerSearchCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _YammerSearchCommand_instances, "m", _YammerSearchCommand_initValidators).call(this);
     }
     get name() {
         return commands_1.default.SEARCH;
@@ -23,12 +42,6 @@ class YammerSearchCommand extends YammerCommand_1.default {
     get description() {
         return 'Returns a list of messages, users, topics and groups that match the specified query.';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.show = typeof args.options.show !== 'undefined';
-        telemetryProps.limit = typeof args.options.limit !== 'undefined';
-        return telemetryProps;
-    }
     getAllItems(logger, args, page) {
         return new Promise((resolve, reject) => {
             const endpoint = `${this.resource}/v1/search.json?search=${encodeURIComponent(args.options.queryText)}&page=${page}`;
@@ -177,23 +190,25 @@ class YammerSearchCommand extends YammerCommand_1.default {
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
-    options() {
-        const options = [
-            {
-                option: '--queryText <queryText>'
-            },
-            {
-                option: '--show [show]',
-                autocomplete: YammerSearchCommand.showOptions
-            },
-            {
-                option: '--limit [limit]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_YammerSearchCommand_instances = new WeakSet(), _YammerSearchCommand_initTelemetry = function _YammerSearchCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            show: typeof args.options.show !== 'undefined',
+            limit: typeof args.options.limit !== 'undefined'
+        });
+    });
+}, _YammerSearchCommand_initOptions = function _YammerSearchCommand_initOptions() {
+    this.options.unshift({
+        option: '--queryText <queryText>'
+    }, {
+        option: '--show [show]',
+        autocomplete: YammerSearchCommand.showOptions
+    }, {
+        option: '--limit [limit]'
+    });
+}, _YammerSearchCommand_initValidators = function _YammerSearchCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.queryText && typeof args.options.queryText !== 'string') {
             return `${args.options.queryText} is not a string`;
         }
@@ -214,8 +229,8 @@ class YammerSearchCommand extends YammerCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+};
 YammerSearchCommand.showOptions = [
     'summary', 'messages', 'users', 'topics', 'groups'
 ];

package/dist/settingsNames.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.settingsNames = void 0;
 const settingsNames = {
-    autoOpenBrowserOnLogin: 'autoOpenBrowserOnLogin',
     autoOpenLinksInBrowser: 'autoOpenLinksInBrowser',
     copyDeviceCodeToClipboard: 'copyDeviceCodeToClipboard',
     csvEscape: 'csvEscape',

package/dist/utils/accessToken.js

@@ -57,6 +57,24 @@ exports.accessToken = {
         catch (_a) {
         }
         return userName;
+    },
+    getUserIdFromAccessToken(accessToken) {
+        let userId = '';
+        if (!accessToken || accessToken.length === 0) {
+            return userId;
+        }
+        const chunks = accessToken.split('.');
+        if (chunks.length !== 3) {
+            return userId;
+        }
+        const tokenString = Buffer.from(chunks[1], 'base64').toString();
+        try {
+            const token = JSON.parse(tokenString);
+            userId = token.oid;
+        }
+        catch (_a) {
+        }
+        return userId;
     }
 };
 //# sourceMappingURL=accessToken.js.map

package/dist/utils/planner.js

@@ -45,19 +45,19 @@ exports.planner = {
         return odata_1.odata.getAllItems(`${graphResource}/v1.0/groups/${groupId}/planner/plans`, 'none');
     },
     /**
-     * Get Planner plan by name in a specific group.
-     * @param name Name of the Planner plan. Case insensitive.
+     * Get Planner plan by title in a specific group.
+     * @param title Title of the Planner plan. Case insensitive.
      * @param groupId Owner group ID .
      */
-    getPlanByName(name, groupId) {
+    getPlanByTitle(title, groupId) {
         return __awaiter(this, void 0, void 0, function* () {
             const plans = yield this.getPlansByGroupId(groupId);
-            const filteredPlans = plans.filter(p => p.title && p.title.toLowerCase() === name.toLowerCase());
+            const filteredPlans = plans.filter(p => p.title && p.title.toLowerCase() === title.toLowerCase());
             if (!filteredPlans.length) {
-                throw Error(`The specified plan '${name}' does not exist.`);
+                throw Error(`The specified plan '${title}' does not exist.`);
             }
             if (filteredPlans.length > 1) {
-                throw Error(`Multiple plans with name '${name}' found: ${filteredPlans.map(x => x.id)}.`);
+                throw Error(`Multiple plans with title '${title}' found: ${filteredPlans.map(x => x.id)}.`);
             }
             return filteredPlans[0];
         });

package/dist/utils/validation.js

@@ -6,8 +6,12 @@ exports.validation = {
         return guids.every(guid => this.isValidGuid(guid));
     },
     isValidGuid(guid) {
+        if (!guid) {
+            return false;
+        }
         const guidRegEx = new RegExp(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i);
-        return guidRegEx.test(guid);
+        // verify if the guid is a valid guid. @meid will be replaced in a later stage with the actual user id of the logged in user
+        return guidRegEx.test(guid) || guid.toLocaleLowerCase().trim() === "@meid";
     },
     isValidTeamsChannelId(guid) {
         const guidRegEx = new RegExp(/^19:[0-9a-zA-Z-_]+@thread\.(skype|tacv2)$/i);

package/docs/docs/cmd/aad/app/app-add.md

@@ -58,6 +58,9 @@ m365 aad app add [options]
 `--certificateDisplayName [certificateDisplayName]`
 : Display name for the certificate. If not given, the displayName will be set to the certificate subject. When specified, also specify either `certificateFile` or `certificateBase64Encoded`
 
+`--grantAdminConsent`
+: When specified, grants application & delegated permissions through admin consent
+
 `--manifest [manifest]`
 : Azure AD app manifest as retrieved from the Azure Portal to create the app registration from
 
@@ -94,6 +97,8 @@ After creating the Azure AD app registration, this command returns the app ID an
 
 If you want to store the information about the created Azure AD app registration, use the `--save` option. This is useful when you build solutions connected to Microsoft 365 and want to easily manage app registrations used with your solution. When you use the `--save` option, after you create the app registration, the command will write its ID and name to the `.m365rc.json` file in the current directory. If the file already exists, it will add the information about the to it, allowing you to track multiple apps. If the file doesn't exist, the command will create it.
 
+When specifying `--grantAdminConsent` option, a service principal will be created for the app registration.
+
 ## Examples
 
 Create new Azure AD app registration with the specified name
@@ -156,6 +161,12 @@ Create new Azure AD app registration with Application ID URI set to a value that
 m365 aad app add --name 'My AAD app' --uri api://caf406b91cd4.ngrok.io/_appId_ --scopeName access_as_user --scopeAdminConsentDescription 'Access as a user' --scopeAdminConsentDisplayName 'Access as a user' --scopeConsentBy adminsAndUsers
 ```
 
+Create new Azure AD app registration for a deamon app with specified Microsoft Graph application permissions, including admin consent
+
+```sh
+ m365 aad app add --name 'My AAD app' --apisApplication 'https://graph.microsoft.com/Group.ReadWrite.All' --grantAdminConsent
+```
+
 Create new Azure AD app registration with the specified name. Store information about the created app registration in the _.m365rc.json_ file in the current directory.
 
 ```sh
@@ -165,5 +176,5 @@ m365 aad app add --name 'My AAD app' --save
 Create new Azure AD app registration with a certificate
 
 ```sh
-m365 aad app add --name 'My AAD app' --certificateDisplayName "Some certificate name" --certificateFile c:\temp\some-certificate.cer
+m365 aad app add --name 'My AAD app' --certificateDisplayName "Some certificate name" --certificateFile "c:\temp\some-certificate.cer"
 ```

package/docs/docs/cmd/aad/app/app-remove.md

@@ -8,12 +8,6 @@ Removes an Azure AD app registration
 m365 aad app remove [options]
 ```
 
-## Alias
-
-```sh
-m365 aad app delete [options]
-```
-
 ## Options
 
 `--appId [appId]`

package/docs/docs/cmd/aad/app/app-role-remove.md

@@ -8,12 +8,6 @@ Removes role from the specified Azure AD app registration
 m365 aad app role remove [options]
 ```
 
-## Alias
-
-```sh
-m365 aad app role delete [options]
-```
-
 ## Options
 
 `--appId [appId]`

package/docs/docs/cmd/aad/app/app-set.md

@@ -85,5 +85,5 @@ m365 aad app set --objectId 95cfe30d-ed44-4f9d-b73d-c66560f72e83 --redirectUris
 Add a certificate to the app
 
 ```sh
-m365 aad app set --certificateDisplayName "Some certificate name" --certificateFile c:\temp\some-certificate.cer
+m365 aad app set --appId e75be2e1-0204-4f95-857d-51a37cf40be8 --certificateDisplayName "Some certificate name" --certificateFile "c:\temp\some-certificate.cer"
 ```

package/docs/docs/cmd/aad/approleassignment/approleassignment-add.md

@@ -13,10 +13,10 @@ m365 aad approleassignment add [options]
 `--appId [appId]`
 : Application appId also known as clientId of the App Registration to which the configured scopes (app roles) should be applied
 
-`--objectId [objectId]`
+`--appObjectId [appObjectId]`
 : Application objectId of the App Registration to which the configured scopes (app roles) should be applied
 
-`--displayName [displayName]`
+`--appDisplayName [appDisplayName]`
 : Application name of the App Registration to which the configured scopes (app roles) should be applied
 
 `-r, --resource <resource>`
@@ -31,7 +31,7 @@ m365 aad approleassignment add [options]
 
 This command requires tenant administrator permissions.
 
-Specify either the `appId`, `objectId` or `displayName` but not both. If you specify more than one option value, the command will fail with an error.
+Specify either the `appId`, `appObjectId` or `appDisplayName` but not multiple. If you specify more than one option value, the command will fail with an error.
 
 Autocomplete values for the `resource` option do not mean allowed values. The autocomplete will just suggest some known names, but that doesn't restrict you to use name of your own custom application or other application within your tenant.
 
@@ -48,13 +48,13 @@ m365 aad approleassignment add --appId "57907bf8-73fa-43a6-89a5-1f603e29e451" --
 Adds multiple Microsoft Graph application permissions to an Azure AD application with name _MyAppName_
 
 ```sh
-m365 aad approleassignment add --displayName "MyAppName" --resource "Microsoft Graph" --scope "Mail.Read,Mail.Send"
+m365 aad approleassignment add --appDisplayName "MyAppName" --resource "Microsoft Graph" --scope "Mail.Read,Mail.Send"
 ```
 
 Adds Microsoft Graph _Mail.Read_ application permissions to a system managed identity app with objectId _57907bf8-73fa-43a6-89a5-1f603e29e451_
 
 ```sh
-m365 aad approleassignment add --objectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scope "Mail.Read"
+m365 aad approleassignment add --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scope "Mail.Read"
 ```
 
 ## More information

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

@@ -13,17 +13,17 @@ m365 aad approleassignment list [options]
 `-i, --appId [appId]`
 : Application (client) Id of the App Registration for which the configured app roles should be retrieved
 
-`-n, --displayName [displayName]`
+`-n, --appDisplayName [appDisplayName]`
 : Display name of the application for which the configured app roles should be retrieved
 
-`--objectId [objectId]`
+`--appObjectId [appObjectId]`
 : ObjectId of the application for which the configured app roles should be retrieved
 
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
 
-Specify either the `appId`, `objectId` or `displayName`. If you specify more than one option value, the command will fail with an error.
+Specify either the `appId`, `appObjectId` or `appDisplayName`. If you specify more than one option value, the command will fail with an error.
 
 ## Examples
 
@@ -36,13 +36,13 @@ m365 aad approleassignment list --appId b2307a39-e878-458b-bc90-03bc578531d6
 List app roles assigned to service principal with Application display name _MyAppName_.
 
 ```sh
-m365 aad approleassignment list --displayName 'MyAppName'
+m365 aad approleassignment list --appDisplayName 'MyAppName'
 ```
 
 List app roles assigned to service principal with ObjectId _b2307a39-e878-458b-bc90-03bc578531dd_.
 
 ```sh
-m365 aad approleassignment list --objectId b2307a39-e878-458b-bc90-03bc578531dd
+m365 aad approleassignment list --appObjectId b2307a39-e878-458b-bc90-03bc578531dd
 ```
 
 ## More information

package/docs/docs/cmd/aad/approleassignment/approleassignment-remove.md

@@ -13,10 +13,10 @@ m365 aad approleassignment remove [options]
 `--appId [appId]`
 : Application appId also known as clientId of the App Registration for which the configured scopes (app roles) should be deleted
 
-`--objectId [objectId]`
+`--appObjectId [appObjectId]`
 : Application objectId of the App Registration for which the configured scopes (app roles) should be deleted
 
-`--displayName [displayName]`
+`--appDisplayName [appDisplayName]`
 : Application name of the App Registration for which the configured scopes (app roles) should be deleted
 
 `-r, --resource <resource>`
@@ -34,7 +34,7 @@ m365 aad approleassignment remove [options]
 
 This command requires tenant administrator permissions.
 
-Specify either the `appId`, `objectId` or `displayName` but not both. If you specify more than one option value, the command will fail with an error.
+Specify either the `appId`, `appObjectId` or `appDisplayName` but not multiple. If you specify more than one option value, the command will fail with an error.
 
 Autocomplete values for the `resource` option do not mean allowed values. The autocomplete will just suggest some known names, but that doesn't restrict you to use name of your own custom application or other application within your tenant.
 
@@ -51,13 +51,13 @@ m365 aad approleassignment remove --appId "57907bf8-73fa-43a6-89a5-1f603e29e451"
 Deletes multiple Microsoft Graph application permissions from an Azure AD application with name _MyAppName_
 
 ```sh
-m365 aad approleassignment remove --displayName "MyAppName" --resource "Microsoft Graph" --scope "Mail.Read,Mail.Send"
+m365 aad approleassignment remove --appDisplayName "MyAppName" --resource "Microsoft Graph" --scope "Mail.Read,Mail.Send"
 ```
 
 Deletes Microsoft Graph _Mail.Read_ application permissions from a system managed identity app with objectId _57907bf8-73fa-43a6-89a5-1f603e29e451_
 
 ```sh
-m365 aad approleassignment remove --objectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scope "Mail.Read"
+m365 aad approleassignment remove --appObjectId "57907bf8-73fa-43a6-89a5-1f603e29e451" --resource "Microsoft Graph" --scope "Mail.Read"
 ```
 
 ## More information

package/docs/docs/cmd/aad/o365group/o365group-add.md

@@ -25,8 +25,8 @@ m365 aad o365group add [options]
 `--members [members]`
 : Comma-separated list of Microsoft 365 Group members
 
-`--isPrivate [isPrivate]`
-: Set to `true` if the Microsoft 365 Group should be private and to `false` if it should be public (default)
+`--isPrivate`
+: Specify, if the Microsoft 365 Group should be private. If not specified, will create a public group (default)
 
 `--allowMembersToPost [allowMembersToPost]`
 : Set if only group members should be able to post conversations to the group
@@ -61,7 +61,7 @@ m365 aad o365group add --displayName Finance --description "This is the Contoso
 Create a private Microsoft 365 Group
 
 ```sh
-m365 aad o365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --isPrivate true
+m365 aad o365group add --displayName Finance --description "This is the Contoso Finance Group. Please come here and check out the latest news, posts, files, and more." --mailNickname finance --isPrivate
 ```
 
 Create a public Microsoft 365 Group and set specified users as its owners

package/docs/docs/cmd/aad/o365group/o365group-recyclebinitem-list.md

@@ -10,11 +10,11 @@ m365 aad o365group recyclebinitem list [options]
 
 ## Options
 
-`-d, --displayName [displayName]`
-: Lists groups with displayName starting with the specified value
+`-d, --groupDisplayName [groupDisplayName]`
+: Lists groups with DisplayName starting with the specified value
 
-`-m, --mailNickname [mailNickname]`
-: Lists groups with mailNickname starting with the specified value
+`-m, --groupMailNickname [groupMailNickname]`
+: Lists groups with MailNickname starting with the specified value
 
 --8<-- "docs/cmd/_global.md"
 
@@ -29,17 +29,17 @@ m365 aad o365group recyclebinitem list
 List deleted Microsoft 365 Groups with display name starting with _Project_
 
 ```sh
-m365 aad o365group recyclebinitem list --displayName Project
+m365 aad o365group recyclebinitem list --groupDisplayName Project
 ```
 
 List deleted Microsoft 365 Groups mail nick name starting with _team_
 
 ```sh
-m365 aad o365group recyclebinitem list --mailNickname team
+m365 aad o365group recyclebinitem list --groupMailNickname team
 ```
 
 List deleted Microsoft 365 Groups mail nick name starting with _team_ and with display name starting with _Project_
 
 ```sh
-m365 aad o365group recyclebinitem list --mailNickname team --displayName Project
+m365 aad o365group recyclebinitem list --groupMailNickname team --groupDisplayName Project
 ```

package/docs/docs/cmd/aad/o365group/o365group-recyclebinitem-restore.md

@@ -16,15 +16,33 @@ m365 aad o365group restore [options]
 
 ## Options
 
-`-i, --id <id>`
-: The ID of the Microsoft 365 Group to restore
+`-i, --id [id]`
+: The ID of the Microsoft 365 Group to restore. Specify either `id`, `displayName` or `mailNickname` but not multiple.
+
+`-d, --displayName [displayName]`
+: Display name for the Microsoft 365 Group to restore. Specify either `id`, `displayName` or `mailNickname` but not multiple.
+
+`-m, --mailNickname [mailNickname]`
+: Name of the group e-mail (part before the @). Specify either `id`, `displayName` or `mailNickname` but not multiple.
 
 --8<-- "docs/cmd/_global.md"
 
 ## Examples
 
-Restores the Microsoft 365 Group with id _28beab62-7540-4db1-a23f-29a6018a3848_
+Restores the Microsoft 365 Group with specific ID
 
 ```sh
 m365 aad o365group recyclebinitem restore --id 28beab62-7540-4db1-a23f-29a6018a3848
 ```
+
+Restores the Microsoft 365 Group with specific name
+
+```sh
+m365 aad o365group recyclebinitem restore --displayName "My Group"
+```
+
+Restores the Microsoft 365 Group with specific mail nickname
+
+```sh
+m365 aad o365group recyclebinitem restore --mailNickname "Mygroup"
+```

package/docs/docs/cmd/aad/o365group/o365group-teamify.md

@@ -10,11 +10,11 @@ m365 aad o365group teamify [options]
 
 ## Options
 
-`-i, --groupId [groupId]`
-: The ID of the Microsoft 365 Group to connect to Microsoft Teams. Specify either groupId or mailNickname but not both
+`-i, --id [id]`
+: The ID of the Microsoft 365 Group to connect to Microsoft Teams. Specify either id or mailNickname but not both
 
 `--mailNickname [mailNickname]`
-: The mail alias of the Microsoft 365 Group to connect to Microsoft Teams. Specify either groupId or mailNickname but not both
+: The mail alias of the Microsoft 365 Group to connect to Microsoft Teams. Specify either id or mailNickname but not both
 
 --8<-- "docs/cmd/_global.md"
 
@@ -23,7 +23,7 @@ m365 aad o365group teamify [options]
 Creates a new Microsoft Teams team under existing Microsoft 365 group with id _e3f60f99-0bad-481f-9e9f-ff0f572fbd03_
 
 ```sh
-m365 aad o365group teamify --groupId e3f60f99-0bad-481f-9e9f-ff0f572fbd03
+m365 aad o365group teamify --id e3f60f99-0bad-481f-9e9f-ff0f572fbd03
 ```
 
 Creates a new Microsoft Teams team under existing Microsoft 365 group with mailNickname _GroupName_

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

@@ -10,7 +10,7 @@ m365 aad policy list [options]
 
 ## Options
 
-`-p, --policyType [policyType]`
+`-t, --type [type]`
 : The type of policies to return. Allowed values `activityBasedTimeout`,`authorization`,`claimsMapping`,`homeRealmDiscovery`,`identitySecurityDefaultsEnforcement`,`tokenIssuance`,`tokenLifetime`. If omitted, all policies are returned
 
 --8<-- "docs/cmd/_global.md"
@@ -26,7 +26,7 @@ m365 aad policy list
 Returns claim-mapping policies from Azure AD
 
 ```sh
-m365 aad policy list --policyType "claimsMapping"
+m365 aad policy list --type "claimsMapping"
 ```
 
 ## More information