@pnp/cli-microsoft365 7.0.0-beta.86298a0 → 7.0.0-beta.91336b8

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

@@ -1,36 +1,26 @@
-"use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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 _SpoSiteSetCommand_instances, _SpoSiteSetCommand_initTelemetry, _SpoSiteSetCommand_initOptions, _SpoSiteSetCommand_initValidators, _SpoSiteSetCommand_initTypes;
-Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
-const Command_1 = require("../../../../Command");
-const config_1 = require("../../../../config");
-const request_1 = require("../../../../request");
-const formatting_1 = require("../../../../utils/formatting");
-const spo_1 = require("../../../../utils/spo");
-const urlUtil_1 = require("../../../../utils/urlUtil");
-const validation_1 = require("../../../../utils/validation");
-const aadO365GroupSetCommand = require("../../../aad/commands/o365group/o365group-set");
-const SpoCommand_1 = require("../../../base/SpoCommand");
-const commands_1 = require("../../commands");
-const SharingCapabilities_1 = require("../site/SharingCapabilities");
-const spoSiteDesignApplyCommand = require("../sitedesign/sitedesign-apply");
-class SpoSiteSetCommand extends SpoCommand_1.default {
+import { Cli } from '../../../../cli/Cli.js';
+import { CommandError } from '../../../../Command.js';
+import config from '../../../../config.js';
+import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
+import { urlUtil } from '../../../../utils/urlUtil.js';
+import { validation } from '../../../../utils/validation.js';
+import aadM365GroupSetCommand from '../../../aad/commands/m365group/m365group-set.js';
+import SpoCommand from '../../../base/SpoCommand.js';
+import commands from '../../commands.js';
+import { SharingCapabilities } from '../site/SharingCapabilities.js';
+import spoSiteDesignApplyCommand from '../sitedesign/sitedesign-apply.js';
+import { FlowsPolicy } from './FlowsPolicy.js';
+class SpoSiteSetCommand extends SpoCommand {
     get name() {
-        return commands_1.default.SITE_SET;
+        return commands.SITE_SET;
     }
     get description() {
         return 'Updates properties of the specified site';
@@ -43,42 +33,40 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteSetCommand_instances, "m", _SpoSiteSetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoSiteSetCommand_instances, "m", _SpoSiteSetCommand_initTypes).call(this);
     }
-    commandAction(logger, args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            try {
-                this.tenantId = yield spo_1.spo.getTenantId(logger, this.debug);
-                this.spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-                yield this.loadSiteIds(args.options.url, logger);
-                if (this.isGroupConnectedSite()) {
-                    yield this.updateGroupConnectedSite(logger, args);
-                }
-                else {
-                    yield this.updateSharePointOnlySite(logger, args);
-                }
-                const siteProps = yield this.updateSiteProperties(logger, args);
-                yield this.waitForSiteUpdateCompletion(logger, args, siteProps);
-                yield this.applySiteDesign(logger, args);
-                yield this.setLogo(logger, args);
-                const lockState = yield this.updateSiteLockState(logger, args);
-                yield this.waitForSiteUpdateCompletion(logger, args, lockState);
+    async commandAction(logger, args) {
+        try {
+            this.tenantId = await spo.getTenantId(logger, this.debug);
+            this.spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            await this.loadSiteIds(args.options.url, logger);
+            if (this.isGroupConnectedSite()) {
+                await this.updateGroupConnectedSite(logger, args);
             }
-            catch (err) {
-                if (err instanceof Command_1.CommandError) {
-                    err = err.message;
-                }
-                this.handleRejectedPromise(err);
+            else {
+                await this.updateSharePointOnlySite(logger, args);
             }
-        });
+            const siteProps = await this.updateSiteProperties(logger, args);
+            await this.waitForSiteUpdateCompletion(logger, args, siteProps);
+            await this.applySiteDesign(logger, args);
+            await this.setLogo(logger, args);
+            const lockState = await this.updateSiteLockState(logger, args);
+            await this.waitForSiteUpdateCompletion(logger, args, lockState);
+        }
+        catch (err) {
+            if (err instanceof CommandError) {
+                err = err.message;
+            }
+            this.handleRejectedPromise(err);
+        }
     }
-    setLogo(logger, args) {
+    async setLogo(logger, args) {
         if (typeof args.options.siteLogoUrl === 'undefined') {
             return Promise.resolve();
         }
         if (this.debug) {
-            logger.logToStderr(`Setting the site its logo...`);
+            await logger.logToStderr(`Setting the site its logo...`);
         }
-        const logoUrl = args.options.siteLogoUrl ? urlUtil_1.urlUtil.getServerRelativePath(args.options.url, args.options.siteLogoUrl) : "";
+        const logoUrl = args.options.siteLogoUrl ? urlUtil.getServerRelativePath(args.options.url, args.options.siteLogoUrl) : "";
         const requestOptions = {
             url: `${args.options.url}/_api/siteiconmanager/setsitelogo`,
             headers: {
@@ -89,99 +77,79 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             },
             responseType: 'json'
         };
-        return request_1.default.post(requestOptions);
+        return request.post(requestOptions);
     }
-    updateSharePointOnlySite(logger, args) {
+    async updateSharePointOnlySite(logger, args) {
         if (this.debug) {
-            logger.logToStderr('Site is not group connected');
+            await 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`);
+            throw `The isPublic option can't be set on a site that is not groupified`;
         }
-        return this.updateSiteDescription(logger, args)
-            .then(_ => this.updateSiteOwners(logger, args));
+        await this.updateSiteDescription(logger, args);
+        await 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(() => {
-                    spo_1.spo.waitUntilFinished({
-                        operationId: JSON.stringify(operation._ObjectIdentity_),
-                        siteUrl: this.spoAdminUrl,
-                        resolve,
-                        reject,
-                        logger,
-                        currentContext: this.context,
-                        debug: this.debug,
-                        verbose: this.verbose
-                    });
-                }, operation.PollingInterval);
-            }
+    async waitForSiteUpdateCompletion(logger, args, response) {
+        if (!response) {
+            return;
+        }
+        const json = JSON.parse(response);
+        const responseContent = json[0];
+        if (responseContent.ErrorInfo) {
+            throw responseContent.ErrorInfo.ErrorMessage;
+        }
+        const operation = json[json.length - 1];
+        const isComplete = operation.IsComplete;
+        if (!args.options.wait || isComplete) {
+            return;
+        }
+        await new Promise((resolve, reject) => {
+            setTimeout(() => {
+                spo.waitUntilFinished({
+                    operationId: JSON.stringify(operation._ObjectIdentity_),
+                    siteUrl: this.spoAdminUrl,
+                    resolve,
+                    reject,
+                    logger,
+                    currentContext: this.context,
+                    debug: this.debug,
+                    verbose: this.verbose
+                });
+            }, operation.PollingInterval);
         });
     }
-    updateSiteOwners(logger, args) {
+    async updateSiteOwners(logger, args) {
         if (!args.options.owners) {
-            return Promise.resolve();
+            return;
         }
-        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);
-            });
-        });
+        if (this.verbose) {
+            await logger.logToStderr(`Updating site owners ${args.options.url}...`);
+        }
+        await Promise.all(args.options.owners.split(',').map(o => {
+            return this.setAdmin(args.options.url, o.trim());
+        }));
     }
