@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 5.9.0-beta.005c47a

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

@@ -17,7 +17,9 @@ var _SpoSiteClassicSetCommand_instances, _SpoSiteClassicSetCommand_initTelemetry
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteClassicSetCommand extends SpoCommand_1.default {
@@ -34,208 +36,190 @@ 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 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);
+                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">${formatting_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(() => {
+                            spo_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 spo_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">${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>`
+                    };
+                    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(() => {
+                            spo_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) => {
-            utils_1.spo
+            spo_1.spo
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
@@ -244,7 +228,7 @@ class SpoSiteClassicSetCommand extends SpoCommand_1.default {
                     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>`
+                    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);
             })
@@ -312,7 +296,7 @@ _SpoSiteClassicSetCommand_instances = new WeakSet(), _SpoSiteClassicSetCommand_i
     });
 }, _SpoSiteClassicSetCommand_initValidators = function _SpoSiteClassicSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/site/site-commsite-enable.js

@@ -15,10 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteCommSiteEnableCommand extends SpoCommand_1.default {
@@ -35,37 +36,33 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand_1.default {
     get description() {
         return 'Enables communication site features on the specified site';
     }
-    commandAction(logger, args, cb) {
-        const designPackageId = args.options.designPackageId || '{d604dac3-50d3-405e-9ab9-d4713cda74ef}';
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            if (this.debug) {
-                logger.logToStderr(`Retrieving request digest...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const designPackageId = args.options.designPackageId || '{d604dac3-50d3-405e-9ab9-d4713cda74ef}';
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                if (this.debug) {
+                    logger.logToStderr(`Retrieving request digest...`);
+                }
+                const ctxInfo = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': ctxInfo.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" /><Method Name="EnableCommSite" Id="5" ObjectPathId="3"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Guid">${formatting_1.formatting.escapeXml(designPackageId)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
             }
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            const requestOptions = {
-                url: `${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="4" ObjectPathId="3" /><Method Name="EnableCommSite" Id="5" ObjectPathId="3"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Guid">${utils_1.formatting.escapeXml(designPackageId)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" 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) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoSiteCommSiteEnableCommand_instances = new WeakSet(), _SpoSiteCommSiteEnableCommand_initTelemetry = function _SpoSiteCommSiteEnableCommand_initTelemetry() {
@@ -83,10 +80,10 @@ _SpoSiteCommSiteEnableCommand_instances = new WeakSet(), _SpoSiteCommSiteEnableC
 }, _SpoSiteCommSiteEnableCommand_initValidators = function _SpoSiteCommSiteEnableCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.designPackageId &&
-            !utils_1.validation.isValidGuid(args.options.designPackageId)) {
+            !validation_1.validation.isValidGuid(args.options.designPackageId)) {
             return `${args.options.designPackageId} is not a valid GUID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.url);
+        return validation_1.validation.isValidSharePointUrl(args.options.url);
     }));
 };
 module.exports = new SpoSiteCommSiteEnableCommand();