@pnp/cli-microsoft365 6.9.0-beta.bb31388 → 6.9.0-beta.cdf4be7

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

@@ -90,51 +90,46 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
         });
     }
     removeRoleAssignment(requestUrl, logger, options) {
-        const requestOptions = {
-            url: `${requestUrl}roleassignments/removeroleassignment(principalid='${options.principalId}')`,
-            method: 'POST',
-            headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .post(requestOptions)
-            .then(_ => Promise.resolve())
-            .catch((err) => Promise.reject(err));
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${requestUrl}roleassignments/removeroleassignment(principalid='${options.principalId}')`,
+                method: 'POST',
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.post(requestOptions);
+        });
     }
     getGroupPrincipalId(options) {
-        const groupGetCommandOptions = {
-            webUrl: options.webUrl,
-            name: options.groupName,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
-            .then((output) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            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 Promise.resolve(getGroupOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
+            return getGroupOutput.Id;
         });
     }
     getUserPrincipalId(options) {
-        const userGetCommandOptions = {
-            webUrl: options.webUrl,
-            email: options.upn,
-            id: undefined,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
-            .then((output) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            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 Promise.resolve(getUserOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
+            return getUserOutput.Id;
         });
     }
 }

package/dist/m365/spo/commands/list/list-sensitivitylabel-ensure.js

@@ -0,0 +1,137 @@
+"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 _SpoListSensitivityLabelEnsureCommand_instances, _SpoListSensitivityLabelEnsureCommand_initTelemetry, _SpoListSensitivityLabelEnsureCommand_initOptions, _SpoListSensitivityLabelEnsureCommand_initValidators, _SpoListSensitivityLabelEnsureCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+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 SpoListSensitivityLabelEnsureCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.LIST_SENSITIVITYLABEL_ENSURE;
+    }
+    get description() {
+        return 'Applies a default sensitivity label to the specified document library';
+    }
+    constructor() {
+        super();
+        _SpoListSensitivityLabelEnsureCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoListSensitivityLabelEnsureCommand_instances, "m", _SpoListSensitivityLabelEnsureCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoListSensitivityLabelEnsureCommand_instances, "m", _SpoListSensitivityLabelEnsureCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoListSensitivityLabelEnsureCommand_instances, "m", _SpoListSensitivityLabelEnsureCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListSensitivityLabelEnsureCommand_instances, "m", _SpoListSensitivityLabelEnsureCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const sensitivityLabelId = yield this.getSensitivityLabelId(args, logger);
+                if (this.verbose) {
+                    logger.logToStderr(`Applying a sensitivity label ${sensitivityLabelId} to the document library...`);
+                }
+                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)}')`;
+                }
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        accept: 'application/json;odata=nometadata',
+                        'content-type': 'application/json;odata=nometadata',
+                        'if-match': '*'
+                    },
+                    data: { 'DefaultSensitivityLabelForLibrary': sensitivityLabelId },
+                    responseType: 'json'
+                };
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getSensitivityLabelId(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { id, name } = args.options;
+            if (id) {
+                return id;
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving sensitivity label id of ${name}...`);
+            }
+            const requestOptions = {
+                url: `https://graph.microsoft.com/beta/security/informationProtection/sensitivityLabels?$filter=name eq '${formatting_1.formatting.encodeQueryParameter(name)}'&$select=id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            const sensitivityLabelItem = res.value[0];
+            if (!sensitivityLabelItem) {
+                throw Error(`The specified sensitivity label does not exist`);
+            }
+            return sensitivityLabelItem.id;
+        });
+    }
+}
+_SpoListSensitivityLabelEnsureCommand_instances = new WeakSet(), _SpoListSensitivityLabelEnsureCommand_initTelemetry = function _SpoListSensitivityLabelEnsureCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            name: typeof args.options.name !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined'
+        });
+    });
+}, _SpoListSensitivityLabelEnsureCommand_initOptions = function _SpoListSensitivityLabelEnsureCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '-l, --listId [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
+    });
+}, _SpoListSensitivityLabelEnsureCommand_initValidators = function _SpoListSensitivityLabelEnsureCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+}, _SpoListSensitivityLabelEnsureCommand_initOptionSets = function _SpoListSensitivityLabelEnsureCommand_initOptionSets() {
+    this.optionSets.push({ options: ['name', 'id'] }, { options: ['listId', 'listTitle', 'listUrl'] });
+};
+module.exports = new SpoListSensitivityLabelEnsureCommand();
+//# sourceMappingURL=list-sensitivitylabel-ensure.js.map

package/dist/m365/spo/commands/list/list-view-field-add.js

@@ -101,16 +101,18 @@ class SpoListViewFieldAddCommand extends SpoCommand_1.default {
         });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
