@pnp/cli-microsoft365 6.0.0-beta.27e1012 → 6.0.0-beta.3261c97

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

@@ -1,4 +1,19 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoSiteSetCommand_instances, _SpoSiteSetCommand_initTelemetry, _SpoSiteSetCommand_initOptions, _SpoSiteSetCommand_initValidators, _SpoSiteSetCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const Command_1 = require("../../../../Command");
@@ -11,67 +26,47 @@ const commands_1 = require("../../commands");
 const SharingCapabilities_1 = require("../site/SharingCapabilities");
 const spoSiteDesignApplyCommand = require("../sitedesign/sitedesign-apply");
 class SpoSiteSetCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoSiteSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteSetCommand_instances, "m", _SpoSiteSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteSetCommand_instances, "m", _SpoSiteSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteSetCommand_instances, "m", _SpoSiteSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteSetCommand_instances, "m", _SpoSiteSetCommand_initTypes).call(this);
+    }
     get name() {
         return commands_1.default.SITE_SET;
     }
     get description() {
         return 'Updates properties of the specified site';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.classification = typeof args.options.classification === 'string';
-        telemetryProps.disableFlows = args.options.disableFlows;
-        telemetryProps.isPublic = args.options.isPublic;
-        telemetryProps.owners = typeof args.options.owners !== 'undefined';
-        telemetryProps.shareByEmailEnabled = args.options.shareByEmailEnabled;
-        telemetryProps.title = typeof args.options.title === 'string';
-        telemetryProps.description = typeof args.options.description === 'string';
-        telemetryProps.siteDesignId = typeof args.options.siteDesignId !== undefined;
-        telemetryProps.sharingCapabilities = args.options.sharingCapability;
-        telemetryProps.siteLogoUrl = typeof args.options.siteLogoUrl !== 'undefined';
-        telemetryProps.resourceQuota = args.options.resourceQuota;
-        telemetryProps.resourceQuotaWarningLevel = args.options.resourceQuotaWarningLevel;
-        telemetryProps.storageQuota = args.options.storageQuota;
-        telemetryProps.storageQuotaWarningLevel = args.options.storageQuotaWarningLevel;
-        telemetryProps.allowSelfServiceUpgrade = args.options.allowSelfServiceUpgrade;
-        telemetryProps.lockState = args.options.lockState;
-        telemetryProps.noScriptSite = args.options.noScriptSite;
-        telemetryProps.wait = args.options.wait === true;
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        this.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 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);
+                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) {
@@ -440,75 +435,76 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
         }
         return result;
     }
