@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.636d726

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

@@ -0,0 +1,239 @@
+"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 _SpoListItemRoleAssignmentAddCommand_instances, _SpoListItemRoleAssignmentAddCommand_initTelemetry, _SpoListItemRoleAssignmentAddCommand_initOptions, _SpoListItemRoleAssignmentAddCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoUserGetCommand = require("../user/user-get");
+const SpoGroupGetCommand = require("../group/group-get");
+const SpoRoleDefinitionListCommand = require("../roledefinition/roledefinition-list");
+const validation_1 = require("../../../../utils/validation");
+const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const Cli_1 = require("../../../../cli/Cli");
+class SpoListItemRoleAssignmentAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoListItemRoleAssignmentAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListItemRoleAssignmentAddCommand_instances, "m", _SpoListItemRoleAssignmentAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRoleAssignmentAddCommand_instances, "m", _SpoListItemRoleAssignmentAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListItemRoleAssignmentAddCommand_instances, "m", _SpoListItemRoleAssignmentAddCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.LISTITEM_ROLEASSIGNMENT_ADD;
+    }
+    get description() {
+        return 'Adds a role assignment to a listitem.';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Adding role assignment to listitem in site at ${args.options.webUrl}...`);
+            }
+            try {
+                let requestUrl = `${args.options.webUrl}/_api/web/`;
+                if (args.options.listId) {
+                    requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+                }
+                else if (args.options.listTitle) {
+                    requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+                }
+                else if (args.options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+                }
+                requestUrl += `items(${args.options.listItemId})/`;
+                const roleDefinitionId = yield this.getRoleDefinitionId(args.options);
+                let principalId = 0;
+                if (args.options.upn) {
+                    principalId = yield this.getUserPrincipalId(args.options);
+                    yield this.addRoleAssignment(requestUrl, roleDefinitionId, principalId);
+                }
+                else if (args.options.groupName) {
+                    principalId = yield this.getGroupPrincipalId(args.options);
+                    yield this.addRoleAssignment(requestUrl, roleDefinitionId, principalId);
+                }
+                else {
+                    principalId = args.options.principalId;
+                    yield this.addRoleAssignment(requestUrl, roleDefinitionId, principalId);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    addRoleAssignment(requestUrl, roleDefinitionId, principalId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${requestUrl}roleassignments/addroleassignment(principalid='${principalId}',roledefid='${roleDefinitionId}')`,
+                    method: 'POST',
+                    headers: {
+                        'accept': 'application/json;odata=nometadata',
+                        'content-type': 'application/json'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                return Promise.reject(err);
+            }
+        });
+    }
+    getRoleDefinitionId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!options.roleDefinitionName) {
+                return options.roleDefinitionId;
+            }
+            try {
+                const roleDefinitionListCommandOptions = {
+                    webUrl: options.webUrl,
+                    output: 'json',
+                    debug: this.debug,
+                    verbose: this.verbose
+                };
+                const output = yield Cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) });
+                const getRoleDefinitionListOutput = JSON.parse(output.stdout);
+                const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
+                return roleDefinitionId;
+            }
+            catch (err) {
+                return Promise.reject(err);
+            }
+        });
+    }
+    getGroupPrincipalId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const groupGetCommandOptions = {
+                    webUrl: options.webUrl,
+                    name: options.groupName,
+                    output: 'json',
+                    debug: this.debug,
+                    verbose: this.verbose
+                };
+                const output = yield Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) });
+                const getGroupOutput = JSON.parse(output.stdout);
+                return getGroupOutput.Id;
+            }
+            catch (err) {
+                return Promise.reject(err);
+            }
+        });
+    }
+    getUserPrincipalId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const userGetCommandOptions = {
+                    webUrl: options.webUrl,
+                    email: options.upn,
+                    id: undefined,
+                    output: 'json',
+                    debug: this.debug,
+                    verbose: this.verbose
+                };
+                const output = yield Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) });
+                const getUserOutput = JSON.parse(output.stdout);
+                return getUserOutput.Id;
+            }
+            catch (err) {
+                return Promise.reject(err);
+            }
+        });
+    }
+}
+_SpoListItemRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListItemRoleAssignmentAddCommand_initTelemetry = function _SpoListItemRoleAssignmentAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            principalId: typeof args.options.principalId !== 'undefined',
+            upn: typeof args.options.upn !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
+            roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined'
+        });
+    });
+}, _SpoListItemRoleAssignmentAddCommand_initOptions = function _SpoListItemRoleAssignmentAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--listItemId <listItemId>'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '--principalId [principalId]'
+    }, {
+        option: '--upn [upn]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--roleDefinitionId [roleDefinitionId]'
+    }, {
+        option: '--roleDefinitionName [roleDefinitionName]'
+    });
+}, _SpoListItemRoleAssignmentAddCommand_initValidators = function _SpoListItemRoleAssignmentAddCommand_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;
+        }
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
+        }
+        if (args.options.listItemId && isNaN(args.options.listItemId)) {
+            return `Specified listItemId ${args.options.listItemId} is not a number`;
+        }
+        if (args.options.principalId && isNaN(args.options.principalId)) {
+            return `Specified principalId ${args.options.principalId} is not a number`;
+        }
+        if (args.options.roleDefinitionId && isNaN(args.options.roleDefinitionId)) {
+            return `Specified roleDefinitionId ${args.options.roleDefinitionId} is not a number`;
+        }
+        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
+        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either list id or title or list url`;
+        }
+        if (listOptions.filter(item => item !== undefined).length === 0) {
+            return `Specify at least list id or title or list url`;
+        }
+        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
+        if (!principalOptions.some(item => item !== undefined)) {
+            return `Specify either principalId, upn or groupName`;
+        }
+        if (principalOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either principalId, upn or groupName but not multiple`;
+        }
+        const roleDefinitionOptions = [args.options.roleDefinitionId, args.options.roleDefinitionName];
+        if (!roleDefinitionOptions.some(item => item !== undefined)) {
+            return `Specify either roleDefinitionId or roleDefinitionName`;
+        }
+        if (roleDefinitionOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either roleDefinitionId or roleDefinitionName but not multiple`;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoListItemRoleAssignmentAddCommand();
+//# sourceMappingURL=listitem-roleassignment-add.js.map

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListItemRoleAssignmentRemoveCommand_instances, _SpoListItemRoleAssignmentRemoveCommand_initTelemetry, _SpoListItemRoleAssignmentRemoveCommand_initOptions, _SpoListItemRoleAssignmentRemoveCommand_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 formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SpoUserGetCommand = require("../user/user-get");
@@ -45,26 +47,26 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                 try {
                     let requestUrl = `${args.options.webUrl}/_api/web/`;
                     if (args.options.listId) {
-                        requestUrl += `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+                        requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
                     }
                     else if (args.options.listTitle) {
-                        requestUrl += `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+                        requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
                     }
                     else if (args.options.listUrl) {
-                        const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                        requestUrl += `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                     }
                     requestUrl += `items(${args.options.listItemId})/`;
                     if (args.options.upn) {
-                        args.options.principalId = yield this.GetUserPrincipalId(args.options);
-                        yield this.RemoveRoleAssignment(requestUrl, logger, args.options);
+                        args.options.principalId = yield this.getUserPrincipalId(args.options);
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
                     }
                     else if (args.options.groupName) {
-                        args.options.principalId = yield this.GetGroupPrincipalId(args.options);
-                        yield this.RemoveRoleAssignment(requestUrl, logger, args.options);
+                        args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
                     }
                     else {
-                        yield this.RemoveRoleAssignment(requestUrl, logger, args.options);
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
                     }
                 }
                 catch (err) {
@@ -75,7 +77,7 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                 yield removeRoleAssignment();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -87,7 +89,7 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             }
         });
     }
-    RemoveRoleAssignment(requestUrl, logger, options) {
+    removeRoleAssignment(requestUrl, logger, options) {
         const requestOptions = {
             url: `${requestUrl}roleassignments/removeroleassignment(principalid='${options.principalId}')`,
             method: 'POST',
@@ -102,7 +104,7 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             .then(_ => Promise.resolve())
             .catch((err) => Promise.reject(err));
     }
-    GetGroupPrincipalId(options) {
+    getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -110,7 +112,7 @@ class SpoListItemRoleAssignmentRemoveCommand 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);
@@ -118,7 +120,7 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             return Promise.reject(err);
         });
     }
-    GetUserPrincipalId(options) {
+    getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,
@@ -127,7 +129,7 @@ class SpoListItemRoleAssignmentRemoveCommand 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);
@@ -170,11 +172,11 @@ _SpoListItemRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListItemR
     });
 }, _SpoListItemRoleAssignmentRemoveCommand_initValidators = function _SpoListItemRoleAssignmentRemoveCommand_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.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         if (args.options.listItemId && isNaN(args.options.listItemId)) {

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListItemRoleInheritanceBreakCommand_instances, _SpoListItemRoleInheritanceBreakCommand_initTelemetry, _SpoListItemRoleInheritanceBreakCommand_initOptions, _SpoListItemRoleInheritanceBreakCommand_initValidators, _SpoListItemRoleInheritanceBreakCommand_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 formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemRoleInheritanceBreakCommand extends SpoCommand_1.default {
@@ -43,12 +45,16 @@ class SpoListItemRoleInheritanceBreakCommand extends SpoCommand_1.default {
             }
             const breakListItemRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    let requestUrl = `${args.options.webUrl}/_api/web/lists`;
+                    let requestUrl = `${args.options.webUrl}/_api/web`;
                     if (args.options.listId) {
-                        requestUrl += `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                        requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
                     }
-                    else {
-                        requestUrl += `/getbytitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    else if (args.options.listTitle) {
+                        requestUrl += `/lists/getbytitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    }
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
                     }
                     let keepExistingPermissions = true;
                     if (args.options.clearExistingPermissions) {
@@ -73,7 +79,7 @@ class SpoListItemRoleInheritanceBreakCommand extends SpoCommand_1.default {
                 yield breakListItemRoleInheritance();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -91,6 +97,7 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             clearExistingPermissions: args.options.clearExistingPermissions === true,
             confirm: (!(!args.options.confirm)).toString()
         });
@@ -104,6 +111,8 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-c, --clearExistingPermissions'
     }, {
@@ -111,11 +120,11 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
     });
 }, _SpoListItemRoleInheritanceBreakCommand_initValidators = function _SpoListItemRoleInheritanceBreakCommand_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.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         if (isNaN(args.options.listItemId)) {
@@ -124,7 +133,7 @@ _SpoListItemRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListItemR
         return true;
     }));
 }, _SpoListItemRoleInheritanceBreakCommand_initOptionSets = function _SpoListItemRoleInheritanceBreakCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListItemRoleInheritanceBreakCommand();
 //# sourceMappingURL=listitem-roleinheritance-break.js.map

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListItemRoleInheritanceResetCommand_instances, _SpoListItemRoleInheritanceResetCommand_initTelemetry, _SpoListItemRoleInheritanceResetCommand_initOptions, _SpoListItemRoleInheritanceResetCommand_initValidators, _SpoListItemRoleInheritanceResetCommand_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 formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemRoleInheritanceResetCommand extends SpoCommand_1.default {
@@ -43,12 +45,16 @@ class SpoListItemRoleInheritanceResetCommand extends SpoCommand_1.default {
             }
             const resetListItemRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    let requestUrl = `${args.options.webUrl}/_api/web/lists`;
+                    let requestUrl = `${args.options.webUrl}/_api/web`;
                     if (args.options.listId) {
-                        requestUrl += `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                        requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
                     }
-                    else {
-                        requestUrl += `/getbytitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    else if (args.options.listTitle) {
+                        requestUrl += `/lists/getbytitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    }
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
                     }
                     const requestOptions = {
                         url: `${requestUrl}/items(${args.options.listItemId})/resetroleinheritance`,
@@ -69,7 +75,7 @@ class SpoListItemRoleInheritanceResetCommand extends SpoCommand_1.default {
                 yield resetListItemRoleInheritance();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -87,6 +93,7 @@ _SpoListItemRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListItemR
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -99,16 +106,18 @@ _SpoListItemRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListItemR
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '--confirm'
     });
 }, _SpoListItemRoleInheritanceResetCommand_initValidators = function _SpoListItemRoleInheritanceResetCommand_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.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         if (isNaN(args.options.listItemId)) {
@@ -117,7 +126,7 @@ _SpoListItemRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListItemR
         return true;
     }));
 }, _SpoListItemRoleInheritanceResetCommand_initOptionSets = function _SpoListItemRoleInheritanceResetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListItemRoleInheritanceResetCommand();
 //# sourceMappingURL=listitem-roleinheritance-reset.js.map