-        const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
-        const requestOptions = {
-            url: getRequestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
+            const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
+            const requestOptions = {
+                url: getRequestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
     }
 }
 _SpoListViewFieldAddCommand_instances = new WeakSet(), _SpoListViewFieldAddCommand_initTelemetry = function _SpoListViewFieldAddCommand_initTelemetry() {

package/dist/m365/spo/commands/list/list-view-field-remove.js

@@ -92,16 +92,18 @@ class SpoListViewFieldRemoveCommand extends SpoCommand_1.default {
         });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
-        const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
-        const requestOptions = {
-            url: getRequestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
+            const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
+            const requestOptions = {
+                url: getRequestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
     }
 }
 _SpoListViewFieldRemoveCommand_instances = new WeakSet(), _SpoListViewFieldRemoveCommand_initTelemetry = function _SpoListViewFieldRemoveCommand_initTelemetry() {

package/dist/m365/spo/commands/list/list-view-field-set.js

@@ -78,16 +78,18 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
         });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
-        const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
-        const requestOptions = {
-            url: getRequestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
+            const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
+            const requestOptions = {
+                url: getRequestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
     }
 }
 _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetCommand_initTelemetry = function _SpoListViewFieldSetCommand_initTelemetry() {

package/dist/m365/spo/commands/list/list-view-remove.js

@@ -40,6 +40,9 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const removeViewFromList = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing view ${args.options.id || args.options.title} from list ${args.options.listId || args.options.listTitle || args.options.listUrl}`);
+                }
                 let listSelector = '';
                 if (args.options.listId) {
                     listSelector = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;

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

@@ -79,21 +79,16 @@ class SpoListItemRoleAssignmentAddCommand extends SpoCommand_1.default {
     }
     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);
-            }
+            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);
         });
     }
     getRoleDefinitionId(options) {
@@ -101,60 +96,45 @@ class SpoListItemRoleAssignmentAddCommand extends SpoCommand_1.default {
             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);
-            }
+            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;
         });
     }
     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);
-            }
+            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;
         });
     }
     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);
-            }
+            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;
         });
     }
 }

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

@@ -41,41 +41,8 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand_1.default {
     }
     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 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})/`;
-                    if (args.options.upn) {
-                        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);
-                    }
-                    else {
-                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
-                    }
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeRoleAssignment();
+                yield this.removeRoleAssignment(logger, args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -85,57 +52,87 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove role assignment from listitem ${args.options.listItemId} from list ${args.options.listId || args.options.listTitle} from site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
-                    yield removeRoleAssignment();
+                    yield this.removeRoleAssignment(logger, args.options);
                 }
             }
         });
     }
-    removeRoleAssignment(requestUrl, logger, options) {
-        const requestOptions = {
-            url: `${requestUrl}roleassignments/removeroleassignment(principalid='${options.principalId}')`,
-            method: 'POST',
-            headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .post(requestOptions)
-            .then(_ => Promise.resolve())
-            .catch((err) => Promise.reject(err));
+    removeRoleAssignment(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing role assignment from listitem in site at ${options.webUrl}...`);
+            }
+            try {
+                let requestUrl = `${options.webUrl}/_api/web/`;
+                if (options.listId) {
+                    requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(options.listId)}')/`;
+                }
+                else if (options.listTitle) {
+                    requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')/`;
+                }
+                else if (options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                    requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+                }
+                requestUrl += `items(${options.listItemId})/`;
+                if (options.upn) {
+                    options.principalId = yield this.getUserPrincipalId(options);
+                    yield this.removeRoleAssignmentWithRequestUrl(requestUrl, logger, options);
+                }
+                else if (options.groupName) {
+                    options.principalId = yield this.getGroupPrincipalId(options);
+                    yield this.removeRoleAssignmentWithRequestUrl(requestUrl, logger, options);
+                }
+                else {
+                    yield this.removeRoleAssignmentWithRequestUrl(requestUrl, logger, options);
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    removeRoleAssignmentWithRequestUrl(requestUrl, logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${requestUrl}roleassignments/removeroleassignment(principalid='${options.principalId}')`,
+                method: 'POST',
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
     }
     getGroupPrincipalId(options) {
-        const groupGetCommandOptions = {
-            webUrl: options.webUrl,
-            name: options.groupName,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
-            .then((output) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            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 Promise.resolve(getGroupOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
+            return getGroupOutput.Id;
         });
     }
     getUserPrincipalId(options) {
-        const userGetCommandOptions = {
-            webUrl: options.webUrl,
-            email: options.upn,
-            id: undefined,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
-            .then((output) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            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 Promise.resolve(getUserOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
+            return getUserOutput.Id;
         });
     }
 }