-    options() {
-        const options = [
-            {
-                option: '-u, --url <url>'
-            },
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '--classification [classification]'
-            },
-            {
-                option: '--disableFlows [disableFlows]'
-            },
-            {
-                option: '--isPublic [isPublic]'
-            },
-            {
-                option: '--owners [owners]'
-            },
-            {
-                option: '--shareByEmailEnabled [shareByEmailEnabled]'
-            },
-            {
-                option: '--siteDesignId [siteDesignId]'
-            },
-            {
-                option: '--title [title]'
-            },
-            {
-                option: '--description [description]'
-            },
-            {
-                option: '--siteLogoUrl [siteLogoUrl]'
-            },
-            {
-                option: '--sharingCapability [sharingCapability]',
-                autocomplete: this.sharingCapabilities
-            },
-            {
-                option: '--resourceQuota [resourceQuota]'
-            },
-            {
-                option: '--resourceQuotaWarningLevel [resourceQuotaWarningLevel]'
-            },
-            {
-                option: '--storageQuota [storageQuota]'
-            },
-            {
-                option: '--storageQuotaWarningLevel [storageQuotaWarningLevel]'
-            },
-            {
-                option: '--allowSelfServiceUpgrade [allowSelfServiceUpgrade]'
-            },
-            {
-                option: '--lockState [lockState]',
-                autocomplete: ['Unlock', 'NoAdditions', 'ReadOnly', 'NoAccess']
-            },
-            {
-                option: '--noScriptSite [noScriptSite]'
-            },
-            {
-                option: '--wait'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoSiteSetCommand_instances = new WeakSet(), _SpoSiteSetCommand_initTelemetry = function _SpoSiteSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            classification: typeof args.options.classification === 'string',
+            disableFlows: args.options.disableFlows,
+            isPublic: args.options.isPublic,
+            owners: typeof args.options.owners !== 'undefined',
+            shareByEmailEnabled: args.options.shareByEmailEnabled,
+            title: typeof args.options.title === 'string',
+            description: typeof args.options.description === 'string',
+            siteDesignId: typeof args.options.siteDesignId !== undefined,
+            sharingCapabilities: args.options.sharingCapability,
+            siteLogoUrl: typeof args.options.siteLogoUrl !== 'undefined',
+            resourceQuota: args.options.resourceQuota,
+            resourceQuotaWarningLevel: args.options.resourceQuotaWarningLevel,
+            storageQuota: args.options.storageQuota,
+            storageQuotaWarningLevel: args.options.storageQuotaWarningLevel,
+            allowSelfServiceUpgrade: args.options.allowSelfServiceUpgrade,
+            lockState: args.options.lockState,
+            noScriptSite: args.options.noScriptSite,
+            wait: args.options.wait === true
+        });
+    });
+}, _SpoSiteSetCommand_initOptions = function _SpoSiteSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --url <url>'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '--classification [classification]'
+    }, {
+        option: '--disableFlows [disableFlows]'
+    }, {
+        option: '--isPublic [isPublic]'
+    }, {
+        option: '--owners [owners]'
+    }, {
+        option: '--shareByEmailEnabled [shareByEmailEnabled]'
+    }, {
+        option: '--siteDesignId [siteDesignId]'
+    }, {
+        option: '--title [title]'
+    }, {
+        option: '--description [description]'
+    }, {
+        option: '--siteLogoUrl [siteLogoUrl]'
+    }, {
+        option: '--sharingCapability [sharingCapability]',
+        autocomplete: this.sharingCapabilities
+    }, {
+        option: '--resourceQuota [resourceQuota]'
+    }, {
+        option: '--resourceQuotaWarningLevel [resourceQuotaWarningLevel]'
+    }, {
+        option: '--storageQuota [storageQuota]'
+    }, {
+        option: '--storageQuotaWarningLevel [storageQuotaWarningLevel]'
+    }, {
+        option: '--allowSelfServiceUpgrade [allowSelfServiceUpgrade]'
+    }, {
+        option: '--lockState [lockState]',
+        autocomplete: ['Unlock', 'NoAdditions', 'ReadOnly', 'NoAccess']
+    }, {
+        option: '--noScriptSite [noScriptSite]'
+    }, {
+        option: '--wait'
+    });
+}, _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);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
@@ -595,13 +591,9 @@ class SpoSiteSetCommand extends SpoCommand_1.default {
             return `${args.options.noScriptSite} is not a valid boolean value`;
         }
         return true;
-    }
-    types() {
-        // required to support passing empty strings as valid values
-        return {
-            string: ['classification']
-        };
-    }
-}
+    }));
+}, _SpoSiteSetCommand_initTypes = function _SpoSiteSetCommand_initTypes() {
+    this.types.string.push('classification');
+};
 module.exports = new SpoSiteSetCommand();
 //# sourceMappingURL=site-set.js.map

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

@@ -1,98 +1,109 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoSiteDesignAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteDesignAddCommand_instances, "m", _SpoSiteDesignAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteDesignAddCommand_instances, "m", _SpoSiteDesignAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteDesignAddCommand_instances, "m", _SpoSiteDesignAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SITEDESIGN_ADD;
     }
     get description() {
         return 'Adds site design for creating modern sites';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.webTemplate = args.options.webTemplate;
-        telemetryProps.numSiteScripts = args.options.siteScripts.split(',').length;
-        telemetryProps.description = (!(!args.options.description)).toString();
-        telemetryProps.previewImageUrl = (!(!args.options.previewImageUrl)).toString();
-        telemetryProps.previewImageAltText = (!(!args.options.previewImageAltText)).toString();
-        telemetryProps.isDefault = args.options.isDefault || false;
-        return telemetryProps;
-    }
-    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;
-            }
-            if (args.options.previewImageUrl) {
-                info.PreviewImageUrl = args.options.previewImageUrl;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoUrl = yield utils_1.spo.getSpoUrl(logger, this.debug);
+                const requestDigest = yield utils_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.previewImageAltText) {
-                info.PreviewImageAltText = args.options.previewImageAltText;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            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));
+        });
     }
