@pnp/cli-microsoft365 6.0.0-beta.a644c64 → 6.0.0-beta.b689fd4

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

@@ -10,7 +10,6 @@ const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SharingCapabilities_1 = require("../site/SharingCapabilities");
 const spoSiteDesignApplyCommand = require("../sitedesign/sitedesign-apply");
-const spoSiteClassicSetCommand = require("./site-classic-set");
 class SpoSiteSetCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.SITE_SET;
@@ -30,29 +29,44 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         telemetryProps.siteDesignId = typeof args.options.siteDesignId !== undefined;
         telemetryProps.sharingCapabilities = args.options.sharingCapability;
         telemetryProps.siteLogoUrl = typeof args.options.siteLogoUrl !== 'undefined';
+        telemetryProps.resourceQuota = args.options.resourceQuota;
+        telemetryProps.resourceQuotaWarningLevel = args.options.resourceQuotaWarningLevel;
+        telemetryProps.storageQuota = args.options.storageQuota;
+        telemetryProps.storageQuotaWarningLevel = args.options.storageQuotaWarningLevel;
+        telemetryProps.allowSelfServiceUpgrade = args.options.allowSelfServiceUpgrade;
+        telemetryProps.lockState = args.options.lockState;
+        telemetryProps.noScriptSite = args.options.noScriptSite;
+        telemetryProps.wait = args.options.wait === true;
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        this
-            .loadSiteIds(args.options.url, logger)
-            .then(() => {
-            if (this.groupId === '00000000-0000-0000-0000-000000000000') {
-                if (this.debug) {
-                    logger.logToStderr('Site is not groupified');
-                }
-                return this.updateSite(logger, args);
-            }
-            else {
-                if (this.debug) {
-                    logger.logToStderr(`Site attached to group ${this.groupId}`);
-                }
-                return this.updateGroupifiedSite(logger, args);
-            }
+        this.dots = '';
+        utils_1.spo
+            .getTenantId(logger, this.debug)
+            .then((_tenantId) => {
+            this.tenantId = _tenantId;
+            return utils_1.spo.getSpoAdminUrl(logger, this.debug);
+        })
+            .then(spoAdminUrl => {
+            this.spoAdminUrl = spoAdminUrl;
+            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
         })
-            .then(() => this.updateSharedProperties(logger, args))
-            .then(() => this.applySiteDesign(logger, args))
-            .then(() => this.setSharingCapabilities(logger, args))
-            .then(() => this.setLogo(logger, args))
+            .then(formDigestInfo => {
+            this.context = formDigestInfo;
+            return Promise.resolve();
+        })
+            .then(_ => this.loadSiteIds(args.options.url, logger))
+            .then(_ => {
+            return this.isGroupConnectedSite()
+                ? this.updateGroupConnectedSite(logger, args)
+                : this.updateSharePointOnlySite(logger, args);
+        })
+            .then(_ => this.updateSiteProperties(logger, args))
+            .then(res => this.waitForSiteUpdateCompletion(logger, args, res))
+            .then(_ => this.applySiteDesign(logger, args))
+            .then(_ => this.setLogo(logger, args))
+            .then(_ => this.updateSiteLockState(logger, args))
+            .then(res => this.waitForSiteUpdateCompletion(logger, args, res))
             .then(_ => cb(), (err) => {
             if (err instanceof Command_1.CommandError) {
                 err = err.message;
@@ -80,27 +94,135 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         };
         return request_1.default.post(requestOptions);
     }
-    updateSite(logger, args) {
+    updateSharePointOnlySite(logger, args) {
+        if (this.debug) {
+            logger.logToStderr('Site is not group connected');
+        }
         if (typeof args.options.isPublic !== 'undefined') {
             return Promise.reject(`The isPublic option can't be set on a site that is not groupified`);
         }
-        if (!args.options.title &&
-            !args.options.owners &&
-            !args.options.description) {
+        return this.updateSiteDescription(logger, args)
+            .then(_ => this.updateSiteOwners(logger, args));
+    }
+    waitForSiteUpdateCompletion(logger, args, res) {
+        return new Promise((resolve, reject) => {
+            if (!res) {
+                resolve();
+                return;
+            }
+            const json = JSON.parse(res);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                reject(response.ErrorInfo.ErrorMessage);
+            }
+            else {
+                const operation = json[json.length - 1];
+                const isComplete = operation.IsComplete;
+                if (!args.options.wait || isComplete) {
+                    resolve();
+                    return;
+                }
+                setTimeout(() => {
+                    utils_1.spo.waitUntilFinished({
+                        operationId: JSON.stringify(operation._ObjectIdentity_),
+                        siteUrl: this.spoAdminUrl,
+                        resolve,
+                        reject,
+                        logger,
+                        currentContext: this.context,
+                        dots: this.dots,
+                        debug: this.debug,
+                        verbose: this.verbose
+                    });
+                }, operation.PollingInterval);
+            }
+        });
+    }
+    updateSiteOwners(logger, args) {
+        if (!args.options.owners) {
             return Promise.resolve();
         }
-        const options = {
-            url: args.options.url,
-            title: args.options.title,
-            description: args.options.description,
-            owners: args.options.owners,
-            wait: true,
-            debug: this.debug,
-            verbose: this.verbose
+        return new Promise((resolve, reject) => {
+            if (this.verbose) {
+                logger.logToStderr(`Updating site owners ${args.options.url}...`);
+            }
+            Promise.all(args.options.owners.split(',').map(o => {
+                return this.setAdmin(args.options.url, o.trim());
+            }))
+                .then(() => {
+                resolve();
+            }, (err) => {
+                reject(err);
+            });
+        });
+    }
+    setAdmin(siteUrl, principal) {
+        return new Promise((resolve, reject) => {
+            const requestOptions = {
+                url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.context.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><ObjectPath Id="48" ObjectPathId="47" /></Actions><ObjectPaths><Method Id="47" ParentId="34" Name="SetSiteAdmin"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(siteUrl)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(principal)}</Parameter><Parameter Type="Boolean">true</Parameter></Parameters></Method><Constructor Id="34" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+            };
+            return request_1.default.post(requestOptions)
+                .then((res) => {
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    reject(response.ErrorInfo.ErrorMessage);
+                }
+                else {
+                    resolve();
+                }
+            }, (err) => {
+                reject(err);
+            });
+        });
+    }
+    updateSiteDescription(logger, args) {
+        if (!args.options.description) {
+            return Promise.resolve(undefined);
+        }
+        if (this.verbose) {
+            logger.logToStderr(`Setting site description ${args.options.url}...`);
+        }
+        const requestOptions = {
+            url: `${args.options.url}/_api/web`,
+            headers: {
+                'IF-MATCH': '*',
+                'Accept': 'application/json;odata=nometadata',
+                'content-type': 'application/json;odata=nometadata',
+                'X-RequestDigest': this.context.FormDigestValue,
+                'X-HTTP-Method': 'MERGE'
+            },
+            data: {
+                Description: args.options.description
+            },
+            json: true
+        };
+        return request_1.default.post(requestOptions);
+    }
+    updateSiteLockState(logger, args) {
+        if (!args.options.lockState) {
+            return Promise.resolve(undefined);
+        }
+        if (this.verbose) {
+            logger.logToStderr(`Setting site lock state ${args.options.url}...`);
+        }
+        const requestOptions = {
+            url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': this.context.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><SetProperty Id="7" ObjectPathId="5" Name="LockState"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.lockState)}</Parameter></SetProperty><ObjectPath Id="9" ObjectPathId="8" /><ObjectIdentityQuery Id="10" ObjectPathId="5" /><Query Id="11" ObjectPathId="8"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="5" ParentId="3" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method><Method Id="8" ParentId="5" Name="Update" /><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
         };
-        return cli_1.Cli.executeCommand(spoSiteClassicSetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return request_1.default.post(requestOptions);
     }
-    updateGroupifiedSite(logger, args) {
+    updateGroupConnectedSite(logger, args) {
+        if (this.debug) {
+            logger.logToStderr(`Site attached to group ${this.groupId}`);
+        }
         return new Promise((resolve, reject) => {
             if (typeof args.options.title === 'undefined' &&
                 typeof args.options.description === 'undefined' &&
@@ -108,32 +230,23 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 typeof args.options.owners === 'undefined') {
                 return resolve();
             }
-            let spoAdminUrl;
             const promises = [];
             if (typeof args.options.title !== 'undefined') {
-                promises.push(utils_1.spo
-                    .getSpoAdminUrl(logger, this.debug)
-                    .then((_spoAdminUrl) => {
-                    spoAdminUrl = _spoAdminUrl;
-                    return utils_1.spo.getRequestDigest(spoAdminUrl);
-                })
-                    .then((formDigest) => {
-                    const requestOptions = {
-                        url: `${spoAdminUrl}/_api/SPOGroup/UpdateGroupPropertiesBySiteId`,
-                        headers: {
-                            accept: 'application/json;odata=nometadata',
-                            'content-type': 'application/json;charset=utf-8',
-                            'X-RequestDigest': formDigest.FormDigestValue
-                        },
-                        data: {
-                            groupId: this.groupId,
-                            siteId: this.siteId,
-                            displayName: args.options.title
-                        },
-                        responseType: 'json'
-                    };
-                    return request_1.default.post(requestOptions);
-                }));
+                const requestOptions = {
+                    url: `${this.spoAdminUrl}/_api/SPOGroup/UpdateGroupPropertiesBySiteId`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata',
+                        'content-type': 'application/json;charset=utf-8',
+                        'X-RequestDigest': this.context.FormDigestValue
+                    },
+                    data: {
+                        groupId: this.groupId,
+                        siteId: this.siteId,
+                        displayName: args.options.title
+                    },
+                    responseType: 'json'
+                };
+                promises.push(request_1.default.post(requestOptions));
             }
             if (typeof args.options.isPublic !== 'undefined') {
                 const commandOptions = {
@@ -177,27 +290,21 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         if (this.verbose) {
             logger.logToStderr('Retrieving user information to set group owners...');
         }
-        let spoAdminUrl;
-        return utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            const requestOptions = {
-                url: `https://graph.microsoft.com/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
-                headers: {
-                    'content-type': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
+        const requestOptions = {
+            url: `https://graph.microsoft.com/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
+            headers: {
+                'content-type': 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default.get(requestOptions)
             .then((res) => {
             if (res.value.length === 0) {
                 return Promise.resolve();
             }
             return Promise.all(res.value.map(user => {
                 const requestOptions = {
-                    url: `${spoAdminUrl}/_api/SP.Directory.DirectorySession/Group('${this.groupId}')/Owners/Add(objectId='${user.id}', principalName='')`,
+                    url: `${this.spoAdminUrl}/_api/SP.Directory.DirectorySession/Group('${this.groupId}')/Owners/Add(objectId='${user.id}', principalName='')`,
                     headers: {
                         'content-type': 'application/json;odata=verbose'
                     }
@@ -206,55 +313,80 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             }));
         });
     }
-    updateSharedProperties(logger, args) {
-        if (typeof args.options.classification === 'undefined' &&
-            typeof args.options.disableFlows === 'undefined' &&
-            typeof args.options.shareByEmailEnabled === 'undefined') {
-            return Promise.resolve();
+    updateSiteProperties(logger, args) {
+        const isGroupConnectedSite = this.isGroupConnectedSite();
+        const sharedProperties = ['classification', 'disableFlows', 'shareByEmailEnabled', 'sharingCapability', 'noScriptSite'];
+        const siteProperties = ['title', 'resourceQuota', 'resourceQuotaWarningLevel', 'storageQuota', 'storageQuotaWarningLevel', 'allowSelfServiceUpgrade'];
+        let properties = sharedProperties;
+        properties = properties;
+        if (!isGroupConnectedSite) {
+            properties = properties.concat(siteProperties);
         }
-        return new Promise((resolve, reject) => {
+        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);
+        }
+        return utils_1.spo
+            .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
+            .then(res => {
+            this.context = res;
             if (this.verbose) {
-                logger.logToStderr(`Retrieving request digest...`);
+                logger.logToStderr(`Updating site ${args.options.url} properties...`);
             }
-            utils_1.spo
-                .getRequestDigest(args.options.url)
-                .then((res) => {
-                if (this.verbose) {
-                    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">${utils_1.formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
                 }
-                let propertyId = 27;
-                const payload = [];
-                if (typeof args.options.classification === 'string') {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.classification)}</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.disableFlows === 'string') {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Boolean">${args.options.disableFlows === 'true'}</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 === 'string') {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="ShareByEmailEnabled"><Parameter Type="Boolean">${args.options.shareByEmailEnabled === 'true'}</Parameter></SetProperty>`);
+                if (args.options.storageQuota) {
+                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageMaximumLevel"><Parameter Type="Int64">${args.options.storageQuota}</Parameter></SetProperty>`);
                 }
-                // update site via the Site object
-                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>${payload.join('')}</Actions><ObjectPaths><Identity Id="5" Name="e10a459e-60c8-4000-8240-a68d6a12d39e|740c6a0b-85e2-48a0-a494-e0f1759d4aa7:site:${this.siteId}" /></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
+                if (args.options.storageQuotaWarningLevel) {
+                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageWarningLevel"><Parameter Type="Int64">${args.options.storageQuotaWarningLevel}</Parameter></SetProperty>`);
                 }
-                else {
-                    resolve();
+                if (typeof args.options.allowSelfServiceUpgrade !== 'undefined') {
+                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="AllowSelfServiceUpgrade"><Parameter Type="Boolean">${args.options.allowSelfServiceUpgrade}</Parameter></SetProperty>`);
                 }
-            }, (err) => {
-                reject(err);
-            });
+            }
+            if (typeof args.options.classification === 'string') {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.classification)}</Parameter></SetProperty>`);
+            }
+            if (typeof args.options.disableFlows === 'string') {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Boolean">${args.options.disableFlows === 'true'}</Parameter></SetProperty>`);
+            }
+            if (typeof args.options.shareByEmailEnabled === 'string') {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="ShareByEmailEnabled"><Parameter Type="Boolean">${args.options.shareByEmailEnabled === 'true'}</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') {
+                const noScriptSite = args.options.noScriptSite === 'true' ? 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;${encodeURIComponent(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
+            };
+            return request_1.default.post(requestOptions);
         });
     }
     applySiteDesign(logger, args) {
@@ -270,48 +402,6 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         };
         return cli_1.Cli.executeCommand(spoSiteDesignApplyCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
     }
-    setSharingCapabilities(logger, args) {
-        if (typeof args.options.sharingCapability === 'undefined') {
-            return Promise.resolve();
-        }
-        return new Promise((resolve, reject) => {
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving request digest...`);
-            }
-            const sharingCapability = SharingCapabilities_1.SharingCapabilities[args.options.sharingCapability];
-            utils_1.spo
-                .getSpoAdminUrl(logger, this.debug)
-                .then((_spoAdminUrl) => {
-                this.spoAdminUrl = _spoAdminUrl;
-                return utils_1.spo.getRequestDigest(this.spoAdminUrl);
-            })
-                .then((res) => {
-                if (this.verbose) {
-                    logger.logToStderr(`Setting sharing for site  ${args.options.url} as ${args.options.sharingCapability}`);
-                }
-                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><ObjectPath Id="2" ObjectPathId="1"/><ObjectPath Id="4" ObjectPathId="3"/><SetProperty Id="5" ObjectPathId="3" Name="SharingCapability"><Parameter Type="Enum">${sharingCapability}</Parameter></SetProperty><ObjectPath Id="7" ObjectPathId="6"/><ObjectIdentityQuery Id="8" ObjectPathId="3"/></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}"/><Method Id="3" ParentId="1" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method><Method Id="6" ParentId="3" Name="Update"/></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                }
-                else {
-                    resolve();
-                }
-            }, (err) => {
-                reject(err);
-            });
-        });
-    }
     loadSiteIds(siteUrl, logger) {
         if (this.debug) {
             logger.logToStderr('Loading site IDs...');
@@ -334,6 +424,9 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             return Promise.resolve();
         });
     }
+    isGroupConnectedSite() {
+        return this.groupId !== '00000000-0000-0000-0000-000000000000';
+    }
     /**
      * Maps the base sharingCapability enum to string array so it can
      * more easily be used in validation or descriptions.
@@ -385,6 +478,31 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             {
                 option: '--sharingCapability [sharingCapability]',
                 autocomplete: this.sharingCapabilities
+            },
+            {
+                option: '--resourceQuota [resourceQuota]'
+            },
+            {
+                option: '--resourceQuotaWarningLevel [resourceQuotaWarningLevel]'
+            },
+            {
+                option: '--storageQuota [storageQuota]'
+            },
+            {
+                option: '--storageQuotaWarningLevel [storageQuotaWarningLevel]'
+            },
+            {
+                option: '--allowSelfServiceUpgrade [allowSelfServiceUpgrade]'
+            },
+            {
+                option: '--lockState [lockState]',
+                autocomplete: ['Unlock', 'NoAdditions', 'ReadOnly', 'NoAccess']
+            },
+            {
+                option: '--noScriptSite [noScriptSite]'
+            },
+            {
+                option: '--wait'
             }
         ];
         const parentOptions = super.options();
@@ -404,25 +522,29 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             typeof args.options.shareByEmailEnabled === 'undefined' &&
             typeof args.options.siteDesignId === 'undefined' &&
             typeof args.options.sharingCapability === 'undefined' &&
-            typeof args.options.siteLogoUrl === 'undefined') {
+            typeof args.options.siteLogoUrl === 'undefined' &&
+            typeof args.options.resourceQuota === 'undefined' &&
+            typeof args.options.resourceQuotaWarningLevel === 'undefined' &&
+            typeof args.options.storageQuota === 'undefined' &&
+            typeof args.options.storageQuotaWarningLevel === 'undefined' &&
+            typeof args.options.noScriptSite === 'undefined' &&
+            typeof args.options.allowSelfServiceUpgrade === 'undefined' &&
+            typeof args.options.lockState === 'undefined') {
             return 'Specify at least one property to update';
         }
         if (typeof args.options.siteLogoUrl !== 'undefined' && typeof args.options.siteLogoUrl !== 'string') {
             return `${args.options.siteLogoUrl} is not a valid value for the siteLogoUrl option. Specify the logo URL or an empty string "" to unset the logo.`;
         }
         if (typeof args.options.disableFlows === 'string' &&
-            args.options.disableFlows !== 'true' &&
-            args.options.disableFlows !== 'false') {
+            !utils_1.validation.isValidBoolean(args.options.disableFlows)) {
             return `${args.options.disableFlows} is not a valid value for the disableFlow option. Allowed values are true|false`;
         }
         if (typeof args.options.isPublic === 'string' &&
-            args.options.isPublic !== 'true' &&
-            args.options.isPublic !== 'false') {
+            !utils_1.validation.isValidBoolean(args.options.isPublic)) {
             return `${args.options.isPublic} is not a valid value for the isPublic option. Allowed values are true|false`;
         }
         if (typeof args.options.shareByEmailEnabled === 'string' &&
-            args.options.shareByEmailEnabled !== 'true' &&
-            args.options.shareByEmailEnabled !== 'false') {
+            !utils_1.validation.isValidBoolean(args.options.shareByEmailEnabled)) {
             return `${args.options.shareByEmailEnabled} is not a valid value for the shareByEmailEnabled option. Allowed values are true|false`;
         }
         if (args.options.siteDesignId) {
@@ -434,6 +556,44 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             this.sharingCapabilities.indexOf(args.options.sharingCapability) < 0) {
             return `${args.options.sharingCapability} is not a valid value for the sharingCapability option. Allowed values are ${this.sharingCapabilities.join('|')}`;
         }
+        if (args.options.resourceQuota &&
+            typeof args.options.resourceQuota !== 'number') {
+            return `${args.options.resourceQuota} is not a number`;
+        }
+        if (args.options.resourceQuotaWarningLevel &&
+            typeof args.options.resourceQuotaWarningLevel !== 'number') {
+            return `${args.options.resourceQuotaWarningLevel} is not a number`;
+        }
+        if (args.options.resourceQuota &&
+            args.options.resourceQuotaWarningLevel &&
+            args.options.resourceQuotaWarningLevel > args.options.resourceQuota) {
+            return `resourceQuotaWarningLevel must not exceed the resourceQuota`;
+        }
+        if (args.options.storageQuota &&
+            typeof args.options.storageQuota !== 'number') {
+            return `${args.options.storageQuota} is not a number`;
+        }
+        if (args.options.storageQuotaWarningLevel &&
+            typeof args.options.storageQuotaWarningLevel !== 'number') {
+            return `${args.options.storageQuotaWarningLevel} is not a number`;
+        }
+        if (args.options.storageQuota &&
+            args.options.storageQuotaWarningLevel &&
+            args.options.storageQuotaWarningLevel > args.options.storageQuota) {
+            return `storageQuotaWarningLevel must not exceed the storageQuota`;
+        }
+        if (args.options.allowSelfServiceUpgrade &&
+            !utils_1.validation.isValidBoolean(args.options.allowSelfServiceUpgrade)) {
+            return `${args.options.allowSelfServiceUpgrade} is not a valid boolean value`;
+        }
+        if (args.options.lockState &&
+            ['Unlock', 'NoAdditions', 'ReadOnly', 'NoAccess'].indexOf(args.options.lockState) === -1) {
+            return `${args.options.lockState} is not a valid value for the lockState option. Allowed values Unlock|NoAdditions|ReadOnly|NoAccess`;
+        }
+        if (args.options.noScriptSite &&
+            !utils_1.validation.isValidBoolean(args.options.noScriptSite)) {
+            return `${args.options.noScriptSite} is not a valid boolean value`;
+        }
         return true;
     }
     types() {