@pnp/cli-microsoft365 6.0.0-beta.27b9708 → 6.0.0-beta.291f17c

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

@@ -15,11 +15,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteSetCommand_instances, _SpoSiteSetCommand_initTelemetry, _SpoSiteSetCommand_initOptions, _SpoSiteSetCommand_initValidators, _SpoSiteSetCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 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 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");
@@ -40,39 +43,33 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Updates properties of the specified site';
     }
-    commandAction(logger, args, cb) {
-        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(formDigestInfo => {
-            this.context = formDigestInfo;
-            return Promise.resolve();
-        })
-            .then(_ => this.loadSiteIds(args.options.url, logger))
-            .then(_ => {
-            return this.isGroupConnectedSite()
-                ? this.updateGroupConnectedSite(logger, args)
-                : this.updateSharePointOnlySite(logger, args);
-        })
-            .then(_ => this.updateSiteProperties(logger, args))
-            .then(res => this.waitForSiteUpdateCompletion(logger, args, res))
-            .then(_ => this.applySiteDesign(logger, args))
-            .then(_ => this.setLogo(logger, args))
-            .then(_ => this.updateSiteLockState(logger, args))
-            .then(res => this.waitForSiteUpdateCompletion(logger, args, res))
-            .then(_ => cb(), (err) => {
-            if (err instanceof Command_1.CommandError) {
-                err = err.message;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.dots = '';
+                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);
+            }
+            catch (err) {
+                if (err instanceof Command_1.CommandError) {
+                    err = err.message;
+                }
+                this.handleRejectedPromise(err);
             }
-            this.handleRejectedPromise(err, logger, cb);
         });
     }
     setLogo(logger, args) {
@@ -82,7 +79,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         if (this.debug) {
             logger.logToStderr(`Setting the site its logo...`);
         }
-        const logoUrl = args.options.siteLogoUrl ? utils_1.urlUtil.getServerRelativePath(args.options.url, args.options.siteLogoUrl) : "";
+        const logoUrl = args.options.siteLogoUrl ? urlUtil_1.urlUtil.getServerRelativePath(args.options.url, args.options.siteLogoUrl) : "";
         const requestOptions = {
             url: `${args.options.url}/_api/siteiconmanager/setsitelogo`,
             headers: {
@@ -124,7 +121,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                     return;
                 }
                 setTimeout(() => {
-                    utils_1.spo.waitUntilFinished({
+                    spo_1.spo.waitUntilFinished({
                         operationId: JSON.stringify(operation._ObjectIdentity_),
                         siteUrl: this.spoAdminUrl,
                         resolve,
@@ -164,7 +161,7 @@ class SpoSiteSetCommand 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)
                 .then((res) => {
@@ -216,7 +213,7 @@ class SpoSiteSetCommand 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><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>`
+            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>`
         };
         return request_1.default.post(requestOptions);
     }
@@ -256,7 +253,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                     debug: this.debug,
                     verbose: this.verbose
                 };
-                promises.push(cli_1.Cli.executeCommand(aadO365GroupSetCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) }));
+                promises.push(Cli_1.Cli.executeCommand(aadO365GroupSetCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) }));
             }
             if (args.options.description) {
                 promises.push(this.setGroupifiedSiteDescription(args.options.description));
@@ -333,7 +330,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         if (!updatedProperties) {
             return Promise.resolve(undefined);
         }
-        return utils_1.spo
+        return spo_1.spo
             .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
             .then(res => {
             this.context = res;
@@ -344,7 +341,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             const payload = [];
             if (!isGroupConnectedSite) {
                 if (args.options.title) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Title"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
+                    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>`);
@@ -363,7 +360,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 }
             }
             if (typeof args.options.classification === 'string') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.classification)}</Parameter></SetProperty>`);
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.classification)}</Parameter></SetProperty>`);
             }
             if (typeof args.options.disableFlows === 'string') {
                 payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Boolean">${args.options.disableFlows === 'true'}</Parameter></SetProperty>`);
@@ -385,7 +382,7 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substr(pos, this.tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${encodeURIComponent(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substr(pos, this.tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${formatting_1.formatting.encodeQueryParameter(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
             };
             return request_1.default.post(requestOptions);
         });
@@ -401,7 +398,7 @@ 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_1.Cli.executeCommand(spoSiteDesignApplyCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
     }
     loadSiteIds(siteUrl, logger) {
         if (this.debug) {
@@ -511,7 +508,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
     });
 }, _SpoSiteSetCommand_initValidators = function _SpoSiteSetCommand_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;
         }
@@ -538,19 +535,19 @@ _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 (typeof args.options.disableFlows === 'string' &&
-            !utils_1.validation.isValidBoolean(args.options.disableFlows)) {
+            !validation_1.validation.isValidBoolean(args.options.disableFlows)) {
             return `${args.options.disableFlows} is not a valid value for the disableFlow option. Allowed values are true|false`;
         }
         if (typeof args.options.isPublic === 'string' &&
-            !utils_1.validation.isValidBoolean(args.options.isPublic)) {
+            !validation_1.validation.isValidBoolean(args.options.isPublic)) {
             return `${args.options.isPublic} is not a valid value for the isPublic option. Allowed values are true|false`;
         }
         if (typeof args.options.shareByEmailEnabled === 'string' &&
-            !utils_1.validation.isValidBoolean(args.options.shareByEmailEnabled)) {
+            !validation_1.validation.isValidBoolean(args.options.shareByEmailEnabled)) {
             return `${args.options.shareByEmailEnabled} is not a valid value for the shareByEmailEnabled option. Allowed values are true|false`;
         }
         if (args.options.siteDesignId) {
-            if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
+            if (!validation_1.validation.isValidGuid(args.options.siteDesignId)) {
                 return `${args.options.siteDesignId} is not a valid GUID`;
             }
         }
@@ -585,7 +582,7 @@ _SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry =
             return `storageQuotaWarningLevel must not exceed the storageQuota`;
         }
         if (args.options.allowSelfServiceUpgrade &&
-            !utils_1.validation.isValidBoolean(args.options.allowSelfServiceUpgrade)) {
+            !validation_1.validation.isValidBoolean(args.options.allowSelfServiceUpgrade)) {
             return `${args.options.allowSelfServiceUpgrade} is not a valid boolean value`;
         }
         if (args.options.lockState &&
@@ -593,7 +590,7 @@ _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`;
         }
         if (args.options.noScriptSite &&
-            !utils_1.validation.isValidBoolean(args.options.noScriptSite)) {
+            !validation_1.validation.isValidBoolean(args.options.noScriptSite)) {
             return `${args.options.noScriptSite} is not a valid boolean value`;
         }
         return true;

package/dist/m365/spo/commands/sitedesign/sitedesign-add.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignAddCommand_instances, _SpoSiteDesignAddCommand_initTelemetry, _SpoSiteDesignAddCommand_initOptions, _SpoSiteDesignAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignAddCommand extends SpoCommand_1.default {
@@ -33,48 +34,45 @@ class SpoSiteDesignAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Adds site design for creating modern sites';
     }
-    commandAction(logger, args, cb) {
-        let spoUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((_spoUrl) => {
-            spoUrl = _spoUrl;
-            return utils_1.spo.getRequestDigest(spoUrl);
-        })
-            .then((res) => {
-            const info = {
-                Title: args.options.title,
-                WebTemplate: args.options.webTemplate === 'TeamSite' ? '64' : '68',
-                SiteScriptIds: args.options.siteScripts.split(',').map(i => i.trim())
-            };
-            if (args.options.description) {
-                info.Description = args.options.description;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const requestDigest = yield spo_1.spo.getRequestDigest(spoUrl);
+                const info = {
+                    Title: args.options.title,
+                    WebTemplate: args.options.webTemplate === 'TeamSite' ? '64' : '68',
+                    SiteScriptIds: args.options.siteScripts.split(',').map(i => i.trim())
+                };
+                if (args.options.description) {
+                    info.Description = args.options.description;
+                }
+                if (args.options.previewImageUrl) {
+                    info.PreviewImageUrl = args.options.previewImageUrl;
+                }
+                if (args.options.previewImageAltText) {
+                    info.PreviewImageAltText = args.options.previewImageAltText;
+                }
+                if (args.options.isDefault) {
+                    info.IsDefault = true;
+                }
+                const requestOptions = {
+                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.CreateSiteDesign`,
+                    headers: {
+                        'X-RequestDigest': requestDigest.FormDigestValue,
+                        'content-type': 'application/json;charset=utf-8',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    data: { info: info },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
             }
-            if (args.options.previewImageUrl) {
-                info.PreviewImageUrl = args.options.previewImageUrl;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            if (args.options.previewImageAltText) {
-                info.PreviewImageAltText = args.options.previewImageAltText;
-            }
-            if (args.options.isDefault) {
-                info.IsDefault = true;
-            }
-            const requestOptions = {
-                url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.CreateSiteDesign`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue,
-                    'content-type': 'application/json;charset=utf-8',
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: { info: info },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoSiteDesignAddCommand_instances = new WeakSet(), _SpoSiteDesignAddCommand_initTelemetry = function _SpoSiteDesignAddCommand_initTelemetry() {
@@ -114,7 +112,7 @@ _SpoSiteDesignAddCommand_instances = new WeakSet(), _SpoSiteDesignAddCommand_ini
         const siteScripts = args.options.siteScripts.split(',');
         for (let i = 0; i < siteScripts.length; i++) {
             const trimmedId = siteScripts[i].trim();
-            if (!utils_1.validation.isValidGuid(trimmedId)) {
+            if (!validation_1.validation.isValidGuid(trimmedId)) {
                 return `${trimmedId} is not a valid GUID`;
             }
         }

package/dist/m365/spo/commands/sitedesign/sitedesign-apply.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteDesignApplyCommand_instances, _SpoSiteDesignApplyCommand_initTelemetry, _SpoSiteDesignApplyCommand_initOptions, _SpoSiteDesignApplyCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignApplyCommand extends SpoCommand_1.default {
@@ -33,34 +34,35 @@ class SpoSiteDesignApplyCommand extends SpoCommand_1.default {
     get description() {
         return 'Applies a site design to an existing site collection';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            const requestBody = {
-                siteDesignId: args.options.id,
-                webUrl: args.options.webUrl
-            };
-            const requestOptions = {
-                url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.${args.options.asTask ? 'AddSiteDesignTask' : 'ApplySiteDesign'}`,
-                headers: {
-                    'content-type': 'application/json;charset=utf-8',
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: requestBody,
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            if (res.value) {
-                logger.log(res.value);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const requestBody = {
+                    siteDesignId: args.options.id,
+                    webUrl: args.options.webUrl
+                };
+                const requestOptions = {
+                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.${args.options.asTask ? 'AddSiteDesignTask' : 'ApplySiteDesign'}`,
+                    headers: {
+                        'content-type': 'application/json;charset=utf-8',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    data: requestBody,
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                if (res.value) {
+                    logger.log(res.value);
+                }
+                else {
+                    logger.log(res);
+                }
             }
-            else {
-                logger.log(res);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoSiteDesignApplyCommand_instances = new WeakSet(), _SpoSiteDesignApplyCommand_initTelemetry = function _SpoSiteDesignApplyCommand_initTelemetry() {
@@ -79,10 +81,10 @@ _SpoSiteDesignApplyCommand_instances = new WeakSet(), _SpoSiteDesignApplyCommand
     });
 }, _SpoSiteDesignApplyCommand_initValidators = function _SpoSiteDesignApplyCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoSiteDesignApplyCommand();

package/dist/m365/spo/commands/sitedesign/sitedesign-get.js

@@ -13,20 +13,21 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoSiteDesignGetCommand_instances, _SpoSiteDesignGetCommand_initTelemetry, _SpoSiteDesignGetCommand_initOptions, _SpoSiteDesignGetCommand_initValidators;
+var _SpoSiteDesignGetCommand_instances, _SpoSiteDesignGetCommand_initTelemetry, _SpoSiteDesignGetCommand_initOptions, _SpoSiteDesignGetCommand_initValidators, _SpoSiteDesignGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignGetCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoSiteDesignGetCommand_instances.add(this);
-        this.spoUrl = "";
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SITEDESIGN_GET;
@@ -34,12 +35,12 @@ class SpoSiteDesignGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets information about the specified site design';
     }
-    getSiteDesignId(args) {
+    getSiteDesignId(args, spoUrl) {
         if (args.options.id) {
             return Promise.resolve(args.options.id);
         }
         const requestOptions = {
-            url: `${this.spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteDesigns`,
+            url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteDesigns`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -58,29 +59,27 @@ class SpoSiteDesignGetCommand extends SpoCommand_1.default {
             return Promise.resolve(matchingSiteDesigns[0].Id);
         });
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((_spoUrl) => {
-            this.spoUrl = _spoUrl;
-            return this.getSiteDesignId(args);
-        })
-            .then((siteDesignId) => {
-            const requestOptions = {
-                url: `${this.spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteDesignMetadata`,
-                headers: {
-                    'content-type': 'application/json;charset=utf-8',
-                    accept: 'application/json;odata=nometadata'
-                },
-                data: { id: siteDesignId },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const siteDesignId = yield this.getSiteDesignId(args, spoUrl);
+                const requestOptions = {
+                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteDesignMetadata`,
+                    headers: {
+                        'content-type': 'application/json;charset=utf-8',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    data: { id: siteDesignId },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteDesignGetCommand_instances = new WeakSet(), _SpoSiteDesignGetCommand_initTelemetry = function _SpoSiteDesignGetCommand_initTelemetry() {
@@ -98,17 +97,13 @@ _SpoSiteDesignGetCommand_instances = new WeakSet(), _SpoSiteDesignGetCommand_ini
     });
 }, _SpoSiteDesignGetCommand_initValidators = function _SpoSiteDesignGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && args.options.title) {
-            return 'Specify either id or title, but not both.';
-        }
-        if (!args.options.id && !args.options.title) {
-            return 'Specify id or title, one is required';
-        }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
     }));
+}, _SpoSiteDesignGetCommand_initOptionSets = function _SpoSiteDesignGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title'] });
 };
 module.exports = new SpoSiteDesignGetCommand();
 //# sourceMappingURL=sitedesign-get.js.map

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

@@ -1,7 +1,16 @@
 "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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignListCommand extends SpoCommand_1.default {
@@ -14,23 +23,24 @@ class SpoSiteDesignListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'IsDefault', 'Title', 'Version', 'WebTemplate'];
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((spoUrl) => {
-            const requestOptions = {
-                url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteDesigns`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                const requestOptions = {
+                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteDesigns`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new SpoSiteDesignListCommand();