@pnp/cli-microsoft365 7.0.0-beta.b7c2a8d → 7.0.0-beta.c0afb7b

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

@@ -37,52 +37,39 @@ class SpoSiteListCommand extends SpoCommand {
                 await logger.logToStderr(`Retrieving list of site collections...`);
             }
             this.allSites = [];
-            await this.getAllSites(spoAdminUrl, formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, args.options.deleted, logger);
+            await this.getAllSites(spoAdminUrl, formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, logger);
             await logger.log(this.allSites);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, deleted, logger) {
-        return new Promise((resolve, reject) => {
-            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.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.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>`;
-                }
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': res.FormDigestValue
-                    },
-                    data: requestBody
-                };
-                return request.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                    return;
-                }
-                else {
-                    const sites = json[json.length - 1];
-                    this.allSites.push(...sites._Child_Items_);
-                    if (sites.NextStartIndexFromSharePoint) {
-                        this
-                            .getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, personalSite, webTemplate, formDigest, deleted, logger)
-                            .then(_ => resolve(), err => reject(err));
-                    }
-                    else {
-                        resolve();
-                    }
-                }
-            }, err => reject(err));
-        });
+    async getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, logger) {
+        const res = await spo.ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug);
+        const requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><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>`;
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': res.FormDigestValue
+            },
+            data: requestBody
+        };
+        const res1 = await request.post(requestOptions);
+        const json = JSON.parse(res1);
+        const response = json[0];
+        logger.log(response);
+        if (response.ErrorInfo) {
+            throw response.ErrorInfo.ErrorMessage;
+        }
+        else {
+            const sites = json[json.length - 1];
+            logger.log(sites);
+            this.allSites.push(...sites._Child_Items_);
+            if (sites.NextStartIndexFromSharePoint) {
+                await this.getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, personalSite, webTemplate, formDigest, logger);
+            }
+            return;
+        }
     }
     getWebTemplateId(options) {
         if (options.webTemplate) {
@@ -107,7 +94,6 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
             webTemplate: args.options.webTemplate,
             type: args.options.type,
             filter: (!(!args.options.filter)).toString(),
-            deleted: args.options.deleted,
             includeOneDriveSites: typeof args.options.includeOneDriveSites !== 'undefined'
         });
     });
