@pnp/cli-microsoft365 6.0.0-beta.c561c1f → 6.0.0-beta.c5ce305

package/dist/m365/spo/commands/web/web-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoWebRemoveCommand_instances, _SpoWebRemoveCommand_initTelemetry, _SpoWebRemoveCommand_initOptions, _SpoWebRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoWebRemoveCommand extends SpoCommand_1.default {
@@ -34,41 +34,42 @@ class SpoWebRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Delete specified subsite';
     }
-    commandAction(logger, args, cb) {
-        const removeWeb = () => {
-            const requestOptions = {
-                url: `${encodeURI(args.options.url)}/_api/web`,
-                headers: {
-                    accept: 'application/json;odata=nometadata',
-                    'X-HTTP-Method': 'DELETE'
-                },
-                responseType: 'json'
-            };
-            if (this.verbose) {
-                logger.logToStderr(`Deleting subsite ${args.options.url} ...`);
-            }
-            request_1.default
-                .post(requestOptions)
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeWeb();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the subsite ${args.options.url}`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeWeb = () => __awaiter(this, void 0, void 0, function* () {
+                const requestOptions = {
+                    url: `${encodeURI(args.options.url)}/_api/web`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata',
+                        'X-HTTP-Method': 'DELETE'
+                    },
+                    responseType: 'json'
+                };
+                if (this.verbose) {
+                    logger.logToStderr(`Deleting subsite ${args.options.url} ...`);
+                }
+                try {
+                    yield request_1.default.post(requestOptions);
                 }
-                else {
-                    removeWeb();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeWeb();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the subsite ${args.options.url}`
+                });
+                if (result.continue) {
+                    yield removeWeb();
+                }
+            }
+        });
     }
 }
 _SpoWebRemoveCommand_instances = new WeakSet(), _SpoWebRemoveCommand_initTelemetry = function _SpoWebRemoveCommand_initTelemetry() {
@@ -84,7 +85,7 @@ _SpoWebRemoveCommand_instances = new WeakSet(), _SpoWebRemoveCommand_initTelemet
         option: '--confirm'
     });
 }, _SpoWebRemoveCommand_initValidators = function _SpoWebRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.url); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.url); }));
 };
 module.exports = new SpoWebRemoveCommand();
 //# sourceMappingURL=web-remove.js.map

