@pnp/cli-microsoft365 6.11.0-beta.69fd6f4 → 6.11.0-beta.6b1d864

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

@@ -93,7 +93,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                         expectedWebTemplate = 'SITEPAGEPUBLISHING#0';
                         break;
                     case 'ClassicSite':
-                        expectedWebTemplate = args.options.webTemplate;
+                        expectedWebTemplate = args.options.webTemplate || 'STS#0';
                         break;
                     default:
                         throw `${args.options.type} is not a valid site type. Allowed types are TeamSite,CommunicationSite,ClassicSite`;
@@ -154,7 +154,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             };
             const validationResult = yield spoSiteAddCommand.validate({ options: options }, Cli_1.Cli.getCommandInfo(spoSiteAddCommand));
             if (validationResult !== true) {
-                return Promise.reject(validationResult);
+                throw validationResult;
             }
             return Cli_1.Cli.executeCommandWithOutput(spoSiteAddCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
         });
@@ -179,7 +179,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             };
             const validationResult = yield spoSiteSetCommand.validate({ options: options }, Cli_1.Cli.getCommandInfo(spoSiteSetCommand));
             if (validationResult !== true) {
-                return Promise.reject(validationResult);
+                throw validationResult;
             }
             return Cli_1.Cli.executeCommandWithOutput(spoSiteSetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
         });

package/dist/m365/spo/commands/site/site-hubsite-disconnect.js

@@ -37,28 +37,8 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const disconnectHubSite = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
-                    if (this.verbose) {
-                        logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hubsite...`);
-                    }
-                    const requestOptions = {
-                        url: `${args.options.siteUrl}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
-                        headers: {
-                            'X-RequestDigest': res.FormDigestValue,
-                            accept: 'application/json;odata=nometadata'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield disconnectHubSite();
+                yield this.disconnectHubSite(logger, args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -68,8 +48,30 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?`
                 });
                 if (result.continue) {
-                    yield disconnectHubSite();
+                    yield this.disconnectHubSite(logger, args);
+                }
+            }
+        });
+    }
+    disconnectHubSite(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
+                if (this.verbose) {
+                    logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hubsite...`);
                 }
+                const requestOptions = {
+                    url: `${args.options.siteUrl}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
+                    headers: {
+                        'X-RequestDigest': res.FormDigestValue,
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
         });
     }

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

@@ -58,43 +58,35 @@ class SpoSiteListCommand extends SpoCommand_1.default {
         });
     }
     getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, deleted, logger) {
-        return new Promise((resolve, reject) => {
-            spo_1.spo
-                .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
-                .then((res) => {
-                let requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="Filter" Type="String">${filter}</Property><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">${personalSite}</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">${webTemplate}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`;
-                if (deleted) {
-                    requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="5"><Query SelectAllProperties="true"><Properties><Property Name="NextStartIndexFromSharePoint" ScalarProperty="true" /></Properties></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="GetDeletedSitePropertiesFromSharePoint"><Parameters><Parameter Type="String">${startIndex}</Parameter></Parameters></Method></ObjectPaths></Request>`;
-                }
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': res.FormDigestValue
-                    },
-                    data: requestBody
-                };
-                return request_1.default.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();
-                    }
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield spo_1.spo.ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug);
+            let requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="Filter" Type="String">${filter}</Property><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">${personalSite}</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">${webTemplate}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`;
+            if (deleted) {
+                requestBody = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="5"><Query SelectAllProperties="true"><Properties><Property Name="NextStartIndexFromSharePoint" ScalarProperty="true" /></Properties></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="GetDeletedSitePropertiesFromSharePoint"><Parameters><Parameter Type="String">${startIndex}</Parameter></Parameters></Method></ObjectPaths></Request>`;
+            }
+            const requestOptions = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': res.FormDigestValue
+                },
+                data: requestBody
+            };
+            const res1 = yield request_1.default.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) {
+                    yield this.getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, personalSite, webTemplate, formDigest, deleted, logger);
                 }
-            }, err => reject(err));
+                return;
+            }
         });
     }
     getWebTemplateId(options) {

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

@@ -28,6 +28,7 @@ const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SharingCapabilities_1 = require("../site/SharingCapabilities");
 const spoSiteDesignApplyCommand = require("../sitedesign/sitedesign-apply");
+const FlowsPolicy_1 = require("./FlowsPolicy");
 class SpoSiteSetCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.SITE_SET;
@@ -310,33 +311,32 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         });
     }
     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);
-        }
-        let updatedProperties = false;
-        for (let i = 0; i < properties.length; i++) {
-            if (typeof args.options[properties[i]] !== 'undefined') {
-                updatedProperties = true;
-                break;
+        return __awaiter(this, void 0, void 0, function* () {
+            const isGroupConnectedSite = this.isGroupConnectedSite();
+            const sharedProperties = ['classification', 'disableFlows', 'socialBarOnSitePagesDisabled', 'shareByEmailEnabled', 'sharingCapability', 'noScriptSite'];
+            const siteProperties = ['title', 'resourceQuota', 'resourceQuotaWarningLevel', 'storageQuota', 'storageQuotaWarningLevel', 'allowSelfServiceUpgrade'];
+            let properties = sharedProperties;
+            if (!isGroupConnectedSite) {
+                properties = properties.concat(siteProperties);
             }
-        }
-        if (!updatedProperties) {
-            return Promise.resolve(undefined);
-        }
-        return spo_1.spo
-            .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
-            .then(res => {
+            let updatedProperties = false;
+            for (let i = 0; i < properties.length; i++) {
+                if (typeof args.options[properties[i]] !== 'undefined') {
+                    updatedProperties = true;
+                    break;
+                }
+            }
+            if (!updatedProperties) {
+                return Promise.resolve(undefined);
+            }
+            const res = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
             this.context = res;
             if (this.verbose) {
                 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_1.formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
@@ -353,39 +353,52 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 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') {
+                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') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.classification)}</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>`);
+                sitePropertiesPayload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.classification)}</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.disableFlows !== undefined) {
+                const flowsPolicy = args.options.disableFlows ? FlowsPolicy_1.FlowsPolicy.Disabled : FlowsPolicy_1.FlowsPolicy.Enabled;
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Enum">${flowsPolicy}</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.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_1.SharingCapabilities[args.options.sharingCapability];
                 payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SharingCapability"><Parameter Type="Enum">${sharingCapability}</Parameter></SetProperty>`);
             }
