@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 5.9.0-beta.21a8d94

package/dist/m365/spo/commands/listitem/listitem-record-declare.js

@@ -15,10 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListItemRecordDeclareCommand_instances, _SpoListItemRecordDeclareCommand_initTelemetry, _SpoListItemRecordDeclareCommand_initOptions, _SpoListItemRecordDeclareCommand_initValidators, _SpoListItemRecordDeclareCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
@@ -36,58 +37,57 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
     get description() {
         return "Declares the specified list item as a record";
     }
-    commandAction(logger, args, cb) {
-        let formDigestValue = '';
-        let webIdentity = '';
-        let listId = '';
-        const listRestUrl = args.options.listId
-            ? `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-        utils_1.spo
-            .getRequestDigest(args.options.webUrl)
-            .then((contextResponse) => {
-            formDigestValue = contextResponse.FormDigestValue;
-            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
-        })
-            .then((webIdentityResp) => {
-            webIdentity = webIdentityResp.objectIdentity;
-            if (args.options.listId) {
-                return Promise.resolve({ Id: args.options.listId });
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let formDigestValue = '';
+            let webIdentity = '';
+            let listId = '';
+            try {
+                const listRestUrl = args.options.listId
+                    ? `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`
+                    : `${args.options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                const contextResponse = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                formDigestValue = contextResponse.FormDigestValue;
+                const webIdentityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
+                webIdentity = webIdentityResp.objectIdentity;
+                if (args.options.listId) {
+                    listId = args.options.listId;
+                }
+                else {
+                    const requestOptions = {
+                        url: `${listRestUrl}?$select=Id`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const list = yield request_1.default.get(requestOptions);
+                    listId = list.Id;
+                }
+                const requestBody = this.getDeclareRecordRequestBody(webIdentity, listId, args.options.id, args.options.date || '');
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'Content-Type': 'text/xml',
+                        'X-RequestDigest': formDigestValue
+                    },
+                    data: requestBody
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                else {
+                    const result = json[json.length - 1];
+                    logger.log(result);
+                }
             }
-            const requestOptions = {
-                url: `${listRestUrl}?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((res) => {
-            listId = res.Id;
-            const requestBody = this.getDeclareRecordRequestBody(webIdentity, listId, args.options.id, args.options.date || '');
-            const requestOptions = {
-                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'Content-Type': 'text/xml',
-                    'X-RequestDigest': formDigestValue
-                },
-                data: requestBody
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            else {
-                const result = json[json.length - 1];
-                logger.log(result);
-                cb();
-            }
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     getDeclareRecordRequestBody(webIdentity, listId, id, date) {
         let requestBody = '';
@@ -122,11 +122,11 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
     });
 }, _SpoListItemRecordDeclareCommand_initValidators = function _SpoListItemRecordDeclareCommand_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} in option listId is not a valid GUID`;
         }
         const id = parseInt(args.options.id);
@@ -136,7 +136,7 @@ _SpoListItemRecordDeclareCommand_instances = new WeakSet(), _SpoListItemRecordDe
         if (id < 1) {
             return `Item ID must be a positive number`;
         }
-        if (args.options.date && !utils_1.validation.isValidISODate(args.options.date)) {
+        if (args.options.date && !validation_1.validation.isValidISODate(args.options.date)) {
             return `${args.options.date} in option date is not in ISO format (yyyy-mm-dd)`;
         }
         return true;

package/dist/m365/spo/commands/listitem/listitem-record-undeclare.js

@@ -17,7 +17,9 @@ var _SpoListItemRecordUndeclareCommand_instances, _SpoListItemRecordUndeclareCom
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
@@ -35,59 +37,57 @@ class SpoListItemRecordUndeclareCommand extends SpoCommand_1.default {
     get description() {
         return 'Undeclares list item as a record';
     }
-    commandAction(logger, args, cb) {
-        const listIdArgument = args.options.listId || '';
-        const listTitleArgument = args.options.listTitle || '';
-        const listRestUrl = (args.options.listId ?
-            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
-        let formDigestValue = '';
-        let environmentListId = '';
-        (() => {
-            if (typeof args.options.listId !== 'undefined') {
-                return Promise.resolve({ value: args.options.listId });
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const listIdArgument = args.options.listId || '';
+            const listTitleArgument = args.options.listTitle || '';
+            const listRestUrl = (args.options.listId ?
+                `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(listIdArgument)}')`
+                : `${args.options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
+            let formDigestValue = '';
+            let environmentListId = '';
+            try {
+                if (typeof args.options.listId !== 'undefined') {
+                    environmentListId = args.options.listId;
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr(`Getting list id...`);
+                    }
+                    const listRequestOptions = {
+                        url: `${listRestUrl}/id`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const idResp = yield request_1.default.get(listRequestOptions);
+                    environmentListId = idResp.value;
+                }
+                if (this.debug) {
+                    logger.logToStderr(`getting request digest for request`);
+                }
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                formDigestValue = reqDigest.FormDigestValue;
+                const objectIdentity = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
+                if (this.verbose) {
+                    logger.logToStderr(`Undeclare list item as a record in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
+                }
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'Content-Type': 'text/xml',
+                        'X-RequestDigest': formDigestValue
+                    },
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><StaticMethod TypeId="{ea8e1356-5910-4e69-bc05-d0c30ed657fc}" Name="UndeclareItemAsRecord" Id="53"><Parameters><Parameter ObjectPathId="49" /></Parameters></StaticMethod></Actions><ObjectPaths><Identity Id="49" Name="${objectIdentity.objectIdentity}:list:${environmentListId}:item:${args.options.id},1" /></ObjectPaths></Request>`
+                };
+                yield request_1.default.post(requestOptions);
+                // REST post call doesn't return anything
             }
-            if (this.verbose) {
-                logger.logToStderr(`Getting list id...`);
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            const listRequestOptions = {
-                url: `${listRestUrl}/id`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(listRequestOptions);
-        })()
-            .then((res) => {
-            environmentListId = res.value;
-            if (this.debug) {
-                logger.logToStderr(`getting request digest for request`);
-            }
-            return utils_1.spo.getRequestDigest(args.options.webUrl);
-        })
-            .then((res) => {
-            formDigestValue = res.FormDigestValue;
-            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
-        })
-            .then((objectIdentity) => {
-            if (this.verbose) {
-                logger.logToStderr(`Undeclare list item as a record in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'Content-Type': 'text/xml',
-                    'X-RequestDigest': formDigestValue
-                },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><StaticMethod TypeId="{ea8e1356-5910-4e69-bc05-d0c30ed657fc}" Name="UndeclareItemAsRecord" Id="53"><Parameters><Parameter ObjectPathId="49" /></Parameters></StaticMethod></Actions><ObjectPaths><Identity Id="49" Name="${objectIdentity.objectIdentity}:list:${environmentListId}:item:${args.options.id},1" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(() => {
-            // REST post call doesn't return anything
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoListItemRecordUndeclareCommand_instances = new WeakSet(), _SpoListItemRecordUndeclareCommand_initTelemetry = function _SpoListItemRecordUndeclareCommand_initTelemetry() {
@@ -113,12 +113,12 @@ _SpoListItemRecordUndeclareCommand_instances = new WeakSet(), _SpoListItemRecord
         if (isNaN(id)) {
             return `${args.options.id} is not a valid list item ID`;
         }
-        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)) {
+            !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         return true;

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListItemRemoveCommand_instances, _SpoListItemRemoveCommand_initTelemetry, _SpoListItemRemoveCommand_initOptions, _SpoListItemRemoveCommand_initValidators, _SpoListItemRemoveCommand_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 validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemRemoveCommand extends SpoCommand_1.default {
@@ -35,57 +36,56 @@ class SpoListItemRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified list item';
     }
-    commandAction(logger, args, cb) {
-        const removeListItem = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing list item in site at ${args.options.webUrl}...`);
-            }
-            let requestUrl = '';
-            if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
-            }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-            }
-            requestUrl += `/items(${args.options.id})`;
-            if (args.options.recycle) {
-                requestUrl += `/recycle()`;
-            }
-            const requestOptions = {
-                url: requestUrl,
-                method: 'POST',
-                headers: {
-                    'X-HTTP-Method': 'DELETE',
-                    'If-Match': '*',
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .post(requestOptions)
-                .then(() => {
-                // REST post call doesn't return anything
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeListItem();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the list item ${args.options.id} from list ${args.options.listId || args.options.listTitle} located in site ${args.options.webUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeListItem = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing list item in site at ${args.options.webUrl}...`);
+                }
+                let requestUrl = '';
+                if (args.options.listId) {
+                    requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
                 }
                 else {
-                    removeListItem();
+                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                }
+                requestUrl += `/items(${args.options.id})`;
+                if (args.options.recycle) {
+                    requestUrl += `/recycle()`;
+                }
+                const requestOptions = {
+                    url: requestUrl,
+                    method: 'POST',
+                    headers: {
+                        'X-HTTP-Method': 'DELETE',
+                        'If-Match': '*',
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.post(requestOptions);
+                    // REST post call doesn't return anything
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeListItem();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the list item ${args.options.id} from list ${args.options.listId || args.options.listTitle} located in site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield removeListItem();
+                }
+            }
+        });
     }
 }
 _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_initTelemetry = function _SpoListItemRemoveCommand_initTelemetry() {
@@ -117,12 +117,12 @@ _SpoListItemRemoveCommand_instances = new WeakSet(), _SpoListItemRemoveCommand_i
         if (isNaN(id)) {
             return `${args.options.id} is not a valid list item ID`;
         }
-        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)) {
+            !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         return true;

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");
@@ -36,61 +38,58 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes a role assignment from list item permissions';
     }
-    commandAction(logger, args, cb) {
-        const removeRoleAssignment = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing role assignment from listitem in site at ${args.options.webUrl}...`);
-            }
-            let requestUrl = `${args.options.webUrl}/_api/web/`;
-            if (args.options.listId) {
-                requestUrl += `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
-            }
-            else if (args.options.listTitle) {
-                requestUrl += `lists/getByTitle('${utils_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)}')/`;
-            }
-            requestUrl += `items(${args.options.listItemId})/`;
-            if (args.options.upn) {
-                this.GetUserPrincipalId(args.options)
-                    .then((userPrincipalId) => {
-                    args.options.principalId = userPrincipalId;
-                    this.RemoveRoleAssignment(requestUrl, 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(requestUrl, logger, args.options, cb);
-                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-            }
-            else {
-                this.RemoveRoleAssignment(requestUrl, 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 listitem ${args.options.listItemId} from list ${args.options.listId || args.options.listTitle} from site ${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 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);
+                    }
                 }
-                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 listitem ${args.options.listItemId} from list ${args.options.listId || args.options.listTitle} from site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield removeRoleAssignment();
+                }
+            }
+        });
     }
-    RemoveRoleAssignment(requestUrl, logger, options, cb) {
+    RemoveRoleAssignment(requestUrl, logger, options) {
         const requestOptions = {
             url: `${requestUrl}roleassignments/removeroleassignment(principalid='${options.principalId}')`,
             method: 'POST',
@@ -100,9 +99,10 @@ class SpoListItemRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             },
             responseType: 'json'
         };
-        request_1.default
+        return request_1.default
             .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            .then(_ => Promise.resolve())
+            .catch((err) => Promise.reject(err));
     }
     GetGroupPrincipalId(options) {
         const groupGetCommandOptions = {
@@ -112,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);
@@ -129,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);
@@ -172,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)) {