@@ -121,8 +107,6 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
         option: '--filter [filter]'
     }, {
         option: '--includeOneDriveSites'
-    }, {
-        option: '--deleted'
     });
 }, _SpoSiteListCommand_initValidators = function _SpoSiteListCommand_initValidators() {
     this.validators.push(async (args) => {

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

@@ -12,11 +12,12 @@ import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
-import aadO365GroupSetCommand from '../../../aad/commands/o365group/o365group-set.js';
+import aadM365GroupSetCommand from '../../../aad/commands/m365group/m365group-set.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { SharingCapabilities } from '../site/SharingCapabilities.js';
 import spoSiteDesignApplyCommand from '../sitedesign/sitedesign-apply.js';
+import { FlowsPolicy } from './FlowsPolicy.js';
 class SpoSiteSetCommand extends SpoCommand {
     get name() {
         return commands.SITE_SET;
@@ -238,7 +239,7 @@ class SpoSiteSetCommand extends SpoCommand {
                     debug: this.debug,
                     verbose: this.verbose
                 };
-                promises.push(Cli.executeCommand(aadO365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
+                promises.push(Cli.executeCommand(aadM365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
             }
             if (args.options.description) {
                 promises.push(this.setGroupifiedSiteDescription(args.options.description));
@@ -296,12 +297,11 @@ class SpoSiteSetCommand extends SpoCommand {
             }));
         });
     }
-    updateSiteProperties(logger, args) {
+    async updateSiteProperties(logger, args) {
         const isGroupConnectedSite = this.isGroupConnectedSite();
         const sharedProperties = ['classification', 'disableFlows', 'socialBarOnSitePagesDisabled', 'shareByEmailEnabled', 'sharingCapability', 'noScriptSite'];
         const siteProperties = ['title', 'resourceQuota', 'resourceQuotaWarningLevel', 'storageQuota', 'storageQuotaWarningLevel', 'allowSelfServiceUpgrade'];
         let properties = sharedProperties;
-        properties = properties;
         if (!isGroupConnectedSite) {
             properties = properties.concat(siteProperties);
         }
@@ -315,55 +315,65 @@ class SpoSiteSetCommand extends SpoCommand {
         if (!updatedProperties) {
             return Promise.resolve(undefined);
         }
-        return spo
-            .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
-            .then(async (res) => {
-            this.context = res;
-            if (this.verbose) {
-                await logger.logToStderr(`Updating site ${args.options.url} properties...`);
-            }
-            let propertyId = 27;
-            const payload = [];
-            if (!isGroupConnectedSite) {
-                if (args.options.title) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Title"><Parameter Type="String">${formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
-                }
-                if (args.options.resourceQuota) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="UserCodeMaximumLevel"><Parameter Type="Double">${args.options.resourceQuota}</Parameter></SetProperty>`);
-                }
-                if (args.options.resourceQuotaWarningLevel) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="UserCodeWarningLevel"><Parameter Type="Double">${args.options.resourceQuotaWarningLevel}</Parameter></SetProperty>`);
-                }
-                if (args.options.storageQuota) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageMaximumLevel"><Parameter Type="Int64">${args.options.storageQuota}</Parameter></SetProperty>`);
-                }
-                if (args.options.storageQuotaWarningLevel) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageWarningLevel"><Parameter Type="Int64">${args.options.storageQuotaWarningLevel}</Parameter></SetProperty>`);
-                }
-                if (typeof args.options.allowSelfServiceUpgrade !== 'undefined') {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="AllowSelfServiceUpgrade"><Parameter Type="Boolean">${args.options.allowSelfServiceUpgrade}</Parameter></SetProperty>`);
-                }
-            }
-            if (typeof args.options.classification === 'string') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${formatting.escapeXml(args.options.classification)}</Parameter></SetProperty>`);
+        const res = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+        this.context = res;
+        if (this.verbose) {
+            await logger.logToStderr(`Updating site ${args.options.url} properties...`);
+        }
+        let propertyId = 27;
+        const payload = [];
+        const sitePropertiesPayload = [];
+        if (!isGroupConnectedSite) {
+            if (args.options.title) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Title"><Parameter Type="String">${formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
             }
-            if (typeof args.options.disableFlows !== 'undefined') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Boolean">${args.options.disableFlows}</Parameter></SetProperty>`);
+            if (args.options.resourceQuota) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="UserCodeMaximumLevel"><Parameter Type="Double">${args.options.resourceQuota}</Parameter></SetProperty>`);
             }
-            if (typeof args.options.socialBarOnSitePagesDisabled !== 'undefined') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SocialBarOnSitePagesDisabled"><Parameter Type="Boolean">${args.options.socialBarOnSitePagesDisabled}</Parameter></SetProperty>`);
+            if (args.options.resourceQuotaWarningLevel) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="UserCodeWarningLevel"><Parameter Type="Double">${args.options.resourceQuotaWarningLevel}</Parameter></SetProperty>`);
             }
-            if (typeof args.options.shareByEmailEnabled !== 'undefined') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="ShareByEmailEnabled"><Parameter Type="Boolean">${args.options.shareByEmailEnabled}</Parameter></SetProperty>`);
+            if (args.options.storageQuota) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageMaximumLevel"><Parameter Type="Int64">${args.options.storageQuota}</Parameter></SetProperty>`);
             }
-            if (args.options.sharingCapability) {
-                const sharingCapability = SharingCapabilities[args.options.sharingCapability];
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SharingCapability"><Parameter Type="Enum">${sharingCapability}</Parameter></SetProperty>`);
+            if (args.options.storageQuotaWarningLevel) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageWarningLevel"><Parameter Type="Int64">${args.options.storageQuotaWarningLevel}</Parameter></SetProperty>`);
             }
-            if (typeof args.options.noScriptSite !== 'undefined') {
-                const noScriptSite = args.options.noScriptSite ? 2 : 1;
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DenyAddAndCustomizePages"><Parameter Type="Enum">${noScriptSite}</Parameter></SetProperty>`);
+            if (args.options.allowSelfServiceUpgrade !== undefined) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="AllowSelfServiceUpgrade"><Parameter Type="Boolean">${args.options.allowSelfServiceUpgrade}</Parameter></SetProperty>`);
             }
+        }
+        if (typeof args.options.classification === 'string') {
+            sitePropertiesPayload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${formatting.escapeXml(args.options.classification)}</Parameter></SetProperty>`);
+        }
+        if (args.options.disableFlows !== undefined) {
+            const flowsPolicy = args.options.disableFlows ? FlowsPolicy.Disabled : FlowsPolicy.Enabled;
+            payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Enum">${flowsPolicy}</Parameter></SetProperty>`);
+        }
+        if (args.options.shareByEmailEnabled !== undefined) {
+            sitePropertiesPayload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="ShareByEmailEnabled"><Parameter Type="Boolean">${args.options.shareByEmailEnabled}</Parameter></SetProperty>`);
+        }
+        if (args.options.sharingCapability) {
+            const sharingCapability = SharingCapabilities[args.options.sharingCapability];
+            payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SharingCapability"><Parameter Type="Enum">${sharingCapability}</Parameter></SetProperty>`);
+        }
+        if (args.options.noScriptSite !== undefined) {
+            const noScriptSite = args.options.noScriptSite ? 2 : 1;
+            payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DenyAddAndCustomizePages"><Parameter Type="Enum">${noScriptSite}</Parameter></SetProperty>`);
+        }
+        let response;
+        let sitePropertiesResponse;
+        if (sitePropertiesPayload.length > 0) {
+            const requestOptions = {
+                url: `${args.options.url}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': res.FormDigestValue
+                },
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${sitePropertiesPayload.join('')}</Actions><ObjectPaths><StaticProperty Id="1" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /><Property Id="5" ParentId="1" Name="Site" /></ObjectPaths></Request>`
+            };
+            sitePropertiesResponse = await request.post(requestOptions);
+        }
+        if (payload.length > 0) {
             const pos = this.tenantId.indexOf('|') + 1;
             const requestOptions = {
                 url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
@@ -372,8 +382,9 @@ class SpoSiteSetCommand extends SpoCommand {
                 },
                 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>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substr(pos, this.tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${formatting.encodeQueryParameter(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
             };
-            return request.post(requestOptions);
-        });
+            response = await request.post(requestOptions);
+        }
+        return response || sitePropertiesResponse;
     }
     applySiteDesign(logger, args) {
         if (typeof args.options.siteDesignId === 'undefined') {

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

@@ -26,15 +26,7 @@ class SpoThemeListCommand extends SpoCommand {
                 responseType: 'json'
             };
             const rawRes = await request.post(requestOptions);
-            const themePreviews = rawRes.themePreviews;
-            if (themePreviews && themePreviews.length > 0) {
-                await logger.log(themePreviews);
-            }
-            else {
-                if (this.verbose) {
-                    await logger.logToStderr('No themes found');
-                }
-            }
+            await logger.log(rawRes.themePreviews);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

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

@@ -23,30 +23,8 @@ class SpoThemeRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoThemeRemoveCommand_instances, "m", _SpoThemeRemoveCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        const removeTheme = async () => {
-            try {
-                const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-                if (this.verbose) {
-                    await logger.logToStderr(`Removing theme from tenant...`);
-                }
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_api/thememanager/DeleteTenantTheme`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    data: {
-                        name: args.options.name
-                    },
-                    responseType: 'json'
-                };
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeTheme();
+            await this.removeTheme(logger, args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -56,8 +34,30 @@ class SpoThemeRemoveCommand extends SpoCommand {
                 message: `Are you sure you want to remove the theme`
             });
             if (result.continue) {
-                await removeTheme();
+                await this.removeTheme(logger, args.options);
+            }
+        }
+    }
+    async removeTheme(logger, options) {
+        try {
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            if (this.verbose) {
+                await logger.logToStderr(`Removing theme from tenant...`);
             }
+            const requestOptions = {
+                url: `${spoAdminUrl}/_api/thememanager/DeleteTenantTheme`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: {
+                    name: options.name
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

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

@@ -49,7 +49,6 @@ class SpoThemeSetCommand extends SpoCommand {
             if (contents && contents.ErrorInfo) {
                 throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
             }
-            return Promise.resolve();
         }
         catch (err) {
             this.handleRejectedPromise(err);

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

@@ -26,33 +26,8 @@ class SpoUserRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const removeUser = async () => {
-            if (this.verbose) {
-                await logger.logToStderr(`Removing user from  subsite ${args.options.webUrl} ...`);
-            }
-            let requestUrl = '';
-            if (args.options.id) {
-                requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removebyid(${args.options.id})`;
-            }
-            if (args.options.loginName) {
-                requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removeByLoginName('${formatting.encodeQueryParameter(args.options.loginName)}')`;
-            }
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            try {
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeUser();
+            await this.removeUser(logger, args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -62,10 +37,35 @@ class SpoUserRemoveCommand extends SpoCommand {
                 message: `Are you sure you want to remove specified user from the site ${args.options.webUrl}`
             });
             if (result.continue) {
-                await removeUser();
+                await this.removeUser(logger, args.options);
             }
         }
     }
+    async removeUser(logger, options) {
+        if (this.verbose) {
+            await logger.logToStderr(`Removing user from  subsite ${options.webUrl} ...`);
+        }
+        let requestUrl = `${encodeURI(options.webUrl)}/_api/web/siteusers/`;
+        if (options.id) {
+            requestUrl += `removebyid(${options.id})`;
+        }
+        else if (options.loginName) {
+            requestUrl += `removeByLoginName('${formatting.encodeQueryParameter(options.loginName)}')`;
+        }
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        try {
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelemetry = function _SpoUserRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/web/web-reindex.js

@@ -66,50 +66,43 @@ class SpoWebReindexCommand extends SpoCommand {
             this.handleRejectedPromise(err);
         }
     }
-    reindexLists(webUrl, requestDigest, logger, webIdentityResp) {
-        return new Promise((resolve, reject) => {
-            (async () => {
-                if (this.debug) {
-                    await logger.logToStderr(`Retrieving information about lists...`);
-                }
-                const requestOptions = {
-                    url: `${webUrl}/_api/web/lists?$select=NoCrawl,Title,RootFolder/Properties,RootFolder/ServerRelativeUrl&$expand=RootFolder/Properties`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request.get(requestOptions);
-            })()
-                .then((lists) => {
-                const promises = lists.value.map(l => this.reindexList(l, webUrl, requestDigest, webIdentityResp, logger));
-                return Promise.all(promises);
-            })
-                .then(() => {
-                resolve();
-            }, (err) => reject(err));
-        });
+    async reindexLists(webUrl, requestDigest, logger, webIdentityResp) {
+        try {
+            if (this.debug) {
+                await logger.logToStderr(`Retrieving information about lists...`);
+            }
+            const requestOptions = {
+                url: `${webUrl}/_api/web/lists?$select=NoCrawl,Title,RootFolder/Properties,RootFolder/ServerRelativeUrl&$expand=RootFolder/Properties`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const lists = await request.get(requestOptions);
+            const promises = lists.value.map(l => this.reindexList(l, webUrl, requestDigest, webIdentityResp, logger));
+            await Promise.all(promises);
+        }
+        catch (err) {
+            throw err;
+        }
     }
-    reindexList(list, webUrl, requestDigest, webIdentityResp, logger) {
-        return new Promise(async (resolve, reject) => {
-            if (list.NoCrawl) {
-                if (this.debug) {
-                    await logger.logToStderr(`List ${list.Title} is excluded from crawling`);
-                }
-                resolve();
-                return;
+    async reindexList(list, webUrl, requestDigest, webIdentityResp, logger) {
+        if (list.NoCrawl) {
+            if (this.debug) {
+                await logger.logToStderr(`List ${list.Title} is excluded from crawling`);
             }
-            spo
-                .getFolderIdentity(webIdentityResp.objectIdentity, webUrl, list.RootFolder.ServerRelativeUrl, requestDigest)
-                .then((folderIdentityResp) => {
-                let searchversion = list.RootFolder.Properties.vti_x005f_searchversion || 0;
-                searchversion++;
-                return SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchversion.toString(), webUrl, requestDigest, folderIdentityResp, logger, this.debug, list.RootFolder.ServerRelativeUrl);
-            })
-                .then(() => {
-                resolve();
-            }, (err) => reject(err));
-        });
+            return;
+        }
+        try {
+            const folderIdentityResp = await spo.getFolderIdentity(webIdentityResp.objectIdentity, webUrl, list.RootFolder.ServerRelativeUrl, requestDigest);
+            let searchversion = list.RootFolder.Properties.vti_x005f_searchversion || 0;
+            searchversion++;
+            await SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchversion.toString(), webUrl, requestDigest, folderIdentityResp, logger, this.debug, list.RootFolder.ServerRelativeUrl);
+            return;
+        }
+        catch (err) {
+            throw (err);
+        }
     }
 }
 _SpoWebReindexCommand_instances = new WeakSet(), _SpoWebReindexCommand_initOptions = function _SpoWebReindexCommand_initOptions() {

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

@@ -24,27 +24,8 @@ class SpoWebRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoWebRemoveCommand_instances, "m", _SpoWebRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const removeWeb = async () => {
-            const requestOptions = {
-                url: `${encodeURI(args.options.url)}/_api/web`,
-                headers: {
-                    accept: 'application/json;odata=nometadata',
-                    'X-HTTP-Method': 'DELETE'
-                },
-                responseType: 'json'
-            };
-            if (this.verbose) {
-                await logger.logToStderr(`Deleting subsite ${args.options.url} ...`);
-            }
-            try {
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeWeb();
+            await this.removeWeb(logger, args.options.url);
         }
         else {
             const result = await Cli.prompt({
@@ -54,10 +35,29 @@ class SpoWebRemoveCommand extends SpoCommand {
                 message: `Are you sure you want to remove the subsite ${args.options.url}`
             });
             if (result.continue) {
-                await removeWeb();
+                await this.removeWeb(logger, args.options.url);
             }
         }
     }
+    async removeWeb(logger, url) {
+        const requestOptions = {
+            url: `${encodeURI(url)}/_api/web`,
+            headers: {
+                accept: 'application/json;odata=nometadata',
+                'X-HTTP-Method': 'DELETE'
+            },
+            responseType: 'json'
+        };
+        if (this.verbose) {
+            await logger.logToStderr(`Deleting subsite ${url} ...`);
+        }
+        try {
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _SpoWebRemoveCommand_instances = new WeakSet(), _SpoWebRemoveCommand_initTelemetry = function _SpoWebRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {