@pnp/cli-microsoft365 7.0.0-beta.f1037e1 → 7.0.0

package/dist/m365/spo/commands/tenant/tenant-commandset-add.js

@@ -3,7 +3,7 @@ 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 _SpoTenantCommandSetAddCommand_instances, _SpoTenantCommandSetAddCommand_initTelemetry, _SpoTenantCommandSetAddCommand_initOptions, _SpoTenantCommandSetAddCommand_initValidators;
+var _SpoTenantCommandSetAddCommand_instances, _a, _SpoTenantCommandSetAddCommand_initTelemetry, _SpoTenantCommandSetAddCommand_initOptions, _SpoTenantCommandSetAddCommand_initValidators;
 import { Cli } from '../../../../cli/Cli.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
@@ -149,7 +149,7 @@ class SpoTenantCommandSetAddCommand extends SpoCommand {
         }
     }
 }
-_SpoTenantCommandSetAddCommand_instances = new WeakSet(), _SpoTenantCommandSetAddCommand_initTelemetry = function _SpoTenantCommandSetAddCommand_initTelemetry() {
+_a = SpoTenantCommandSetAddCommand, _SpoTenantCommandSetAddCommand_instances = new WeakSet(), _SpoTenantCommandSetAddCommand_initTelemetry = function _SpoTenantCommandSetAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listType: args.options.listType,
@@ -163,7 +163,7 @@ _SpoTenantCommandSetAddCommand_instances = new WeakSet(), _SpoTenantCommandSetAd
         option: '-t, --title <title>'
     }, {
         option: '-l, --listType <listType>',
-        autocomplete: SpoTenantCommandSetAddCommand.listTypes
+        autocomplete: _a.listTypes
     }, {
         option: '-i, --clientSideComponentId <clientSideComponentId>'
     }, {
@@ -172,18 +172,18 @@ _SpoTenantCommandSetAddCommand_instances = new WeakSet(), _SpoTenantCommandSetAd
         option: '-w, --webTemplate [webTemplate]'
     }, {
         option: '--location [location]',
-        autocomplete: SpoTenantCommandSetAddCommand.locations
+        autocomplete: _a.locations
     });
 }, _SpoTenantCommandSetAddCommand_initValidators = function _SpoTenantCommandSetAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
-        if (SpoTenantCommandSetAddCommand.listTypes.indexOf(args.options.listType) < 0) {
-            return `${args.options.listType} is not a valid list type. Allowed values are ${SpoTenantCommandSetAddCommand.listTypes.join(', ')}`;
+        if (_a.listTypes.indexOf(args.options.listType) < 0) {
+            return `${args.options.listType} is not a valid list type. Allowed values are ${_a.listTypes.join(', ')}`;
         }
-        if (args.options.location && SpoTenantCommandSetAddCommand.locations.indexOf(args.options.location) < 0) {
-            return `${args.options.location} is not a valid location. Allowed values are ${SpoTenantCommandSetAddCommand.locations.join(', ')}`;
+        if (args.options.location && _a.locations.indexOf(args.options.location) < 0) {
+            return `${args.options.location} is not a valid location. Allowed values are ${_a.locations.join(', ')}`;
         }
         return true;
     });