-    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">${formatting_1.formatting.escapeXml(siteUrl)}</Parameter><Parameter Type="String">${formatting_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);
-            });
-        });
+    async setAdmin(siteUrl, principal) {
+        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.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">${formatting.escapeXml(siteUrl)}</Parameter><Parameter Type="String">${formatting.escapeXml(principal)}</Parameter><Parameter Type="Boolean">true</Parameter></Parameters></Method><Constructor Id="34" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+        };
+        const response = await request.post(requestOptions);
+        const json = JSON.parse(response);
+        const responseContent = json[0];
+        if (responseContent.ErrorInfo) {
+            throw responseContent.ErrorInfo.ErrorMessage;
+        }
     }
-    updateSiteDescription(logger, args) {
+    async updateSiteDescription(logger, args) {
         if (!args.options.description) {
-            return Promise.resolve(undefined);
+            return;
         }
         if (this.verbose) {
-            logger.logToStderr(`Setting site description ${args.options.url}...`);
+            await logger.logToStderr(`Setting site description ${args.options.url}...`);
         }
         const requestOptions = {
             url: `${args.options.url}/_api/web`,
@@ -197,74 +165,66 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             },
             json: true
         };
-        return request_1.default.post(requestOptions);
+        await request.post(requestOptions);
     }