package/dist/m365/spo/commands/web/web-roleassignment-add.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SpoUserGetCommand = require("../user/user-get");
@@ -37,33 +37,31 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Adds a role assignment to web';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Adding role assignment to web ${args.options.webUrl}...`);
-        }
-        this.GetRoleDefinitionId(args.options)
-            .then((roleDefinitionId) => {
-            args.options.roleDefinitionId = roleDefinitionId;
-            if (args.options.upn) {
-                this.GetUserPrincipalId(args.options)
-                    .then((userPrincipalId) => {
-                    args.options.principalId = userPrincipalId;
-                    this.AddRoleAssignment(logger, args.options, cb);
-                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Adding role assignment to web ${args.options.webUrl}...`);
             }
-            else if (args.options.groupName) {
-                this.GetGroupPrincipalId(args.options)
-                    .then((groupPrincipalId) => {
-                    args.options.principalId = groupPrincipalId;
-                    this.AddRoleAssignment(logger, args.options, cb);
-                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            try {
+                args.options.roleDefinitionId = yield this.GetRoleDefinitionId(args.options);
+                if (args.options.upn) {
+                    args.options.principalId = yield this.GetUserPrincipalId(args.options);
+                    yield this.AddRoleAssignment(logger, args.options);
+                }
+                else if (args.options.groupName) {
+                    args.options.principalId = yield this.GetGroupPrincipalId(args.options);
+                    yield this.AddRoleAssignment(logger, args.options);
+                }
+                else {
+                    yield this.AddRoleAssignment(logger, args.options);
+                }
             }
-            else {
-                this.AddRoleAssignment(logger, args.options, cb);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
-    AddRoleAssignment(logger, options, cb) {
+    AddRoleAssignment(logger, options) {
         const requestOptions = {
             url: `${options.webUrl}/_api/web/roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
             method: 'POST',
@@ -73,9 +71,10 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             },
             responseType: 'json'
         };
-        request_1.default
+        return request_1.default
             .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            .then(_ => Promise.resolve())
+            .catch((err) => Promise.reject(err));
     }
     GetRoleDefinitionId(options) {
         if (!options.roleDefinitionName) {
@@ -87,7 +86,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) })
             .then((output) => {
             const getRoleDefinitionListOutput = JSON.parse(output.stdout);
             const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
@@ -104,7 +103,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
             .then((output) => {
             const getGroupOutput = JSON.parse(output.stdout);
             return Promise.resolve(getGroupOutput.Id);
@@ -121,7 +120,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
             .then((output) => {
             const getUserOutput = JSON.parse(output.stdout);
             return Promise.resolve(getUserOutput.Id);
@@ -156,7 +155,7 @@ _SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignment
     });
 }, _SpoWebRoleAssignmentAddCommand_initValidators = function _SpoWebRoleAssignmentAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/web/web-roleassignment-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SpoUserGetCommand = require("../user/user-get");
@@ -36,49 +36,46 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes a role assignment from web permissions';
     }
-    commandAction(logger, args, cb) {
-        const removeRoleAssignment = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing role assignment from web ${args.options.webUrl}...`);
-            }
-            if (args.options.upn) {
-                this.GetUserPrincipalId(args.options)
-                    .then((userPrincipalId) => {
-                    args.options.principalId = userPrincipalId;
-                    this.RemoveRoleAssignment(logger, args.options, cb);
-                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-            }
-            else if (args.options.groupName) {
-                this.GetGroupPrincipalId(args.options)
-                    .then((groupPrincipalId) => {
-                    args.options.principalId = groupPrincipalId;
-                    this.RemoveRoleAssignment(logger, args.options, cb);
-                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-            }
-            else {
-                this.RemoveRoleAssignment(logger, args.options, cb);
-            }
-        };
-        if (args.options.confirm) {
-            removeRoleAssignment();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeRoleAssignment = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing role assignment from web ${args.options.webUrl}...`);
                 }
-                else {
-                    removeRoleAssignment();
+                try {
+                    if (args.options.upn) {
+                        args.options.principalId = yield this.GetUserPrincipalId(args.options);
+                        yield this.RemoveRoleAssignment(logger, args.options);
+                    }
+                    else if (args.options.groupName) {
+                        args.options.principalId = yield this.GetGroupPrincipalId(args.options);
+                        yield this.RemoveRoleAssignment(logger, args.options);
+                    }
+                    else {
+                        yield this.RemoveRoleAssignment(logger, args.options);
+                    }
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeRoleAssignment();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield removeRoleAssignment();
+                }
+            }
+        });
     }
-    RemoveRoleAssignment(logger, options, cb) {
+    RemoveRoleAssignment(logger, options) {
         const requestOptions = {
             url: `${options.webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
             method: 'POST',
@@ -88,9 +85,10 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             },
             responseType: 'json'
         };
-        request_1.default
+        return request_1.default
             .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            .then(_ => Promise.resolve())
+            .catch((err) => Promise.reject(err));
     }
     GetGroupPrincipalId(options) {
         const groupGetCommandOptions = {
@@ -100,7 +98,7 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
             .then((output) => {
             const getGroupOutput = JSON.parse(output.stdout);
             return Promise.resolve(getGroupOutput.Id);
@@ -117,7 +115,7 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
             .then((output) => {
             const getUserOutput = JSON.parse(output.stdout);
             return Promise.resolve(getUserOutput.Id);
@@ -149,7 +147,7 @@ _SpoWebRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoWebRoleAssignm
     });
 }, _SpoWebRoleAssignmentRemoveCommand_initValidators = function _SpoWebRoleAssignmentRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }

package/dist/m365/spo/commands/web/web-roleinheritance-reset.js

@@ -13,16 +13,18 @@ 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 _SpoWebRoleInheritanceResetCommand_instances, _SpoWebRoleInheritanceResetCommand_initOptions, _SpoWebRoleInheritanceResetCommand_initValidators;
+var _SpoWebRoleInheritanceResetCommand_instances, _SpoWebRoleInheritanceResetCommand_initTelemetry, _SpoWebRoleInheritanceResetCommand_initOptions, _SpoWebRoleInheritanceResetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoWebRoleInheritanceResetCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoWebRoleInheritanceResetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoWebRoleInheritanceResetCommand_instances, "m", _SpoWebRoleInheritanceResetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoWebRoleInheritanceResetCommand_instances, "m", _SpoWebRoleInheritanceResetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoWebRoleInheritanceResetCommand_instances, "m", _SpoWebRoleInheritanceResetCommand_initValidators).call(this);
     }
@@ -32,31 +34,60 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand_1.default {
     get description() {
         return 'Restores role inheritance of subsite';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Restore role inheritance of subsite at ${args.options.webUrl}...`);
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/resetroleinheritance`,
-            method: 'POST',
-            headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Restore role inheritance of subsite at ${args.options.webUrl}...`);
+            }
+            const resetWebRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/resetroleinheritance`,
+                        method: 'POST',
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield resetWebRoleInheritance();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to reset the role inheritance of ${args.options.webUrl}`
+                });
+                if (result.continue) {
+                    yield resetWebRoleInheritance();
+                }
+            }
+        });
     }
 }
