@pnp/cli-microsoft365 7.8.0-beta.5ca5055 → 7.8.0-beta.5f64790

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

@@ -3,18 +3,17 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoSiteRemoveCommand_instances, _SpoSiteRemoveCommand_initTelemetry, _SpoSiteRemoveCommand_initOptions, _SpoSiteRemoveCommand_initValidators;
-import chalk from 'chalk';
+var _SpoSiteRemoveCommand_instances, _SpoSiteRemoveCommand_initTelemetry, _SpoSiteRemoveCommand_initOptions, _SpoSiteRemoveCommand_initValidators, _SpoSiteRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
-import config from '../../../../config.js';
 import request from '../../../../request.js';
-import { entraGroup } from '../../../../utils/entraGroup.js';
 import { formatting } from '../../../../utils/formatting.js';
-import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { odata } from '../../../../utils/odata.js';
+import { spo } from '../../../../utils/spo.js';
 import { setTimeout } from 'timers/promises';
+import { urlUtil } from '../../../../utils/urlUtil.js';
 class SpoSiteRemoveCommand extends SpoCommand {
     get name() {
         return commands.SITE_REMOVE;
@@ -25,217 +24,180 @@ class SpoSiteRemoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoSiteRemoveCommand_instances.add(this);
+        this.pollingInterval = 5000;
         __classPrivateFieldGet(this, _SpoSiteRemoveCommand_instances, "m", _SpoSiteRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteRemoveCommand_instances, "m", _SpoSiteRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteRemoveCommand_instances, "m", _SpoSiteRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRemoveCommand_instances, "m", _SpoSiteRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
+        if (args.options.wait) {
+            await this.warn(logger, `Option 'wait' is deprecated and will be removed in the next major release.`);
+        }
         if (args.options.force) {
-            await this.removeSite(logger, args);
+            await this.removeSite(logger, args.options);
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the site ${args.options.url}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the site '${args.options.url}'?` });
             if (result) {
-                await this.removeSite(logger, args);
+                await this.removeSite(logger, args.options);
             }
         }
     }
-    async removeSite(logger, args) {
+    async removeSite(logger, options) {
         try {
-            if (args.options.fromRecycleBin) {
-                await this.deleteSiteWithoutGroup(logger, args);
+            if (this.verbose) {
+                await logger.logToStderr(`Removing site '${options.url}'...`);
             }
-            else {
-                const groupId = await this.getSiteGroupId(args.options.url, logger);
-                if (groupId === '00000000-0000-0000-0000-000000000000') {
-                    if (this.debug) {
-                        await logger.logToStderr('Site is not groupified. Going ahead with the conventional site deletion options');
-                    }
-                    await this.deleteSiteWithoutGroup(logger, args);
+            this.spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            const siteUrl = urlUtil.removeTrailingSlashes(options.url);
+            const siteDetails = await this.getSiteDetails(logger, siteUrl);
+            const isGroupSite = siteDetails.GroupId && siteDetails.GroupId !== '00000000-0000-0000-0000-000000000000';
+            if (options.fromRecycleBin) {
+                if (!siteDetails.TimeDeleted) {
+                    throw `Site is currently not in the recycle bin. Remove --fromRecycleBin if you want to remove it as active site.`;
                 }
-                else {
-                    if (this.debug) {
-                        await logger.logToStderr(`Site attached to group ${groupId}. Initiating group delete operation via Graph API`);
+                if (isGroupSite) {
+                    if (this.verbose) {
+                        await logger.logToStderr(`Checking if group '${siteDetails.GroupId}' is already permanently deleted from recycle bin.`);
                     }
-                    try {
-                        const group = await entraGroup.getGroupById(groupId);
-                        if (args.options.skipRecycleBin || args.options.wait) {
-                            await logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'skipRecycleBin' and 'wait' will not be applicable.`));
-                        }
-                        await this.deleteGroup(group.id, logger);
-                        await this.deleteSite(args.options.url, args.options.wait, logger);
+                    const isGroupInRecycleBin = await this.isGroupInEntraRecycleBin(logger, siteDetails.GroupId);
+                    if (isGroupInRecycleBin) {
+                        await this.removeGroupFromEntraRecycleBin(logger, siteDetails.GroupId);
                     }
-                    catch (err) {
-                        if (this.verbose) {
-                            await logger.logToStderr(`Site group doesn't exist. Searching in the Microsoft 365 deleted groups.`);
-                        }
-                        const deletedGroups = await this.isSiteGroupDeleted(groupId);
-                        if (deletedGroups.value.length === 0) {
-                            if (this.verbose) {
-                                await logger.logToStderr("Site group doesn't exist anymore. Deleting the site.");
-                            }
-                            if (args.options.wait) {
-                                await logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameter 'wait' will not be applicable.`));
-                            }
-                            await this.deleteOrphanedSite(logger, args.options.url);
+                }
+                await this.deleteSiteFromSharePointRecycleBin(logger, siteUrl);
+            }
+            else {
+                if (siteDetails.TimeDeleted) {
+                    throw `Site is already in the recycle bin. Use --fromRecycleBin to permanently delete it.`;
+                }
+                if (isGroupSite) {
+                    await this.deleteGroupifiedSite(logger, siteUrl);
+                    if (options.skipRecycleBin) {
+                        let isGroupInRecycleBin = await this.isGroupInEntraRecycleBin(logger, siteDetails.GroupId);
+                        let amountOfPolls = 0;
+                        while (!isGroupInRecycleBin && amountOfPolls < 20) {
+                            await setTimeout(this.pollingInterval);
+                            isGroupInRecycleBin = await this.isGroupInEntraRecycleBin(logger, siteDetails.GroupId);
+                            amountOfPolls++;
                         }
-                        else {
-                            throw `Site group still exists in the deleted groups. The site won't be removed.`;
+                        if (isGroupInRecycleBin) {
+                            await this.removeGroupFromEntraRecycleBin(logger, siteDetails.GroupId);
                         }
                     }
                 }
+                else {
+                    await this.deleteNonGroupSite(logger, siteUrl);
+                }
+                if (options.skipRecycleBin) {
+                    await this.deleteSiteFromSharePointRecycleBin(logger, siteUrl);
+                }
             }
         }
         catch (err) {
-            this.handleRejectedPromise(err);
+            this.handleRejectedODataJsonPromise(err);
         }
     }
-    isSiteGroupDeleted(groupId) {
+    async removeGroupFromEntraRecycleBin(logger, groupId) {
+        if (this.verbose) {
+            await logger.logToStderr(`Permanently deleting group '${groupId}'.`);
+        }
         const requestOptions = {
-            url: `https://graph.microsoft.com/v1.0/directory/deletedItems/Microsoft.Graph.Group?$select=id&$filter=groupTypes/any(c:c+eq+'Unified') and startswith(id, '${groupId}')`,
+            url: `https://graph.microsoft.com/v1.0/directory/deletedItems/Microsoft.Graph.Group/${groupId}`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
-        return request.get(requestOptions);
+        return request.delete(requestOptions);
     }
-    async deleteOrphanedSite(logger, url) {
-        const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+    async isGroupInEntraRecycleBin(logger, groupId) {
+        if (this.verbose) {
+            await logger.logToStderr(`Checking if group '${groupId}' is in the Microsoft Entra recycle bin.`);
+        }
         const requestOptions = {
-            url: `${spoAdminUrl}/_api/GroupSiteManager/Delete?siteUrl='${url}'`,
+            url: `https://graph.microsoft.com/v1.0/directory/deletedItems/Microsoft.Graph.Group/${groupId}?$select=id`,
             headers: {
-                'content-type': 'application/json;odata=nometadata',
-                accept: 'application/json;odata=nometadata'
+                accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
-        return await request.post(requestOptions);
-    }
-    async deleteSiteWithoutGroup(logger, args) {
-        this.spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-        if (args.options.fromRecycleBin) {
-            if (this.verbose) {
-                await logger.logToStderr(`Deleting site from recycle bin ${args.options.url}...`);
-            }
-            await this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
-        }
-        else {
-            await this.deleteSite(args.options.url, args.options.wait, logger);
+        try {
+            await request.get(requestOptions);
+            return true;
         }
-        if (args.options.skipRecycleBin) {
-            if (this.verbose) {
-                await logger.logToStderr(`Also deleting site from tenant recycle bin ${args.options.url}...`);
+        catch (err) {
+            if (err.response?.status === 404) {
+                return false;
             }
-            await this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
+            throw err;
         }
     }
-    async deleteSite(url, wait, logger) {
-        this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+    async deleteNonGroupSite(logger, siteUrl) {
         if (this.verbose) {
-            await logger.logToStderr(`Deleting site ${url}...`);
+            await logger.logToStderr(`Deleting site.`);
         }
         const requestOptions = {
-            url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            url: `${this.spoAdminUrl}/_api/Microsoft.Online.SharePoint.TenantAdministration.Tenant/RemoveSite`,
             headers: {
-                'X-RequestDigest': this.context.FormDigestValue
+                accept: 'application/json;odata=nometadata'
             },
-            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><ObjectPath Id="55" ObjectPathId="54"/><ObjectPath Id="57" ObjectPathId="56"/><Query Id="58" ObjectPathId="54"><Query SelectAllProperties="true"><Properties/></Query></Query><Query Id="59" ObjectPathId="56"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true"/><Property Name="PollingInterval" ScalarProperty="true"/></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="54" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/><Method Id="56" ParentId="54" Name="RemoveSite"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
-        };
-        const response = await request.post(requestOptions);
-        const json = JSON.parse(response);
-        const responseContent = json[0];
-        if (responseContent.ErrorInfo) {
-            throw responseContent.ErrorInfo.ErrorMessage;
-        }
-        const operation = json[json.length - 1];
-        const isComplete = operation.IsComplete;
-        if (!wait || isComplete) {
-            return;
-        }
-        await setTimeout(operation.PollingInterval);
-        await spo.waitUntilFinished({
-            operationId: JSON.stringify(operation._ObjectIdentity_),
-            siteUrl: this.spoAdminUrl,
-            logger,
-            currentContext: this.context,
-            debug: this.debug,
-            verbose: this.verbose
-        });
-    }
-    async deleteSiteFromTheRecycleBin(url, wait, logger) {
-        this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-        const requestOptions = {
-            url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-            headers: {
-                'X-RequestDigest': this.context.FormDigestValue
+            data: {
+                siteUrl: siteUrl
             },
-            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><ObjectPath Id="185" ObjectPathId="184" /><Query Id="186" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="184" ParentId="175" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+            responseType: 'json'
         };
-        const response = await request.post(requestOptions);
-        const json = JSON.parse(response);
-        const responseContent = json[0];
-        if (responseContent.ErrorInfo) {
-            throw responseContent.ErrorInfo.ErrorMessage;
-        }
-        const operation = json[json.length - 1];
-        const isComplete = operation.IsComplete;
-        if (!wait || isComplete) {
-            return;
-        }
-        await setTimeout(operation.PollingInterval);
-        await spo.waitUntilFinished({
-            operationId: JSON.stringify(operation._ObjectIdentity_),
-            siteUrl: this.spoAdminUrl,
-            logger,
-            currentContext: this.context,
-            debug: this.debug,
-            verbose: this.verbose
-        });
+        return request.post(requestOptions);
     }
-    async getSiteGroupId(url, logger) {
-        this.spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-        this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+    async deleteSiteFromSharePointRecycleBin(logger, url) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving the group Id of the site ${url}`);
+            await logger.logToStderr(`Permanently deleting site from the recycle bin.`);
         }
         const requestOptions = {
-            url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            url: `${this.spoAdminUrl}/_api/Microsoft.Online.SharePoint.TenantAdministration.Tenant/RemoveDeletedSite`,
             headers: {
-                'X-RequestDigest': this.context.FormDigestValue
+                accept: 'application/json;odata=nometadata',
+                'Content-Type': 'application/json'
             },
-            data: `<Request xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009" AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}"><Actions><ObjectPath Id="4" ObjectPathId="3"/><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="false"><Properties><Property Name="GroupId" ScalarProperty="true"/></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/><Method Id="3" ParentId="1" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+            data: {
+                siteUrl: url
+            },
+            responseType: 'json'
         };
-        const response = await request.post(requestOptions);
-        const json = JSON.parse(response);
-        const responseContent = json[0];
-        if (responseContent.ErrorInfo) {
-            throw responseContent.ErrorInfo.ErrorMessage;
+        return request.post(requestOptions);
+    }
+    async getSiteDetails(logger, url) {
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving site info.`);
         }
-        const groupId = json[json.length - 1].GroupId.replace('/Guid(', '').replace(')/', '');
-        return groupId;
+        const sites = await odata.getAllItems(`${this.spoAdminUrl}/_api/web/lists/GetByTitle('DO_NOT_DELETE_SPLIST_TENANTADMIN_AGGREGATED_SITECOLLECTIONS')/items?$filter=SiteUrl eq '${formatting.encodeQueryParameter(url)}'&$select=GroupId,TimeDeleted,SiteId`);
+        if (sites.length === 0) {
+            throw `Site not found in the tenant.`;
+        }
+        return sites[0];
     }
-    async deleteGroup(groupId, logger) {
+    async deleteGroupifiedSite(logger, siteUrl) {
         if (this.verbose) {
-            await logger.logToStderr(`Removing Microsoft 365 Group: ${groupId}...`);
+            await logger.logToStderr(`Removing groupified site.`);
         }
         const requestOptions = {
-            url: `https://graph.microsoft.com/v1.0/groups/${groupId}`,
+            url: `${this.spoAdminUrl}/_api/GroupSiteManager/Delete?siteUrl='${formatting.encodeQueryParameter(siteUrl)}'`,
             headers: {
-                'accept': 'application/json;odata.metadata=none'
-            }
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
         };
-        return request.delete(requestOptions);
+        return request.post(requestOptions);
     }
 }
 _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelemetry = function _SpoSiteRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            skipRecycleBin: (!(!args.options.skipRecycleBin)).toString(),
-            fromRecycleBin: (!(!args.options.fromRecycleBin)).toString(),
-            wait: args.options.wait,
-            force: (!(!args.options.force)).toString()
+            skipRecycleBin: !!args.options.skipRecycleBin,
+            fromRecycleBin: !!args.options.fromRecycleBin,
+            wait: !!args.options.wait,
+            force: !!args.options.force
         });
     });
 }, _SpoSiteRemoveCommand_initOptions = function _SpoSiteRemoveCommand_initOptions() {
@@ -251,7 +213,24 @@ _SpoSiteRemoveCommand_instances = new WeakSet(), _SpoSiteRemoveCommand_initTelem
         option: '-f, --force'
     });
 }, _SpoSiteRemoveCommand_initValidators = function _SpoSiteRemoveCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.url));
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.url);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        const uri = new URL(args.options.url);
+        const rootUrl = `${uri.protocol}//${uri.hostname}`;
+        if (rootUrl.toLowerCase() === urlUtil.removeTrailingSlashes(args.options.url.toLowerCase())) {
+            return `The root site cannot be deleted.`;
+        }
+        if (args.options.fromRecycleBin && args.options.skipRecycleBin) {
+            return 'Specify either fromRecycleBin or skipRecycleBin, but not both.';
+        }
+        return true;
+    });
+}, _SpoSiteRemoveCommand_initTypes = function _SpoSiteRemoveCommand_initTypes() {
+    this.types.string.push('url');
+    this.types.boolean.push('skipRecycleBin', 'fromRecycleBin', 'wait', 'force');
 };
 export default new SpoSiteRemoveCommand();
 //# sourceMappingURL=site-remove.js.map

package/dist/utils/urlUtil.js

@@ -197,6 +197,14 @@ export const urlUtil = {
             const rootUrl = new URL(fullUrl);
             return rootUrl.origin;
         }
+    },
+    /**
+     * Removes trailing slashes from the URL.
+     * @param url The URL to process.
+     * @returns The URL without trailing slashes.
+     */
+    removeTrailingSlashes(url) {
+        return url.replace(/\/+$/, '');
     }
 };
 //# sourceMappingURL=urlUtil.js.map

package/docs/docs/cmd/entra/m365group/m365group-add.mdx

@@ -22,37 +22,37 @@ m365 aad m365group add [options]
 
 ```md definition-list
 `-n, --displayName <displayName>`
-: Display name for the Microsoft 365 Group
-
-`-d, --description <description>`
-: Description for the Microsoft 365 Group
+: Display name for the Microsoft 365 Group.
 
 `-m, --mailNickname <mailNickname>`
-: Name to use in the group e-mail (part before the `@`)
+: Name to use in the group e-mail (part before the `@`).
+
+`-d, --description [description]`
+: Description for the Microsoft 365 Group.
 
 `--owners [owners]`
-: Comma-separated list of Microsoft 365 Group owners
+: Comma-separated list of Microsoft 365 Group owners.
 
 `--members [members]`
-: Comma-separated list of Microsoft 365 Group members
+: Comma-separated list of Microsoft 365 Group members.
 
 `--visibility [visibility]`
 : Specifies the group join policy and group content visibility for groups. Allowed values: `Private`, `Public`, or `HiddenMembership`. Defaults to `Public`.
 
 `--allowMembersToPost [allowMembersToPost]`
-: Set if only group members should be able to post conversations to the group
+: Set if only group members should be able to post conversations to the group.
 
 `--hideGroupInOutlook [hideGroupInOutlook]`
-: Set to hide the group in Outlook experiences
+: Set to hide the group in Outlook experiences.
 
 `--subscribeNewGroupMembers [subscribeNewGroupMembers]`
-: Set to subscribe all new group members to receive group conversation emails when new messages are posted in the group
+: Set to subscribe all new group members to receive group conversation emails when new messages are posted in the group.
 
 `--welcomeEmailDisabled [welcomeEmailDisabled]`
-: Set to not send welcome emails to new group members
+: Set to not send welcome emails to new group members.
 
 `-l, --logoPath [logoPath]`
-: Local path to the image file to use as group logo
+: Local path to the image file to use as group logo.
 ```
 
 <Global />