package/dist/m365/spo/commands/tenant/tenant-commandset-get.js

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantCommandSetGetCommand_instances, _SpoTenantCommandSetGetCommand_initTelemetry, _SpoTenantCommandSetGetCommand_initOptions, _SpoTenantCommandSetGetCommand_initValidators, _SpoTenantCommandSetGetCommand_initOptionSets;
+import { Cli } from '../../../../cli/Cli.js';
 import { CommandError } from '../../../../Command.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -53,11 +54,15 @@ class SpoTenantCommandSetGetCommand extends SpoCommand {
         try {
             const listItemInstances = await request.get(reqOptions);
             if (listItemInstances?.value.length > 0) {
+                listItemInstances.value.forEach(v => delete v['ID']);
                 if (listItemInstances.value.length > 1) {
-                    throw `Multiple ListView Command Sets with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.value.map(item => item.Id).join(', ')}`;
+                    const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances.value);
+                    const result = await Cli.handleMultipleResultsFound(`Multiple ListView Command Sets with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
+                    await logger.log(result);
+                }
+                else {
+                    await logger.log(listItemInstances.value[0]);
                 }
-                listItemInstances.value.forEach(v => delete v['ID']);
-                await logger.log(listItemInstances.value[0]);
             }
             else {
                 throw 'The specified ListView Command Set was not found';

package/dist/m365/spo/commands/tenant/tenant-commandset-list.js

@@ -25,8 +25,9 @@ class SpoTenantCommandSetListCommand extends SpoCommand {
         }
         const listServerRelativeUrl = urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
         try {
-            const response = await odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=startswith(TenantWideExtensionLocation, 'ClientSideExtension.ListViewCommandSet')`);
-            await logger.log(response);
+            const listItems = await odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=startswith(TenantWideExtensionLocation, 'ClientSideExtension.ListViewCommandSet')`);
+            listItems.forEach(i => delete i.ID);
+            await logger.log(listItems);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/tenant/tenant-commandset-remove.js

@@ -90,7 +90,9 @@ class SpoTenantCommandSetRemoveCommand extends SpoCommand {
             throw 'The specified command set was not found';
         }
         if (listItemInstances.length > 1) {
-            throw `Multiple command sets with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.map(item => item.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
+            const result = await Cli.handleMultipleResultsFound(`Multiple command sets with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
+            return result.Id;
         }
         return listItemInstances[0].Id;
     }

package/dist/m365/spo/commands/tenant/tenant-commandset-set.js

@@ -3,7 +3,7 @@ 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 _SpoTenantCommandSetSetCommand_instances, _SpoTenantCommandSetSetCommand_initTelemetry, _SpoTenantCommandSetSetCommand_initOptions, _SpoTenantCommandSetSetCommand_initValidators;
+var _SpoTenantCommandSetSetCommand_instances, _a, _SpoTenantCommandSetSetCommand_initTelemetry, _SpoTenantCommandSetSetCommand_initOptions, _SpoTenantCommandSetSetCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
@@ -129,7 +129,7 @@ class SpoTenantCommandSetSetCommand extends SpoCommand {
         }
     }
 }
-_SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSetCommand_initTelemetry = function _SpoTenantCommandSetSetCommand_initTelemetry() {
+_a = SpoTenantCommandSetSetCommand, _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSetCommand_initTelemetry = function _SpoTenantCommandSetSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             newTitle: typeof args.options.newTitle !== 'undefined',
@@ -147,7 +147,7 @@ _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSe
         option: '-t, --newTitle [newTitle]'
     }, {
         option: '-l, --listType [listType]',
-        autocomplete: SpoTenantCommandSetSetCommand.listTypes
+        autocomplete: _a.listTypes
     }, {
         option: '-c, --clientSideComponentId [clientSideComponentId]'
     }, {
@@ -156,7 +156,7 @@ _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSe
         option: '-w, --webTemplate [webTemplate]'
     }, {
         option: '--location [location]',
-        autocomplete: SpoTenantCommandSetSetCommand.locations
+        autocomplete: _a.locations
     });
 }, _SpoTenantCommandSetSetCommand_initValidators = function _SpoTenantCommandSetSetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -171,11 +171,11 @@ _SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSe
         if (args.options.clientSideComponentId && !validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
-        if (args.options.listType && SpoTenantCommandSetSetCommand.listTypes.indexOf(args.options.listType) < 0) {
-            return `${args.options.listType} is not a valid list type. Allowed values are ${SpoTenantCommandSetSetCommand.listTypes.join(', ')}`;
+        if (args.options.listType && _a.listTypes.indexOf(args.options.listType) < 0) {
+            return `${args.options.listType} is not a valid list type. Allowed values are ${_a.listTypes.join(', ')}`;
         }
-        if (args.options.location && SpoTenantCommandSetSetCommand.locations.indexOf(args.options.location) < 0) {
-            return `${args.options.location} is not a valid location. Allowed values are ${SpoTenantCommandSetSetCommand.locations.join(', ')}`;
+        if (args.options.location && _a.locations.indexOf(args.options.location) < 0) {
+            return `${args.options.location} is not a valid location. Allowed values are ${_a.locations.join(', ')}`;
         }
         return true;
     });

package/dist/m365/spo/commands/tenant/tenant-settings-set.js

@@ -3,7 +3,7 @@ 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 _SpoTenantSettingsSetCommand_instances, _SpoTenantSettingsSetCommand_initTelemetry, _SpoTenantSettingsSetCommand_initOptions, _SpoTenantSettingsSetCommand_initValidators, _SpoTenantSettingsSetCommand_initTypes;
+var _SpoTenantSettingsSetCommand_instances, _a, _SpoTenantSettingsSetCommand_initTelemetry, _SpoTenantSettingsSetCommand_initOptions, _SpoTenantSettingsSetCommand_initValidators, _SpoTenantSettingsSetCommand_initTypes;
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -132,7 +132,7 @@ class SpoTenantSettingsSetCommand extends SpoCommand {
         }
     }
 }
-_SpoTenantSettingsSetCommand_instances = new WeakSet(), _SpoTenantSettingsSetCommand_initTelemetry = function _SpoTenantSettingsSetCommand_initTelemetry() {
+_a = SpoTenantSettingsSetCommand, _SpoTenantSettingsSetCommand_instances = new WeakSet(), _SpoTenantSettingsSetCommand_initTelemetry = function _SpoTenantSettingsSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         const telemetryProps = {
             MinCompatibilityLevel: (!(!args.options.MinCompatibilityLevel)).toString(),
@@ -167,7 +167,7 @@ _SpoTenantSettingsSetCommand_instances = new WeakSet(), _SpoTenantSettingsSetCom
             AllowedDomainListForSyncClient: (!(!args.options.AllowedDomainListForSyncClient)).toString()
         };
         // add boolean values
-        SpoTenantSettingsSetCommand.booleanOptions.forEach(o => {
+        _a.booleanOptions.forEach(o => {
             const value = args.options[o];
             if (value !== undefined) {
                 telemetryProps[o] = value;
@@ -439,7 +439,7 @@ _SpoTenantSettingsSetCommand_instances = new WeakSet(), _SpoTenantSettingsSetCom
         return true;
     });
 }, _SpoTenantSettingsSetCommand_initTypes = function _SpoTenantSettingsSetCommand_initTypes() {
-    this.types.boolean.push(...SpoTenantSettingsSetCommand.booleanOptions);
+    this.types.boolean.push(..._a.booleanOptions);
 };
 SpoTenantSettingsSetCommand.booleanOptions = [
     'ExternalServicesEnabled',

package/dist/m365/spo/commands/term/term-get.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTermGetCommand_instances, _SpoTermGetCommand_initTelemetry, _SpoTermGetCommand_initOptions, _SpoTermGetCommand_initValidators, _SpoTermGetCommand_initOptionSets;
-import os from 'os';
+import { Cli } from '../../../../cli/Cli.js';
 import config from '../../../../config.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -52,12 +52,12 @@ class SpoTermGetCommand extends SpoCommand {
                     throw `Term with name '${args.options.name}' could not be found.`;
                 }
                 if (terms._Child_Items_.length > 1) {
-                    const disambiguationText = terms._Child_Items_.map(c => {
-                        return `- ${this.getTermId(c.Id)} - ${c.PathOfTerm}`;
-                    }).join(os.EOL);
-                    throw new Error(`Multiple terms with the specific term name found. Please disambiguate:${os.EOL}${disambiguationText}`);
+                    const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', terms._Child_Items_);
+                    term = await Cli.handleMultipleResultsFound(`Multiple terms with the specific term name found.`, resultAsKeyValuePair);
+                }
+                else {
+                    term = terms._Child_Items_[0];
                 }
-                term = terms._Child_Items_[0];
             }
             else {
                 term = csomResponse;

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-get.js

@@ -26,23 +26,23 @@ class SpoUserGetCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving information for list in site at ${args.options.webUrl}...`);
+            await logger.logToStderr(`Retrieving information for user in site '${args.options.webUrl}'...`);
         }
         let requestUrl = '';
         if (args.options.id) {
-            requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetById('${formatting.encodeQueryParameter(args.options.id)}')`;
+            requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetById('${formatting.encodeQueryParameter(args.options.id.toString())}')`;
         }
         else if (args.options.email) {
             requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByEmail('${formatting.encodeQueryParameter(args.options.email)}')`;
         }
-        else if (args.options.userName) {
-            requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${formatting.encodeQueryParameter(args.options.userName)}')`;
+        else if (args.options.loginName) {
+            requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${formatting.encodeQueryParameter(args.options.loginName)}')`;
         }
         const requestOptions = {
             url: requestUrl,
             method: 'GET',
             headers: {
-                'accept': 'application/json;odata=nometadata'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
@@ -58,9 +58,9 @@ class SpoUserGetCommand extends SpoCommand {
 _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry = function _SpoUserGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            email: (!(!args.options.email)).toString(),
-            userName: (!(!args.options.userName)).toString()
+            id: typeof args.options.id !== 'undefined',
+            email: typeof args.options.email !== 'undefined',
+            loginName: typeof args.options.loginName !== 'undefined'
         });
     });
 }, _SpoUserGetCommand_initOptions = function _SpoUserGetCommand_initOptions() {
@@ -71,7 +71,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
     }, {
         option: '--email [email]'
     }, {
-        option: '--userName [userName]'
+        option: '--loginName [loginName]'
     });
 }, _SpoUserGetCommand_initValidators = function _SpoUserGetCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -82,7 +82,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
         return validation.isValidSharePointUrl(args.options.webUrl);
     });
 }, _SpoUserGetCommand_initOptionSets = function _SpoUserGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'email', 'userName'] });
+    this.optionSets.push({ options: ['id', 'email', 'loginName'] });
 };
 export default new SpoUserGetCommand();
 //# sourceMappingURL=user-get.js.map

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) => {