@pnp/cli-microsoft365 6.0.0-beta.09b5216 → 6.0.0-beta.443926a

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

@@ -10,22 +10,25 @@ class SpoSiteListCommand extends SpoCommand_1.default {
         return commands_1.default.SITE_LIST;
     }
     get description() {
-        return 'Lists modern sites of the given type';
+        return 'Lists sites of the given type';
     }
     getTelemetryProperties(args) {
         const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.siteType = args.options.type || 'TeamSite';
+        telemetryProps.webTemplate = args.options.webTemplate;
         telemetryProps.filter = (!(!args.options.filter)).toString();
-        telemetryProps.deleted = args.options.deleted;
+        telemetryProps.includeOneDriveSites = typeof args.options.includeOneDriveSites !== 'undefined';
+        telemetryProps.deleted = typeof args.options.deleted !== 'undefined';
+        telemetryProps.siteType = args.options.type || 'TeamSite';
         return telemetryProps;
     }
     defaultProperties() {
         return ['Title', 'Url'];
     }
     commandAction(logger, args, cb) {
-        const siteType = args.options.type || 'TeamSite';
-        const webTemplate = siteType === 'TeamSite' ? 'GROUP#0' : 'SITEPAGEPUBLISHING#0';
-        let spoAdminUrl;
+        const webTemplate = this.getWebTemplateId(args.options);
+        const includeOneDriveSites = args.options.includeOneDriveSites || false;
+        const personalSite = includeOneDriveSites === false ? '0' : '1';
+        let spoAdminUrl = '';
         utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((_spoAdminUrl) => {
@@ -34,19 +37,19 @@ class SpoSiteListCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving list of site collections...`);
             }
             this.allSites = [];
-            return this.getAllSites(spoAdminUrl, utils_1.formatting.escapeXml(args.options.filter || ''), '0', webTemplate, undefined, args.options.deleted, logger);
+            return this.getAllSites(spoAdminUrl, utils_1.formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, args.options.deleted, logger);
         })
             .then(_ => {
             logger.log(this.allSites);
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
-    getAllSites(spoAdminUrl, filter, startIndex, webTemplate, formDigest, deleted, logger) {
+    getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, deleted, logger) {
         return new Promise((resolve, reject) => {
             utils_1.spo
                 .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
                 .then((res) => {
-                let requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="Filter" Type="String">${filter}</Property><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">0</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">${webTemplate}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`;
+                let requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="Filter" Type="String">${filter}</Property><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">${personalSite}</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">${webTemplate}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`;
                 if (deleted) {
                     requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="5"><Query SelectAllProperties="true"><Properties><Property Name="NextStartIndexFromSharePoint" ScalarProperty="true" /></Properties></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="GetDeletedSitePropertiesFromSharePoint"><Parameters><Parameter Type="String">${startIndex}</Parameter></Parameters></Method></ObjectPaths></Request>`;
                 }
@@ -71,7 +74,7 @@ class SpoSiteListCommand extends SpoCommand_1.default {
                     this.allSites.push(...sites._Child_Items_);
                     if (sites.NextStartIndexFromSharePoint) {
                         this
-                            .getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, webTemplate, formDigest, deleted, logger)
+                            .getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, personalSite, webTemplate, formDigest, deleted, logger)
                             .then(_ => resolve(), err => reject(err));
                     }
                     else {
@@ -81,15 +84,48 @@ class SpoSiteListCommand extends SpoCommand_1.default {
             }, err => reject(err));
         });
     }
+    /*
+      The type property currently defaults to Teamsite.
+      It makes more sense to default to All. Certainly after adding the 'includeOneDriveSites' option.
+      Changing this will be a breaking change. We'll remove the default the next major version.
+    */
+    getWebTemplateId(options) {
+        if (options.webTemplate) {
+            return options.webTemplate;
+        }
+        if (options.includeOneDriveSites) {
+            return '';
+        }
+        let siteType = options.type;
+        if (!siteType) {
+            siteType = 'TeamSite';
+        }
+        switch (siteType) {
+            case "TeamSite":
+                return 'GROUP#0';
+            case "CommunicationSite":
+                return 'SITEPAGEPUBLISHING#0';
+            default:
+                return '';
+        }
+    }
     options() {
         const options = [
             {
-                option: '--type [type]',
-                autocomplete: ['TeamSite', 'CommunicationSite']
+                option: '-t, --type [type]',
+                // To not introduce a breaking change, 'All' has been added.
+                // You should use all when using '--includeOneDriveSites'
+                autocomplete: ['TeamSite', 'CommunicationSite', 'All']
+            },
+            {
+                option: '--webTemplate [webTemplate]'
             },
             {
                 option: '-f, --filter [filter]'
             },
+            {
+                option: '--includeOneDriveSites'
+            },
             {
                 option: '--deleted'
             }
@@ -98,11 +134,17 @@ class SpoSiteListCommand extends SpoCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (args.options.type) {
-            if (args.options.type !== 'TeamSite' &&
-                args.options.type !== 'CommunicationSite') {
-                return `${args.options.type} is not a valid modern site type. Allowed types are TeamSite and CommunicationSite`;
-            }
+        if (args.options.type && args.options.webTemplate) {
+            return 'Specify either type or webTemplate, but not both';
+        }
+        const typeValues = ['TeamSite', 'CommunicationSite', 'All'];
+        if (args.options.type &&
+            typeValues.indexOf(args.options.type) < 0) {
+            return `${args.options.type} is not a valid value for the type option. Allowed values are ${typeValues.join('|')}`;
+        }
+        if (args.options.includeOneDriveSites
+            && (!args.options.type || args.options.type !== 'All')) {
+            return 'When using includeOneDriveSites, specify All as value for type';
         }
         return true;
     }

package/dist/m365/spo/commands.js

@@ -63,9 +63,11 @@ exports.default = {
     FOLDER_REMOVE: `${prefix} folder remove`,
     FOLDER_RENAME: `${prefix} folder rename`,
     GET: `${prefix} get`,
+    GROUP_ADD: `${prefix} group add`,
     GROUP_GET: `${prefix} group get`,
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
+    GROUP_SET: `${prefix} group set`,
     GROUP_USER_ADD: `${prefix} group user add`,
     GROUP_USER_LIST: `${prefix} group user list`,
     GROUP_USER_REMOVE: `${prefix} group user remove`,
@@ -167,6 +169,7 @@ exports.default = {
     REPORT_SITEUSAGEPAGES: `${prefix} report siteusagepages`,
     REPORT_SITEUSAGESITECOUNTS: `${prefix} report siteusagesitecounts`,
     REPORT_SITEUSAGESTORAGE: `${prefix} report siteusagestorage`,
+    ROLEDEFINITION_GET: `${prefix} roledefinition get`,
     ROLEDEFINITION_LIST: `${prefix} roledefinition list`,
     ROLEDEFINITION_REMOVE: `${prefix} roledefinition remove`,
     SEARCH: `${prefix} search`,

package/dist/m365/teams/commands/team/team-archive.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamArchiveCommand extends GraphCommand_1.default {
@@ -16,27 +17,53 @@ class TeamsTeamArchiveCommand extends GraphCommand_1.default {
         telemetryProps.shouldSetSpoSiteReadOnlyForMembers = args.options.shouldSetSpoSiteReadOnlyForMembers === true;
         return telemetryProps;
     }
+    getTeamId(args) {
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
+        }
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.name)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
+                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+            }
+            return group.id;
+        });
+    }
     commandAction(logger, args, cb) {
+        if (args.options.teamId) {
+            args.options.id = args.options.teamId;
+            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
+        }
         const siteReadOnlyForMembers = args.options.shouldSetSpoSiteReadOnlyForMembers === true;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/archive`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                shouldSetSpoSiteReadOnlyForMembers: siteReadOnlyForMembers
-            }
-        };
-        request_1.default
-            .post(requestOptions)
+        this
+            .getTeamId(args)
+            .then((teamId) => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/teams/${encodeURIComponent(teamId)}/archive`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    shouldSetSpoSiteReadOnlyForMembers: siteReadOnlyForMembers
+                }
+            };
+            return request_1.default.post(requestOptions);
+        })
             .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
     }
     options() {
         const options = [
             {
-                option: '-i, --teamId <teamId>'
+                option: '-i, --id [id]'
+            },
+            {
+                option: '-n, --name [name]'
+            },
+            {
+                option: '--teamId [teamId]'
             },
             {
                 option: '--shouldSetSpoSiteReadOnlyForMembers'
@@ -46,9 +73,18 @@ class TeamsTeamArchiveCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!args.options.id && !args.options.name && !args.options.teamId) {
+            return 'Specify either id or name';
+        }
+        if (args.options.name && (args.options.id || args.options.teamId)) {
+            return 'Specify either id or name but not both';
+        }
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
         return true;
     }
 }

package/dist/m365/teams/commands/team/team-remove.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamRemoveCommand extends GraphCommand_1.default {
@@ -17,17 +18,37 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
         telemetryProps.confirm = (!(!args.options.confirm)).toString();
         return telemetryProps;
     }
+    getTeamId(args) {
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
+        }
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.name)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
+                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+            }
+            return group.id;
+        });
+    }
     commandAction(logger, args, cb) {
+        if (args.options.teamId) {
+            args.options.id = args.options.teamId;
+            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
+        }
         const removeTeam = () => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.teamId)}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .delete(requestOptions)