-    updateSiteLockState(logger, args) {
+    async updateSiteLockState(logger, args) {
         if (!args.options.lockState) {
-            return Promise.resolve(undefined);
+            return;
         }
         if (this.verbose) {
-            logger.logToStderr(`Setting site lock state ${args.options.url}...`);
+            await 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">${formatting_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">${formatting_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>`
+            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><SetProperty Id="7" ObjectPathId="5" Name="LockState"><Parameter Type="String">${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">${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 request_1.default.post(requestOptions);
+        return request.post(requestOptions);
     }
-    updateGroupConnectedSite(logger, args) {
+    async 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' &&
-                typeof args.options.isPublic === 'undefined' &&
-                typeof args.options.owners === 'undefined') {
-                return resolve();
-            }
-            const promises = [];
-            if (typeof args.options.title !== 'undefined') {
-                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 = {
-                    id: this.groupId,
-                    isPrivate: (args.options.isPublic === false),
-                    debug: this.debug,
-                    verbose: this.verbose
-                };
-                promises.push(Cli_1.Cli.executeCommand(aadO365GroupSetCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) }));
-            }
-            if (args.options.description) {
-                promises.push(this.setGroupifiedSiteDescription(args.options.description));
-            }
-            promises.push(this.setGroupifiedSiteOwners(logger, args));
-            Promise
-                .all(promises)
-                .then(() => {
-                resolve();
-            }, (error) => {
-                reject(error);
-            });
-        });
+            await logger.logToStderr(`Site attached to group ${this.groupId}`);
+        }
+        if (typeof args.options.title === 'undefined' &&
+            typeof args.options.description === 'undefined' &&
+            typeof args.options.isPublic === 'undefined' &&
+            typeof args.options.owners === 'undefined') {
+            return;
+        }
+        const promises = [];
+        if (typeof args.options.title !== 'undefined') {
+            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.post(requestOptions));
+        }
+        if (typeof args.options.isPublic !== 'undefined') {
+            const commandOptions = {
+                id: this.groupId,
+                isPrivate: (args.options.isPublic === false),
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            promises.push(Cli.executeCommand(aadM365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
+        }
+        if (args.options.description) {
+            promises.push(this.setGroupifiedSiteDescription(args.options.description));
+        }
+        promises.push(this.setGroupifiedSiteOwners(logger, args));
+        await Promise.all(promises);
     }
     setGroupifiedSiteDescription(description) {
         const requestOptions = {
@@ -276,15 +236,15 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 description: description
             }
         };
-        return request_1.default.patch(requestOptions);
+        return request.patch(requestOptions);
     }
-    setGroupifiedSiteOwners(logger, args) {
+    async setGroupifiedSiteOwners(logger, args) {
         if (typeof args.options.owners === 'undefined') {
-            return Promise.resolve();
+            return;
         }
         const owners = args.options.owners.split(',').map(o => o.trim());
         if (this.verbose) {
-            logger.logToStderr('Retrieving user information to set group owners...');
+            await logger.logToStderr('Retrieving user information to set group owners...');
         }
         const requestOptions = {
             url: `https://graph.microsoft.com/v1.0/users?$filter=${owners.map(o => `userPrincipalName eq '${o}'`).join(' or ')}&$select=id`,
@@ -293,28 +253,25 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             },
             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: `${this.spoAdminUrl}/_api/SP.Directory.DirectorySession/Group('${this.groupId}')/Owners/Add(objectId='${user.id}', principalName='')`,
-                    headers: {
-                        'content-type': 'application/json;odata=verbose'
-                    }
-                };
-                return request_1.default.post(requestOptions);
-            }));
-        });
+        const response = await request.get(requestOptions);
+        if (response.value.length === 0) {
+            return;
+        }
+        await Promise.all(response.value.map(user => {
+            const requestOptions = {
+                url: `${this.spoAdminUrl}/_api/SP.Directory.DirectorySession/Group('${this.groupId}')/Owners/Add(objectId='${user.id}', principalName='')`,
+                headers: {
+                    'content-type': 'application/json;odata=verbose'
+                }
+            };
+            return request.post(requestOptions);
+        }));
     }
-    updateSiteProperties(logger, args) {
+    async updateSiteProperties(logger, args) {
         const isGroupConnectedSite = this.isGroupConnectedSite();
         const sharedProperties = ['classification', 'disableFlows', 'socialBarOnSitePagesDisabled', 'shareByEmailEnabled', 'sharingCapability', 'noScriptSite'];
         const siteProperties = ['title', 'resourceQuota', 'resourceQuotaWarningLevel', 'storageQuota', 'storageQuotaWarningLevel', 'allowSelfServiceUpgrade'];
         let properties = sharedProperties;
-        properties = properties;
         if (!isGroupConnectedSite) {
             properties = properties.concat(siteProperties);
         }
@@ -326,71 +283,84 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             }
         }
         if (!updatedProperties) {
-            return Promise.resolve(undefined);
-        }
-        return spo_1.spo
-            .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
-            .then(res => {
-            this.context = 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">${formatting_1.formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
-                }
-                if (args.options.resourceQuota) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="UserCodeMaximumLevel"><Parameter Type="Double">${args.options.resourceQuota}</Parameter></SetProperty>`);
-                }
-                if (args.options.resourceQuotaWarningLevel) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="UserCodeWarningLevel"><Parameter Type="Double">${args.options.resourceQuotaWarningLevel}</Parameter></SetProperty>`);
-                }
-                if (args.options.storageQuota) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageMaximumLevel"><Parameter Type="Int64">${args.options.storageQuota}</Parameter></SetProperty>`);
-                }
-                if (args.options.storageQuotaWarningLevel) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageWarningLevel"><Parameter Type="Int64">${args.options.storageQuotaWarningLevel}</Parameter></SetProperty>`);
-                }
-                if (typeof args.options.allowSelfServiceUpgrade !== 'undefined') {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="AllowSelfServiceUpgrade"><Parameter Type="Boolean">${args.options.allowSelfServiceUpgrade}</Parameter></SetProperty>`);
-                }
-            }
-            if (typeof args.options.classification === 'string') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.classification)}</Parameter></SetProperty>`);
+            return;
+        }
+        this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+        if (this.verbose) {
+            await logger.logToStderr(`Updating site ${args.options.url} properties...`);
+        }
+        let propertyId = 27;
+        const payload = [];
+        const sitePropertiesPayload = [];
+        if (!isGroupConnectedSite) {
+            if (args.options.title) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Title"><Parameter Type="String">${formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
             }
-            if (typeof args.options.disableFlows !== 'undefined') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Boolean">${args.options.disableFlows}</Parameter></SetProperty>`);
+            if (args.options.resourceQuota) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="UserCodeMaximumLevel"><Parameter Type="Double">${args.options.resourceQuota}</Parameter></SetProperty>`);
             }
-            if (typeof args.options.socialBarOnSitePagesDisabled !== 'undefined') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SocialBarOnSitePagesDisabled"><Parameter Type="Boolean">${args.options.socialBarOnSitePagesDisabled}</Parameter></SetProperty>`);
+            if (args.options.resourceQuotaWarningLevel) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="UserCodeWarningLevel"><Parameter Type="Double">${args.options.resourceQuotaWarningLevel}</Parameter></SetProperty>`);
             }
-            if (typeof args.options.shareByEmailEnabled !== 'undefined') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="ShareByEmailEnabled"><Parameter Type="Boolean">${args.options.shareByEmailEnabled}</Parameter></SetProperty>`);
+            if (args.options.storageQuota) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageMaximumLevel"><Parameter Type="Int64">${args.options.storageQuota}</Parameter></SetProperty>`);
             }
-            if (args.options.sharingCapability) {
-                const sharingCapability = SharingCapabilities_1.SharingCapabilities[args.options.sharingCapability];
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SharingCapability"><Parameter Type="Enum">${sharingCapability}</Parameter></SetProperty>`);
+            if (args.options.storageQuotaWarningLevel) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageWarningLevel"><Parameter Type="Int64">${args.options.storageQuotaWarningLevel}</Parameter></SetProperty>`);
             }
-            if (typeof args.options.noScriptSite !== 'undefined') {
-                const noScriptSite = args.options.noScriptSite ? 2 : 1;
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DenyAddAndCustomizePages"><Parameter Type="Enum">${noScriptSite}</Parameter></SetProperty>`);
+            if (args.options.allowSelfServiceUpgrade !== undefined) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="AllowSelfServiceUpgrade"><Parameter Type="Boolean">${args.options.allowSelfServiceUpgrade}</Parameter></SetProperty>`);
             }
+        }
+        if (typeof args.options.classification === 'string') {
+            sitePropertiesPayload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${formatting.escapeXml(args.options.classification)}</Parameter></SetProperty>`);
+        }
+        if (args.options.disableFlows !== undefined) {
+            const flowsPolicy = args.options.disableFlows ? FlowsPolicy.Disabled : FlowsPolicy.Enabled;
+            payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Enum">${flowsPolicy}</Parameter></SetProperty>`);
+        }
+        if (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.shareByEmailEnabled !== undefined) {
+            sitePropertiesPayload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="ShareByEmailEnabled"><Parameter Type="Boolean">${args.options.shareByEmailEnabled}</Parameter></SetProperty>`);
+        }
+        if (args.options.sharingCapability) {
+            const sharingCapability = SharingCapabilities[args.options.sharingCapability];
+            payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SharingCapability"><Parameter Type="Enum">${sharingCapability}</Parameter></SetProperty>`);
+        }
+        if (args.options.noScriptSite !== undefined) {
+            const noScriptSite = args.options.noScriptSite ? 2 : 1;
+            payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DenyAddAndCustomizePages"><Parameter Type="Enum">${noScriptSite}</Parameter></SetProperty>`);
+        }
+        let response;
+        let sitePropertiesResponse;
+        if (sitePropertiesPayload.length > 0) {
+            const requestOptions = {
+                url: `${args.options.url}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.context.FormDigestValue
+                },
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${sitePropertiesPayload.join('')}</Actions><ObjectPaths><StaticProperty Id="1" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /><Property Id="5" ParentId="1" Name="Site" /></ObjectPaths></Request>`
+            };
+            sitePropertiesResponse = await request.post(requestOptions);
+        }
+        if (payload.length > 0) {
             const pos = this.tenantId.indexOf('|') + 1;
             const requestOptions = {
                 url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
-                    'X-RequestDigest': res.FormDigestValue
+                    '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>${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>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substr(pos, this.tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${formatting.encodeQueryParameter(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
             };
-            return request_1.default.post(requestOptions);
-        });
+            response = await request.post(requestOptions);
+        }
+        return response || sitePropertiesResponse;
     }
-    applySiteDesign(logger, args) {
+    async applySiteDesign(logger, args) {
         if (typeof args.options.siteDesignId === 'undefined') {
-            return Promise.resolve();
+            return;
         }
         const options = {
             webUrl: args.options.url,
@@ -399,11 +369,11 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli_1.Cli.executeCommand(spoSiteDesignApplyCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return Cli.executeCommand(spoSiteDesignApplyCommand, { options: { ...options, _: [] } });
     }
-    loadSiteIds(siteUrl, logger) {
+    async loadSiteIds(siteUrl, logger) {
         if (this.debug) {
-            logger.logToStderr('Loading site IDs...');
+            await logger.logToStderr('Loading site IDs...');
         }
         const requestOptions = {
             url: `${siteUrl}/_api/site?$select=GroupId,Id`,
@@ -412,16 +382,12 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             },
             responseType: 'json'
         };
-        return request_1.default
-            .get(requestOptions)
-            .then((siteInfo) => {
-            this.groupId = siteInfo.GroupId;
-            this.siteId = siteInfo.Id;
-            if (this.debug) {
-                logger.logToStderr(`Retrieved site IDs. siteId: ${this.siteId}, groupId: ${this.groupId}`);
-            }
-            return Promise.resolve();
-        });
+        const siteInfo = await request.get(requestOptions);
+        this.groupId = siteInfo.GroupId;
+        this.siteId = siteInfo.Id;
+        if (this.debug) {
+            await logger.logToStderr(`Retrieved site IDs. siteId: ${this.siteId}, groupId: ${this.groupId}`);
+        }
     }
     isGroupConnectedSite() {
         return this.groupId !== '00000000-0000-0000-0000-000000000000';
@@ -432,8 +398,8 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
      */
     get sharingCapabilities() {
         const result = [];
-        for (const sharingCapability in SharingCapabilities_1.SharingCapabilities) {
-            if (typeof SharingCapabilities_1.SharingCapabilities[sharingCapability] === 'number') {
+        for (const sharingCapability in SharingCapabilities) {
+            if (typeof SharingCapabilities[sharingCapability] === 'number') {
                 result.push(sharingCapability);
             }
         }
@@ -517,8 +483,8 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
         option: '--wait'
     });
 }, _SpoSiteSetCommand_initValidators = function _SpoSiteSetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -546,7 +512,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
             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 (args.options.siteDesignId) {
-            if (!validation_1.validation.isValidGuid(args.options.siteDesignId)) {
+            if (!validation.isValidGuid(args.options.siteDesignId)) {
                 return `${args.options.siteDesignId} is not a valid GUID`;
             }
         }
@@ -585,10 +551,10 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
             return `${args.options.lockState} is not a valid value for the lockState option. Allowed values Unlock|NoAdditions|ReadOnly|NoAccess`;
         }
         return true;
-    }));
+    });
 }, _SpoSiteSetCommand_initTypes = function _SpoSiteSetCommand_initTypes() {
     this.types.string.push('classification');
     this.types.boolean.push('isPublic', 'disableFlows', 'socialBarOnSitePagesDisabled', 'shareByEmailEnabled', 'allowSelfServiceUpgrade', 'noScriptSite');
 };
-module.exports = new SpoSiteSetCommand();
+export default new SpoSiteSetCommand();
 //# sourceMappingURL=site-set.js.map