-            if (typeof args.options.noScriptSite !== 'undefined') {
+            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>`);
             }
-            const pos = this.tenantId.indexOf('|') + 1;
-            const requestOptions = {
-                url: `${this.spoAdminUrl}/_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_1.default.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_1.formatting.encodeQueryParameter(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
+            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_1.default.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 = yield request_1.default.post(requestOptions);
+            }
+            if (payload.length > 0) {
+                const pos = this.tenantId.indexOf('|') + 1;
+                const requestOptions = {
+                    url: `${this.spoAdminUrl}/_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_1.default.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_1.formatting.encodeQueryParameter(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
+                };
+                response = yield request_1.default.post(requestOptions);
+            }
+            return response || sitePropertiesResponse;
         });
     }
     applySiteDesign(logger, args) {

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

@@ -35,30 +35,8 @@ class SpoThemeRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeTheme = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                    if (this.verbose) {
-                        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'
-                    };
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeTheme();
+                yield this.removeTheme(logger, args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -68,8 +46,32 @@ class SpoThemeRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the theme`
                 });
                 if (result.continue) {
-                    yield removeTheme();
+                    yield this.removeTheme(logger, args.options);
+                }
+            }
+        });
+    }
+    removeTheme(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                if (this.verbose) {
+                    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'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
         });
     }

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