@@ -74,25 +74,25 @@ HiddenMembership | Owner permission is needed to join the group. Guest users can
 
 ## Examples
 
-Create a public Microsoft 365 Group
+Create a public Microsoft 365 Group.
 
 ```sh
-m365 entra m365group 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
+m365 entra m365group add --displayName Finance --mailNickname finance
 ```
 
-Create a private Microsoft 365 Group
+Create a private Microsoft 365 Group.
 
 ```sh
-m365 entra m365group 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 --visibility Private
+m365 entra m365group add --displayName Finance --mailNickname finance --visibility Private
 ```
 
-Create a public Microsoft 365 Group and set specified users as its owners
+Create a public Microsoft 365 Group with description and set specified users as its owners.
 
 ```sh
 m365 entra m365group 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 --owners "DebraB@contoso.onmicrosoft.com,DiegoS@contoso.onmicrosoft.com"
 ```
 
-Create a public Microsoft 365 Group and set specified users as its members
+Create a public Microsoft 365 Group with description and set specified users as its members.
 
 ```sh
 m365 entra m365group 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 --members "DebraB@contoso.onmicrosoft.com,DiegoS@contoso.onmicrosoft.com"
@@ -101,31 +101,31 @@ m365 entra m365group add --displayName Finance --description "This is the Contos
 Create a public Microsoft 365 Group and allow only group members to be able to post conversations to the group.
 
 ```sh
-m365 entra m365group 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 --allowMembersToPost
+m365 entra m365group add --displayName Finance --mailNickname finance --allowMembersToPost
 ```
 
 Create a public Microsoft 365 Group and hide it from the Outlook experiences (web and client).
 
 ```sh
-m365 entra m365group 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 --hideGroupInOutlook
+m365 entra m365group add --displayName Finance --mailNickname finance --hideGroupInOutlook
 ```
 
 Create a public Microsoft 365 Group and subscribe all new group members to receive group conversation emails when new messages are posted in the group.
 
 ```sh
-m365 entra m365group 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 --subscribeNewGroupMembers
+m365 entra m365group add --displayName Finance --mailNickname finance --subscribeNewGroupMembers
 ```
 
 Create a public Microsoft 365 Group and set to not send welcome emails to new group members.
 
 ```sh
-m365 entra m365group 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 --welcomeEmailDisabled
+m365 entra m365group add --displayName Finance --mailNickname finance --welcomeEmailDisabled
 ```
 
-Create a public Microsoft 365 Group and set its logo
+Create a public Microsoft 365 Group and set its logo.
 
 ```sh
-m365 entra m365group 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 --logoPath images/logo.png
+m365 entra m365group add --displayName Finance --mailNickname finance --logoPath images/logo.png
 ```
 
 ## Response

package/docs/docs/cmd/outlook/message/message-list.mdx

@@ -20,28 +20,40 @@ m365 outlook message list [options]
 
 `--folderId [folderId]`
 : ID of the folder from which to list messages.
+
+`--startTime [startTime]`
+: Time indicating the inclusive start of a time range when the message was received. This should be defined as a valid ISO 8601 string (2021-12-16T18:28:48.6964197Z).
+
+`--endTime [endTime]`
+: Time indicating the exclusive end of a time range when the message was received. This should be defined as a valid ISO 8601 string (2021-12-16T18:28:48.6964197Z).
+
+`--userId [userId]`
+: The Microsoft Entra user ID. Specify either `userId` or `userName`, not both. This option is required when using application permissions.
+
+`--userName [userName]`
+: User principal name of the user. Specify either `userId` or `userName`, not both. This option is required when using application permissions.
 ```
 
 <Global />
 
 ## Examples
 