+            this
+                .getTeamId(args)
+                .then((teamId) => {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/groups/${encodeURIComponent(teamId)}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                return request_1.default.delete(requestOptions);
+            })
                 .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
         };
         if (args.options.confirm) {
@@ -52,7 +73,13 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
     options() {
         const options = [
             {
-                option: '-i, --teamId <teamId>'
+                option: '-i, --id [id]'
+            },
+            {
+                option: '-n, --name [name]'
+            },
+            {
+                option: '--teamId [teamId]'
             },
             {
                 option: '--confirm'
@@ -62,9 +89,18 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!args.options.id && !args.options.name && !args.options.teamId) {
+            return 'Specify either id or name';
+        }
+        if (args.options.name && (args.options.id || args.options.teamId)) {
+            return 'Specify either id or name but not both';
+        }
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
         return true;
     }
 }

package/dist/m365/teams/commands/team/team-unarchive.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamUnarchiveCommand extends GraphCommand_1.default {
@@ -11,33 +12,68 @@ class TeamsTeamUnarchiveCommand extends GraphCommand_1.default {
     get description() {
         return 'Restores an archived Microsoft Teams team';
     }
+    getTeamId(args) {
+        if (args.options.id) {
+            return Promise.resolve(args.options.id);
+        }
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.name)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
+                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+            }
+            return group.id;
+        });
+    }
     commandAction(logger, args, cb) {
+        if (args.options.teamId) {
+            args.options.id = args.options.teamId;
+            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
+        }
         const endpoint = `${this.resource}/v1.0`;
-        const requestOptions = {
-            url: `${endpoint}/teams/${encodeURIComponent(args.options.teamId)}/unarchive`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
+        this
+            .getTeamId(args)
+            .then((teamId) => {
+            const requestOptions = {
+                url: `${endpoint}/teams/${encodeURIComponent(teamId)}/unarchive`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.post(requestOptions);
+        })
             .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
     }
     options() {
         const options = [
             {
-                option: '-i, --teamId <teamId>'
+                option: '-i, --id [id]'
+            },
+            {
+                option: '-n, --name [name]'
+            },
+            {
+                option: '--teamId [teamId]'
             }
         ];
         const parentOptions = super.options();
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!args.options.id && !args.options.name && !args.options.teamId) {
+            return 'Specify either id or name';
+        }
+        if (args.options.name && (args.options.id || args.options.teamId)) {
+            return 'Specify either id or name but not both';
+        }
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
         return true;
     }
 }

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-get.js

@@ -34,15 +34,7 @@ class TenantServiceAnnouncementHealthGetCommand extends GraphCommand_1.default {
             },
             responseType: 'json'
         };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const serviceHealth = response;
-            if (!serviceHealth) {
-                return Promise.reject(`Error fetching service health`);
-            }
-            return Promise.resolve(serviceHealth);
-        });
+        return request_1.default.get(requestOptions);
     }
     options() {
         const options = [

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-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/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/user/user-get.md

@@ -56,6 +56,18 @@ For the user with id _1caf7dcd-7e83-4c3a-94f7-932a1299c844_ retrieve the user na
 m365 aad user get --id 1caf7dcd-7e83-4c3a-94f7-932a1299c844 --properties "userPrincipalName,mail,displayName"
 ```
 
+Get information about the currently logged user using the Id token
+
+```sh
+m365 aad user get --id "@meId"
+```
+
+Get information about the currently logged in user using the UserName token
+
+```sh
+m365 aad user get --userName "@meUserName"
+```
+
 ## 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)

package/docs/docs/cmd/planner/bucket/bucket-add.md

@@ -14,16 +14,19 @@ m365 planner bucket add [options]
 : Name of the bucket to add.
 
 `--planId [planId]`
-: Plan ID to which the bucket belongs. Specify either `planId` or `planName` but not both.
+: ID of the plan to which the bucket belongs. Specify either `planId` or `planTitle` but not both.
+
+`--planTitle [planTitle]`
+: Title of the plan to which the bucket belongs. Specify either `planId` or `planTitle` but not both.
 
 `--planName [planName]`
-: Plan Name to which the bucket belongs. Specify either `planId` or `planName` but not both.
+: (deprecated. Use `planTitle` instead) Title of the plan to which the bucket belongs.
 
 `--ownerGroupId [ownerGroupId]`
-: ID of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planName`.
+: ID of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planTitle`.
 
 `--ownerGroupName [ownerGroupName]`
-: Name of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planName`.
+: Name of the group to which the plan belongs. Specify `ownerGroupId` or `ownerGroupName` when using `planTitle`.
 
 `--orderHint [orderHint]`
 : Hint used to order items of this type in a list view. The format is defined as outlined [here](https://docs.microsoft.com/en-us/graph/api/resources/planner-order-hint-format?view=graph-rest-1.0).
@@ -38,8 +41,8 @@ Adds a Microsoft Planner bucket with the name _My Planner Bucket_ for plan with
 m365 planner bucket add --name "My Planner Bucket" --planId "xqQg5FS2LkCp935s-FIFm2QAFkHM" --orderHint " !"
 ```
 
-Adds a Microsoft Planner bucket with the name _My Planner Bucket_ for plan with the name _My Planner Plan_ owned by group _My Planner Group_
+Adds a Microsoft Planner bucket with the name _My Planner Bucket_ for plan with the title _My Planner Plan_ owned by group _My Planner Group_
 
 ```sh
-m365 planner bucket add --name "My Planner Bucket" --planName "My Planner Plan" --ownerGroupName "My Planner Group"
+m365 planner bucket add --name "My Planner Bucket" --planTitle "My Planner Plan" --ownerGroupName "My Planner Group"
 ```