-    options() {
-        const options = [
-            {
-                option: '-t, --title <title>'
-            },
-            {
-                option: '-w, --webTemplate <webTemplate>',
-                autocomplete: ['TeamSite', 'CommunicationSite']
-            },
-            {
-                option: '-s, --siteScripts <siteScripts>'
-            },
-            {
-                option: '-d, --description [description]'
-            },
-            {
-                option: '-m, --previewImageUrl [previewImageUrl]'
-            },
-            {
-                option: '-a, --previewImageAltText [previewImageAltText]'
-            },
-            {
-                option: '--isDefault'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_SpoSiteDesignAddCommand_instances = new WeakSet(), _SpoSiteDesignAddCommand_initTelemetry = function _SpoSiteDesignAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            webTemplate: args.options.webTemplate,
+            numSiteScripts: args.options.siteScripts.split(',').length,
+            description: (!(!args.options.description)).toString(),
+            previewImageUrl: (!(!args.options.previewImageUrl)).toString(),
+            previewImageAltText: (!(!args.options.previewImageAltText)).toString(),
+            isDefault: args.options.isDefault || false
+        });
+    });
+}, _SpoSiteDesignAddCommand_initOptions = function _SpoSiteDesignAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-t, --title <title>'
+    }, {
+        option: '-w, --webTemplate <webTemplate>',
+        autocomplete: ['TeamSite', 'CommunicationSite']
+    }, {
+        option: '-s, --siteScripts <siteScripts>'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '-m, --previewImageUrl [previewImageUrl]'
+    }, {
+        option: '-a, --previewImageAltText [previewImageAltText]'
+    }, {
+        option: '--isDefault'
+    });
+}, _SpoSiteDesignAddCommand_initValidators = function _SpoSiteDesignAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.webTemplate !== 'TeamSite' &&
             args.options.webTemplate !== 'CommunicationSite') {
             return `${args.options.webTemplate} is not a valid web template type. Allowed values TeamSite|CommunicationSite`;
@@ -105,7 +116,7 @@ class SpoSiteDesignAddCommand extends SpoCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new SpoSiteDesignAddCommand();
 //# sourceMappingURL=sitedesign-add.js.map

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

@@ -1,71 +1,90 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _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 SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteDesignApplyCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoSiteDesignApplyCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteDesignApplyCommand_instances, "m", _SpoSiteDesignApplyCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteDesignApplyCommand_instances, "m", _SpoSiteDesignApplyCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteDesignApplyCommand_instances, "m", _SpoSiteDesignApplyCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.SITEDESIGN_APPLY;
     }
     get description() {
         return 'Applies a site design to an existing site collection';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.asTask = args.options.asTask || false;
-        return telemetryProps;
-    }
-    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 utils_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);
-            }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --id <id>'
-            },
-            {
-                option: '-u, --webUrl <webUrl>'
-            },
-            {
-                option: '--asTask'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
+}
+_SpoSiteDesignApplyCommand_instances = new WeakSet(), _SpoSiteDesignApplyCommand_initTelemetry = function _SpoSiteDesignApplyCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            asTask: args.options.asTask || false
+        });
+    });
+}, _SpoSiteDesignApplyCommand_initOptions = function _SpoSiteDesignApplyCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--asTask'
+    });
+}, _SpoSiteDesignApplyCommand_initValidators = function _SpoSiteDesignApplyCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
-    }
-}
+    }));
+};
 module.exports = new SpoSiteDesignApplyCommand();
 //# sourceMappingURL=sitedesign-apply.js.map