-List all messages in the folder with the specified name.
+List all messages from a folder with the specified name received within a specific time frame.
 
 ```sh
-m365 outlook message list --folderName Archive
+m365 outlook message list --folderName Archive --startTime 2023-12-16T18:28:48.6964197Z --endTime 2024-02-01
 ```
 
-List all messages in the folder with the specified ID.
+List all messages from a specific folder of a user specified by ID.
 
 ```sh
-m365 outlook message list --folderId AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OAAuAAAAAAAiQ8W967B7TKBjgx9rVEURAQAiIsqMbYjsT5e-T7KzowPTAAAAAAFNAAA=
+m365 outlook message list --folderId AAMkAGVmMDEzMTM4LTZmYWUtNDdkNC1hMDZiLTU1OGY5OTZhYmY4OAAuAAAAAAAiQ8W967B7TKBjgx9rVEURAQAiIsqMbYjsT5e-T7KzowPTAAAAAAFNAAA= --userId 48d31887-5fad-4d73-a9f5-3c356e68a038
 ```
 
-List all messages in the folder with the specified well-known name.
+List all messages from a folder of a user specified by UPN.
 
 ```sh
-m365 outlook message list --folderName inbox
+m365 outlook message list --folderName inbox --userName john@contoso.com
 ```
 
 ## Response

package/docs/docs/cmd/spo/site/site-remove.mdx

@@ -14,63 +14,53 @@ m365 spo site remove [options]
 
 ```md definition-list
 `-u, --url <url>`
-: URL of the site to remove
+: URL of the site.
 
 `--skipRecycleBin`
-: Set to directly remove the site without moving it to the Recycle Bin
+: Set to directly remove the site without moving it to the recycle bin.
 
 `--fromRecycleBin`
-: Set to remove the site from the Recycle Bin
+: Set to remove the site from the recycle bin.
 
 `--wait`
-: Wait for the site to be removed before completing the command
+: (deprecated) Wait for the site to be removed before completing the command.
 
 `-f, --force`
-: Don't prompt for confirming removing the site
+: Don't prompt for confirmation.
 ```
 
 <Global />
 
 ## Remarks
 
-Deleting a site collection is by default asynchronous and depending on the current state of Microsoft 365, might take up to few minutes. If you're building a script with steps that require the site to be fully deleted, you should use the `--wait` flag. When using this flag, the `spo site remove` command will keep running until it received confirmation from Microsoft 365 that the site has been fully deleted.
-
-If the site which you have selected to remove is groupified (Modern Team Site) and group exists, flags `--skipRecycleBin` and `--wait` will not be applicable. If the linked group still exists in the deleted groups, the site won't be removed. If the linked group is permanently deleted, the site will be removed like any classic site (except that flag `--wait` only will still not be applicable).
-
 If the argument `--fromRecycleBin` is passed, the selected site will be permanently removed even if it's a groupified one.
 
 :::info
 
-To use this command you have to have permissions to access the tenant admin site.
+To use this command you must be a Global or SharePoint administrator.
 
 :::
 
 ## Examples
 
-Remove the specified site and place it in the Recycle Bin
+Remove the specified site and place it in the recycle bin.
 
 ```sh
 m365 spo site remove --url https://contoso.sharepoint.com/sites/demosite
 ```
 
-Remove the site without moving it to the Recycle Bin
+Remove the site without moving it to the recycle bin.
 
 ```sh
 m365 spo site remove --url https://contoso.sharepoint.com/sites/demosite --skipRecycleBin
 ```
 
-Remove the previously deleted site from the Recycle Bin
+Remove the previously deleted site from the recycle bin.
 
 ```sh
 m365 spo site remove --url https://contoso.sharepoint.com/sites/demosite --fromRecycleBin
 ```
 
-Remove the site without moving it to the Recycle Bin and wait for completion
-
-```sh
-m365 spo site remove --url https://contoso.sharepoint.com/sites/demosite --wait --skipRecycleBin
-```
-
 ## Response
 
 The command won't return a response on success.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "7.8.0-beta.5ca5055",
+  "version": "7.8.0-beta.5f64790",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",