@pnp/cli-microsoft365 6.0.0-beta.0b0fb88 → 6.0.0-beta.1cd4e45

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

@@ -13,11 +13,11 @@ 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 _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators;
+var _SpoWebRoleAssignmentAddCommand_instances, _SpoWebRoleAssignmentAddCommand_initTelemetry, _SpoWebRoleAssignmentAddCommand_initOptions, _SpoWebRoleAssignmentAddCommand_initValidators, _SpoWebRoleAssignmentAddCommand_initOptionSets;
 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");
@@ -30,6 +30,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentAddCommand_instances, "m", _SpoWebRoleAssignmentAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.WEB_ROLEASSIGNMENT_ADD;
@@ -37,33 +38,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,11 +72,12 @@ 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) {
+    getRoleDefinitionId(options) {
         if (!options.roleDefinitionName) {
             return Promise.resolve(options.roleDefinitionId);
         }
@@ -87,7 +87,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;
@@ -96,7 +96,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             return Promise.reject(err);
         });
     }
-    GetGroupPrincipalId(options) {
+    getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -104,7 +104,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);
@@ -112,7 +112,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand_1.default {
             return Promise.reject(err);
         });
     }
-    GetUserPrincipalId(options) {
+    getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,
@@ -121,7 +121,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 +156,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;
         }
@@ -166,22 +166,10 @@ _SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignment
         if (args.options.roleDefinitionId && isNaN(args.options.roleDefinitionId)) {
             return `Specified roleDefinitionId ${args.options.roleDefinitionId} is not a number`;
         }
-        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
-        if (principalOptions.some(item => item !== undefined) && principalOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either principalId id or upn or groupName`;
-        }
-        if (principalOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least principalId id or upn or groupName`;
-        }
-        const roleDefinitionOptions = [args.options.roleDefinitionId, args.options.roleDefinitionName];
-        if (roleDefinitionOptions.some(item => item !== undefined) && roleDefinitionOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either roleDefinitionId id or roleDefinitionName`;
-        }
-        if (roleDefinitionOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least roleDefinitionId id or roleDefinitionName`;
-        }
         return true;
     }));
+}, _SpoWebRoleAssignmentAddCommand_initOptionSets = function _SpoWebRoleAssignmentAddCommand_initOptionSets() {
+    this.optionSets.push(['principalId', 'upn', 'groupName'], ['roleDefinitionId', 'roleDefinitionName']);
 };
 module.exports = new SpoWebRoleAssignmentAddCommand();
 //# sourceMappingURL=web-roleassignment-add.js.map

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

@@ -13,11 +13,11 @@ 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 _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators;
+var _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators, _SpoWebRoleAssignmentRemoveCommand_initOptionSets;
 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");
@@ -29,6 +29,7 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.WEB_ROLEASSIGNMENT_REMOVE;
@@ -36,49 +37,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}...`);
+                }
+                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);
+                    }
                 }
-                else {
-                    removeRoleAssignment();
+                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,11 +86,12 @@ 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) {
+    getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -100,7 +99,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);
@@ -108,7 +107,7 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             return Promise.reject(err);
         });
     }
-    GetUserPrincipalId(options) {
+    getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,
@@ -117,7 +116,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,22 +148,17 @@ _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;
         }
         if (args.options.principalId && isNaN(args.options.principalId)) {
             return `Specified principalId ${args.options.principalId} is not a number`;
         }
-        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
-        if (principalOptions.some(item => item !== undefined) && principalOptions.filter(item => item !== undefined).length > 1) {
-            return `Specify either principalId id or upn or groupName`;
-        }
-        if (principalOptions.filter(item => item !== undefined).length === 0) {
-            return `Specify at least principalId id or upn or groupName`;
-        }
         return true;
     }));
+}, _SpoWebRoleAssignmentRemoveCommand_initOptionSets = function _SpoWebRoleAssignmentRemoveCommand_initOptionSets() {
+    this.optionSets.push(['principalId', 'upn', 'groupName']);
 };
 module.exports = new SpoWebRoleAssignmentRemoveCommand();
 //# sourceMappingURL=web-roleassignment-remove.js.map

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

@@ -0,0 +1,100 @@
+"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 _SpoWebRoleInheritanceBreakCommand_instances, _SpoWebRoleInheritanceBreakCommand_initTelemetry, _SpoWebRoleInheritanceBreakCommand_initOptions, _SpoWebRoleInheritanceBreakCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+class SpoWebRoleInheritanceBreakCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoWebRoleInheritanceBreakCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoWebRoleInheritanceBreakCommand_instances, "m", _SpoWebRoleInheritanceBreakCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleInheritanceBreakCommand_instances, "m", _SpoWebRoleInheritanceBreakCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoWebRoleInheritanceBreakCommand_instances, "m", _SpoWebRoleInheritanceBreakCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.WEB_ROLEINHERITANCE_BREAK;
+    }
+    get description() {
+        return 'Break role inheritance of subsite';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Break role inheritance of subsite with URL ${args.options.webUrl}...`);
+            }
+            const breakroleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/web/breakroleinheritance(${!args.options.clearExistingPermissions})`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata',
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield breakroleInheritance();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to break the role inheritance of subsite ${args.options.webUrl}`
+                });
+                if (result.continue) {
+                    yield breakroleInheritance();
+                }
+            }
+        });
+    }
+}
+_SpoWebRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoWebRoleInheritanceBreakCommand_initTelemetry = function _SpoWebRoleInheritanceBreakCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            clearExistingPermissions: !!args.options.clearExistingPermissions,
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoWebRoleInheritanceBreakCommand_initOptions = function _SpoWebRoleInheritanceBreakCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-c, --clearExistingPermissions'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoWebRoleInheritanceBreakCommand_initValidators = function _SpoWebRoleInheritanceBreakCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoWebRoleInheritanceBreakCommand();
+//# sourceMappingURL=web-roleinheritance-break.js.map

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoWebRoleInheritanceResetCommand_instances, _SpoWebRoleInheritanceResetCommand_initTelemetry, _SpoWebRoleInheritanceResetCommand_initOptions, _SpoWebRoleInheritanceResetCommand_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 SpoWebRoleInheritanceResetCommand extends SpoCommand_1.default {
@@ -34,42 +34,43 @@ 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 resetWebRoleInheritance = () => {
-            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));
-        };
-        if (args.options.confirm) {
-            resetWebRoleInheritance();
-        }
-        else {
-            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}`
-            }, (result) => {
-                if (!result.continue) {
-                    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);
                 }
-                else {
-                    resetWebRoleInheritance();
+                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_initTelemetry = function _SpoWebRoleInheritanceResetCommand_initTelemetry() {
@@ -86,7 +87,7 @@ _SpoWebRoleInheritanceResetCommand_instances = new WeakSet(), _SpoWebRoleInherit
     });
 }, _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();