@@ -61,7 +61,6 @@ class SpoThemeSetCommand extends SpoCommand_1.default {
                 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

@@ -38,33 +38,8 @@ class SpoUserRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeUser = () => __awaiter(this, void 0, void 0, function* () {
-                if (this.verbose) {
-                    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_1.formatting.encodeQueryParameter(args.options.loginName)}')`;
-                }
-                const requestOptions = {
-                    url: requestUrl,
-                    headers: {
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                try {
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeUser();
+                yield this.removeUser(logger, args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -74,11 +49,38 @@ class SpoUserRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove specified user from the site ${args.options.webUrl}`
                 });
                 if (result.continue) {
-                    yield removeUser();
+                    yield this.removeUser(logger, args.options);
                 }
             }
         });
     }
+    removeUser(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                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_1.formatting.encodeQueryParameter(options.loginName)}')`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.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

@@ -80,8 +80,8 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
         });
     }
     reindexLists(webUrl, requestDigest, logger, webIdentityResp) {
-        return new Promise((resolve, reject) => {
-            (() => {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
                 if (this.debug) {
                     logger.logToStderr(`Retrieving information about lists...`);
                 }
@@ -92,36 +92,33 @@ class SpoWebReindexCommand extends SpoCommand_1.default {
                     },
                     responseType: 'json'
                 };
-                return request_1.default.get(requestOptions);
-            })()
-                .then((lists) => {
+                const lists = yield request_1.default.get(requestOptions);
                 const promises = lists.value.map(l => this.reindexList(l, webUrl, requestDigest, webIdentityResp, logger));
-                return Promise.all(promises);
-            })
-                .then(() => {
-                resolve();
-            }, (err) => reject(err));
+                yield Promise.all(promises);
+            }
+            catch (err) {
+                throw err;
+            }
         });
     }
     reindexList(list, webUrl, requestDigest, webIdentityResp, logger) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (list.NoCrawl) {
                 if (this.debug) {
                     logger.logToStderr(`List ${list.Title} is excluded from crawling`);
                 }
-                resolve();
                 return;
             }
-            spo_1.spo
-                .getFolderIdentity(webIdentityResp.objectIdentity, webUrl, list.RootFolder.ServerRelativeUrl, requestDigest)
-                .then((folderIdentityResp) => {
+            try {
+                const folderIdentityResp = yield spo_1.spo.getFolderIdentity(webIdentityResp.objectIdentity, webUrl, list.RootFolder.ServerRelativeUrl, requestDigest);
                 let searchversion = list.RootFolder.Properties.vti_x005f_searchversion || 0;
                 searchversion++;
-                return propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchversion.toString(), webUrl, requestDigest, folderIdentityResp, logger, this.debug, list.RootFolder.ServerRelativeUrl);
-            })
-                .then(() => {
-                resolve();
-            }, (err) => reject(err));
+                yield propertybag_base_1.SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchversion.toString(), webUrl, requestDigest, folderIdentityResp, logger, this.debug, list.RootFolder.ServerRelativeUrl);
+                return;
+            }
+            catch (err) {
+                throw (err);
+            }
         });
     }
 }

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

@@ -36,27 +36,8 @@ class SpoWebRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeWeb = () => __awaiter(this, void 0, void 0, function* () {
-                const requestOptions = {
-                    url: `${encodeURI(args.options.url)}/_api/web`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata',
-                        'X-HTTP-Method': 'DELETE'
-                    },
-                    responseType: 'json'
-                };
-                if (this.verbose) {
-                    logger.logToStderr(`Deleting subsite ${args.options.url} ...`);
-                }
-                try {
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeWeb();
+                yield this.removeWeb(logger, args.options.url);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -66,11 +47,32 @@ class SpoWebRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the subsite ${args.options.url}`
                 });
                 if (result.continue) {
-                    yield removeWeb();
+                    yield this.removeWeb(logger, args.options.url);
                 }
             }
         });
     }
+    removeWeb(logger, url) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${encodeURI(url)}/_api/web`,
+                headers: {
+                    accept: 'application/json;odata=nometadata',
+                    'X-HTTP-Method': 'DELETE'
+                },
+                responseType: 'json'
+            };
+            if (this.verbose) {
+                logger.logToStderr(`Deleting subsite ${url} ...`);
+            }
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoWebRemoveCommand_instances = new WeakSet(), _SpoWebRemoveCommand_initTelemetry = function _SpoWebRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {