@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

package/dist/m365/spo/commands/site/site-classic-add.js

@@ -34,93 +34,77 @@ class SpoSiteClassicAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Creates new classic site';
     }
-    commandAction(logger, args, cb) {
-        this.dots = '';
-        this.showDeprecationWarning(logger, commands_1.default.SITE_CLASSIC_ADD, commands_1.default.SITE_ADD);
-        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((res) => {
-            this.context = res;
-            if (args.options.removeDeletedSite) {
-                return this.siteExistsInTheRecycleBin(args.options.url, logger);
-            }
-            else {
-                // assume site doesn't exist
-                return Promise.resolve(false);
-            }
-        })
-            .then((exists) => {
-            if (exists) {
-                if (this.verbose) {
-                    logger.logToStderr('Site exists in the recycle bin');
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.dots = '';
+            this.showDeprecationWarning(logger, commands_1.default.SITE_CLASSIC_ADD, commands_1.default.SITE_ADD);
+            try {
+                this.spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                this.context = yield utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+                if (args.options.removeDeletedSite) {
+                    yield this.siteExistsInTheRecycleBin(args.options.url, logger);
+                    if (this.verbose) {
+                        logger.logToStderr('Site exists in the recycle bin');
+                    }
+                    yield this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
                 }
-                return this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
-            }
-            else {
+                else {
+                    // assume site doesn't exist
+                    if (this.verbose) {
+                        logger.logToStderr('Site not found');
+                    }
+                }
+                this.context = yield utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
                 if (this.verbose) {
-                    logger.logToStderr('Site not found');
+                    logger.logToStderr(`Creating site collection ${args.options.url}...`);
                 }
-                return Promise.resolve();
+                const lcid = typeof args.options.lcid === 'number' ? args.options.lcid : 1033;
+                const storageQuota = typeof args.options.storageQuota === 'number' ? args.options.storageQuota : 100;
+                const storageQuotaWarningLevel = typeof args.options.storageQuotaWarningLevel === 'number' ? args.options.storageQuotaWarningLevel : 100;
+                const resourceQuota = typeof args.options.resourceQuota === 'number' ? args.options.resourceQuota : 0;
+                const resourceQuotaWarningLevel = typeof args.options.resourceQuotaWarningLevel === 'number' ? args.options.resourceQuotaWarningLevel : 0;
+                const webTemplate = args.options.webTemplate || 'STS#0';
+                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="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query><Query Id="8" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="CreateSite"><Parameters><Parameter TypeId="{11f84fff-b8cf-47b6-8b50-34e692656606}"><Property Name="CompatibilityLevel" Type="Int32">0</Property><Property Name="Lcid" Type="UInt32">${lcid}</Property><Property Name="Owner" Type="String">${utils_1.formatting.escapeXml(args.options.owner)}</Property><Property Name="StorageMaximumLevel" Type="Int64">${storageQuota}</Property><Property Name="StorageWarningLevel" Type="Int64">${storageQuotaWarningLevel}</Property><Property Name="Template" Type="String">${utils_1.formatting.escapeXml(webTemplate)}</Property><Property Name="TimeZoneId" Type="Int32">${args.options.timeZone}</Property><Property Name="Title" Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Property><Property Name="Url" Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Property><Property Name="UserCodeMaximumLevel" Type="Double">${resourceQuota}</Property><Property Name="UserCodeWarningLevel" Type="Double">${resourceQuotaWarningLevel}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                return new Promise((resolve, reject) => {
+                    const json = JSON.parse(res);
+                    const response = json[0];
+                    if (response.ErrorInfo) {
+                        throw 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);
+                    }
+                });
             }
-        })
-            .then(() => {
-            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-        })
-            .then((res) => {
-            this.context = res;
-            if (this.verbose) {
-                logger.logToStderr(`Creating site collection ${args.options.url}...`);
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            const lcid = typeof args.options.lcid === 'number' ? args.options.lcid : 1033;
-            const storageQuota = typeof args.options.storageQuota === 'number' ? args.options.storageQuota : 100;
-            const storageQuotaWarningLevel = typeof args.options.storageQuotaWarningLevel === 'number' ? args.options.storageQuotaWarningLevel : 100;
-            const resourceQuota = typeof args.options.resourceQuota === 'number' ? args.options.resourceQuota : 0;
-            const resourceQuotaWarningLevel = typeof args.options.resourceQuotaWarningLevel === 'number' ? args.options.resourceQuotaWarningLevel : 0;
-            const webTemplate = args.options.webTemplate || 'STS#0';
-            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="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query><Query Id="8" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="CreateSite"><Parameters><Parameter TypeId="{11f84fff-b8cf-47b6-8b50-34e692656606}"><Property Name="CompatibilityLevel" Type="Int32">0</Property><Property Name="Lcid" Type="UInt32">${lcid}</Property><Property Name="Owner" Type="String">${utils_1.formatting.escapeXml(args.options.owner)}</Property><Property Name="StorageMaximumLevel" Type="Int64">${storageQuota}</Property><Property Name="StorageWarningLevel" Type="Int64">${storageQuotaWarningLevel}</Property><Property Name="Template" Type="String">${utils_1.formatting.escapeXml(webTemplate)}</Property><Property Name="TimeZoneId" Type="Int32">${args.options.timeZone}</Property><Property Name="Title" Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Property><Property Name="Url" Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Property><Property Name="UserCodeMaximumLevel" Type="Double">${resourceQuota}</Property><Property Name="UserCodeWarningLevel" Type="Double">${resourceQuotaWarningLevel}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            return new Promise((resolve, reject) => {
-                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);
-                }
-            });
-        })
-            .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     siteExistsInTheRecycleBin(url, logger) {
         return new Promise((resolve, reject) => {

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

@@ -1,4 +1,13 @@
 "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");
@@ -27,26 +36,25 @@ class SpoSiteClassicListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Title', 'Url'];
     }
-    commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.SITE_CLASSIC_LIST, commands_1.default.SITE_LIST);
-        const webTemplate = args.options.webTemplate || '';
-        const includeOneDriveSites = args.options.includeOneDriveSites || false;
-        const personalSite = includeOneDriveSites === false ? '0' : '1';
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving list of site collections...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.showDeprecationWarning(logger, commands_1.default.SITE_CLASSIC_LIST, commands_1.default.SITE_LIST);
+            const webTemplate = args.options.webTemplate || '';
+            const includeOneDriveSites = args.options.includeOneDriveSites || false;
+            const personalSite = includeOneDriveSites === false ? '0' : '1';
+            try {
+                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving list of site collections...`);
+                }
+                this.allSites = [];
+                yield this.getAllSites(spoAdminUrl, utils_1.formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, logger);
+                logger.log(this.allSites);
             }
-            this.allSites = [];
-            return this.getAllSites(spoAdminUrl, utils_1.formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, logger);
-        })
-            .then(_ => {
-            logger.log(this.allSites);
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
     getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, logger) {
         return new Promise((resolve, reject) => {

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

@@ -34,204 +34,186 @@ class SpoSiteClassicSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Change classic site settings';
     }
-    commandAction(logger, args, cb) {
-        this.showDeprecationWarning(logger, commands_1.default.SITE_CLASSIC_SET, commands_1.default.SITE_SET);
-        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((res) => {
-            this.context = res;
-            if (this.verbose) {
-                logger.logToStderr(`Setting basic properties ${args.options.url}...`);
-            }
-            const basicProperties = [
-                'title',
-                'sharing',
-                'resourceQuota',
-                'resourceQuotaWarningLevel',
-                'storageQuota',
-                'storageQuotaWarningLevel',
-                'allowSelfServiceUpgrade',
-                'noScriptSite'
-            ];
-            let updateBasicProperties = false;
-            for (let i = 0; i < basicProperties.length; i++) {
-                if (typeof args.options[basicProperties[i]] !== 'undefined') {
-                    updateBasicProperties = true;
-                    break;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.showDeprecationWarning(logger, commands_1.default.SITE_CLASSIC_SET, commands_1.default.SITE_SET);
+            this.dots = '';
+            try {
+                this.tenantId = yield utils_1.spo.getTenantId(logger, this.debug);
+                this.spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                this.context = yield utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+                if (this.verbose) {
+                    logger.logToStderr(`Setting basic properties ${args.options.url}...`);
                 }
-            }
-            if (!updateBasicProperties) {
-                return Promise.resolve(undefined);
-            }
-            let i = 0;
-            const updates = [];
-            if (args.options.title) {
-                updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="Title"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
-            }
-            if (args.options.sharing) {
-                const sharing = ['Disabled', 'ExternalUserSharingOnly', 'ExternalUserAndGuestSharing', 'ExistingExternalUserSharingOnly'].indexOf(args.options.sharing);
-                updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="SharingCapability"><Parameter Type="Enum">${sharing}</Parameter></SetProperty>`);
-            }
-            if (args.options.resourceQuota) {
-                updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="UserCodeMaximumLevel"><Parameter Type="Double">${args.options.resourceQuota}</Parameter></SetProperty>`);
-            }
-            if (args.options.resourceQuotaWarningLevel) {
-                updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="UserCodeWarningLevel"><Parameter Type="Double">${args.options.resourceQuotaWarningLevel}</Parameter></SetProperty>`);
-            }
-            if (args.options.storageQuota) {
-                updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="StorageMaximumLevel"><Parameter Type="Int64">${args.options.storageQuota}</Parameter></SetProperty>`);
-            }
-            if (args.options.storageQuotaWarningLevel) {
-                updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="StorageWarningLevel"><Parameter Type="Int64">${args.options.storageQuotaWarningLevel}</Parameter></SetProperty>`);
-            }
-            if (typeof args.options.allowSelfServiceUpgrade !== 'undefined') {
-                updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="AllowSelfServiceUpgrade"><Parameter Type="Boolean">${args.options.allowSelfServiceUpgrade}</Parameter></SetProperty>`);
-            }
-            if (typeof args.options.noScriptSite !== 'undefined') {
-                const noScriptSite = args.options.noScriptSite === 'true' ? 2 : 1;
-                updates.push(`<SetProperty Id="${++i}" 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': 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>${updates.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);
-        })
-            .then((res) => {
-            return new Promise((resolve, reject) => {
-                if (!res) {
-                    resolve();
-                    return;
+                const basicProperties = [
+                    'title',
+                    'sharing',
+                    'resourceQuota',
+                    'resourceQuotaWarningLevel',
+                    'storageQuota',
+                    'storageQuotaWarningLevel',
+                    'allowSelfServiceUpgrade',
+                    'noScriptSite'
+                ];
+                let updateBasicProperties = false;
+                for (let i = 0; i < basicProperties.length; i++) {
+                    if (typeof args.options[basicProperties[i]] !== 'undefined') {
+                        updateBasicProperties = true;
+                        break;
+                    }
                 }
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
+                let res;
+                if (updateBasicProperties) {
+                    let i = 0;
+                    const updates = [];
+                    if (args.options.title) {
+                        updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="Title"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
+                    }
+                    if (args.options.sharing) {
+                        const sharing = ['Disabled', 'ExternalUserSharingOnly', 'ExternalUserAndGuestSharing', 'ExistingExternalUserSharingOnly'].indexOf(args.options.sharing);
+                        updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="SharingCapability"><Parameter Type="Enum">${sharing}</Parameter></SetProperty>`);
+                    }
+                    if (args.options.resourceQuota) {
+                        updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="UserCodeMaximumLevel"><Parameter Type="Double">${args.options.resourceQuota}</Parameter></SetProperty>`);
+                    }
+                    if (args.options.resourceQuotaWarningLevel) {
+                        updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="UserCodeWarningLevel"><Parameter Type="Double">${args.options.resourceQuotaWarningLevel}</Parameter></SetProperty>`);
+                    }
+                    if (args.options.storageQuota) {
+                        updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="StorageMaximumLevel"><Parameter Type="Int64">${args.options.storageQuota}</Parameter></SetProperty>`);
+                    }
+                    if (args.options.storageQuotaWarningLevel) {
+                        updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="StorageWarningLevel"><Parameter Type="Int64">${args.options.storageQuotaWarningLevel}</Parameter></SetProperty>`);
+                    }
+                    if (typeof args.options.allowSelfServiceUpgrade !== 'undefined') {
+                        updates.push(`<SetProperty Id="${++i}" ObjectPathId="5" Name="AllowSelfServiceUpgrade"><Parameter Type="Boolean">${args.options.allowSelfServiceUpgrade}</Parameter></SetProperty>`);
+                    }
+                    if (typeof args.options.noScriptSite !== 'undefined') {
+                        const noScriptSite = args.options.noScriptSite === 'true' ? 2 : 1;
+                        updates.push(`<SetProperty Id="${++i}" 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': 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>${updates.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>`
+                    };
+                    res = yield request_1.default.post(requestOptions);
                 }
-                else {
-                    const operation = json[json.length - 1];
-                    const isComplete = operation.IsComplete;
-                    if (!args.options.wait || isComplete) {
+                yield new Promise((resolve, reject) => {
+                    if (!res) {
                         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);
-                }
-            });
-        })
-            .then(_ => utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug))
-            .then((res) => {
-            this.context = res;
-            return new Promise((resolve, reject) => {
-                if (!args.options.owners) {
-                    resolve();
-                    return;
-                }
-                Promise.all(args.options.owners.split(',').map(o => {
-                    return this.setAdmin(logger, args.options.url, o.trim());
-                }))
-                    .then(() => {
-                    resolve();
-                }, (err) => {
-                    reject(err);
+                    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);
+                    }
                 });
-            });
-        })
-            .then(_ => utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug))
-            .then((res) => {
-            this.context = res;
-            if (!args.options.description) {
-                return Promise.resolve(undefined);
-            }
-            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);
-        })
-            .then(() => {
-            if (!args.options.lockState) {
-                return Promise.resolve(undefined);
-            }
-            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 request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            return new Promise((resolve, reject) => {
-                if (!res) {
-                    resolve();
-                    return;
+                this.context = yield utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+                yield new Promise((resolve, reject) => {
+                    if (!args.options.owners) {
+                        resolve();
+                        return;
+                    }
+                    Promise.all(args.options.owners.split(',').map(o => {
+                        return this.setAdmin(logger, args.options.url, o.trim());
+                    }))
+                        .then(() => {
+                        resolve();
+                    }, (err) => {
+                        reject(err);
+                    });
+                });
+                if (args.options.description) {
+                    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
+                    };
+                    yield request_1.default.post(requestOptions);
                 }
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
+                let query;
+                if (args.options.lockState) {
+                    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>`
+                    };
+                    query = yield request_1.default.post(requestOptions);
                 }
-                else {
-                    const operation = json[json.length - 1];
-                    const isComplete = operation.IsComplete;
-                    if (!args.options.wait || isComplete) {
+                yield new Promise((resolve, reject) => {
+                    if (!query) {
                         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);
-                }
-            });
-        })
-            .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
+                    const json = JSON.parse(query);
+                    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);
+                    }
+                });
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
     setAdmin(logger, siteUrl, principal) {
         return new Promise((resolve, reject) => {