-_SpoWebRoleInheritanceResetCommand_instances = new WeakSet(), _SpoWebRoleInheritanceResetCommand_initOptions = function _SpoWebRoleInheritanceResetCommand_initOptions() {
+_SpoWebRoleInheritanceResetCommand_instances = new WeakSet(), _SpoWebRoleInheritanceResetCommand_initTelemetry = function _SpoWebRoleInheritanceResetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoWebRoleInheritanceResetCommand_initOptions = function _SpoWebRoleInheritanceResetCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--confirm'
     });
 }, _SpoWebRoleInheritanceResetCommand_initValidators = function _SpoWebRoleInheritanceResetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoWebRoleInheritanceResetCommand();

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoWebSetCommand_instances, _SpoWebSetCommand_initTelemetry, _SpoWebSetCommand_initOptions, _SpoWebSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoWebSetCommand extends SpoCommand_1.default {
@@ -33,52 +33,57 @@ class SpoWebSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Updates subsite properties';
     }
-    commandAction(logger, args, cb) {
-        const payload = {};
-        this.addUnknownOptionsToPayload(payload, args.options);
-        if (args.options.title) {
-            payload.Title = args.options.title;
-        }
-        if (args.options.description) {
-            payload.Description = args.options.description;
-        }
-        if (typeof args.options.siteLogoUrl !== 'undefined') {
-            payload.SiteLogoUrl = args.options.siteLogoUrl;
-        }
-        if (typeof args.options.quickLaunchEnabled !== 'undefined') {
-            payload.QuickLaunchEnabled = args.options.quickLaunchEnabled === 'true';
-        }
-        if (typeof args.options.headerEmphasis !== 'undefined') {
-            payload.HeaderEmphasis = args.options.headerEmphasis;
-        }
-        if (typeof args.options.headerLayout !== 'undefined') {
-            payload.HeaderLayout = args.options.headerLayout === 'standard' ? 1 : 2;
-        }
-        if (typeof args.options.megaMenuEnabled !== 'undefined') {
-            payload.MegaMenuEnabled = args.options.megaMenuEnabled === 'true';
-        }
-        if (typeof args.options.footerEnabled !== 'undefined') {
-            payload.FooterEnabled = args.options.footerEnabled === 'true';
-        }
-        if (typeof args.options.searchScope !== 'undefined') {
-            const searchScope = args.options.searchScope.toLowerCase();
-            payload.SearchScope = SpoWebSetCommand.searchScopeOptions.indexOf(searchScope);
-        }
-        const requestOptions = {
-            url: `${args.options.url}/_api/web`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json',
-            data: payload
-        };
-        if (this.verbose) {
-            logger.logToStderr(`Updating properties of subsite ${args.options.url}...`);
-        }
-        request_1.default
-            .patch(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const payload = {};
+            this.addUnknownOptionsToPayload(payload, args.options);
+            if (args.options.title) {
+                payload.Title = args.options.title;
+            }
+            if (args.options.description) {
+                payload.Description = args.options.description;
+            }
+            if (typeof args.options.siteLogoUrl !== 'undefined') {
+                payload.SiteLogoUrl = args.options.siteLogoUrl;
+            }
+            if (typeof args.options.quickLaunchEnabled !== 'undefined') {
+                payload.QuickLaunchEnabled = args.options.quickLaunchEnabled === 'true';
+            }
+            if (typeof args.options.headerEmphasis !== 'undefined') {
+                payload.HeaderEmphasis = args.options.headerEmphasis;
+            }
+            if (typeof args.options.headerLayout !== 'undefined') {
+                payload.HeaderLayout = args.options.headerLayout === 'standard' ? 1 : 2;
+            }
+            if (typeof args.options.megaMenuEnabled !== 'undefined') {
+                payload.MegaMenuEnabled = args.options.megaMenuEnabled === 'true';
+            }
+            if (typeof args.options.footerEnabled !== 'undefined') {
+                payload.FooterEnabled = args.options.footerEnabled === 'true';
+            }
+            if (typeof args.options.searchScope !== 'undefined') {
+                const searchScope = args.options.searchScope.toLowerCase();
+                payload.SearchScope = SpoWebSetCommand.searchScopeOptions.indexOf(searchScope);
+            }
+            const requestOptions = {
+                url: `${args.options.url}/_api/web`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: payload
+            };
+            if (this.verbose) {
+                logger.logToStderr(`Updating properties of subsite ${args.options.url}...`);
+            }
+            try {
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     allowUnknownOptions() {
         return true;
@@ -128,7 +133,7 @@ _SpoWebSetCommand_instances = new WeakSet(), _SpoWebSetCommand_initTelemetry = f
     });
 }, _SpoWebSetCommand_initValidators = function _SpoWebSetCommand_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.js

@@ -28,6 +28,7 @@ exports.default = {
     CONTENTTYPE_GET: `${prefix} contenttype get`,
     CONTENTTYPE_LIST: `${prefix} contenttype list`,
     CONTENTTYPE_REMOVE: `${prefix} contenttype remove`,
+    CONTENTTYPE_SET: `${prefix} contenttype set`,
     CONTENTTYPEHUB_GET: `${prefix} contenttypehub get`,
     CUSTOMACTION_ADD: `${prefix} customaction add`,
     CUSTOMACTION_CLEAR: `${prefix} customaction clear`,
@@ -55,6 +56,7 @@ exports.default = {
     FILE_MOVE: `${prefix} file move`,
     FILE_REMOVE: `${prefix} file remove`,
     FILE_RENAME: `${prefix} file rename`,
+    FILE_ROLEINHERITANCE_RESET: `${prefix} file roleinheritance reset`,
     FILE_SHARINGINFO_GET: `${prefix} file sharinginfo get`,
     FOLDER_ADD: `${prefix} folder add`,
     FOLDER_COPY: `${prefix} folder copy`,
@@ -63,6 +65,7 @@ exports.default = {
     FOLDER_MOVE: `${prefix} folder move`,
     FOLDER_REMOVE: `${prefix} folder remove`,
     FOLDER_RENAME: `${prefix} folder rename`,
+    FOLDER_ROLEINHERITANCE_RESET: `${prefix} folder roleinheritance reset`,
     GET: `${prefix} get`,
     GROUP_ADD: `${prefix} group add`,
     GROUP_GET: `${prefix} group get`,
@@ -173,6 +176,7 @@ exports.default = {
     REPORT_SITEUSAGEPAGES: `${prefix} report siteusagepages`,
     REPORT_SITEUSAGESITECOUNTS: `${prefix} report siteusagesitecounts`,
     REPORT_SITEUSAGESTORAGE: `${prefix} report siteusagestorage`,
+    ROLEDEFINITION_ADD: `${prefix} roledefinition add`,
     ROLEDEFINITION_GET: `${prefix} roledefinition get`,
     ROLEDEFINITION_LIST: `${prefix} roledefinition list`,
     ROLEDEFINITION_REMOVE: `${prefix} roledefinition remove`,