@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 5.9.0-beta.005c47a

package/dist/m365/spo/commands/list/list-label-set.js

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListLabelSetCommand_instances, _SpoListLabelSetCommand_initTelemetry, _SpoListLabelSetCommand_initOptions, _SpoListLabelSetCommand_initValidators, _SpoListLabelSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 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 SpoListLabelSetCommand extends SpoCommand_1.default {
@@ -34,52 +36,54 @@ class SpoListLabelSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Sets classification label on the specified list';
     }
-    commandAction(logger, args, cb) {
-        (() => {
-            let listRestUrl = '';
-            if (args.options.listUrl) {
-                const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                return Promise.resolve(listServerRelativeUrl);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let listRestUrl = '';
+                let listServerRelativeUrl = '';
+                if (args.options.listUrl) {
+                    const listServerRelativeUrlFromPath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    listServerRelativeUrl = listServerRelativeUrlFromPath;
+                }
+                else {
+                    if (args.options.listId) {
+                        listRestUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+                    }
+                    else {
+                        listRestUrl = `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
+                    }
+                    const requestOptions = {
+                        url: `${args.options.webUrl}/_api/web/${listRestUrl}?$expand=RootFolder&$select=RootFolder`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const listInstance = yield request_1.default.get(requestOptions);
+                    listServerRelativeUrl = listInstance.RootFolder.ServerRelativeUrl;
+                }
+                const listAbsoluteUrl = urlUtil_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
+                const requestUrl = `${args.options.webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetListComplianceTag`;
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    data: {
+                        listUrl: listAbsoluteUrl,
+                        complianceTagValue: args.options.label,
+                        blockDelete: args.options.blockDelete || false,
+                        blockEdit: args.options.blockEdit || false,
+                        syncToItems: args.options.syncToItems || false
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
             }
-            else if (args.options.listId) {
-                listRestUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            else {
-                listRestUrl = `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
-            }
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/${listRestUrl}?$expand=RootFolder&$select=RootFolder`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default
-                .get(requestOptions)
-                .then((listInstance) => {
-                return Promise.resolve(listInstance.RootFolder.ServerRelativeUrl);
-            });
-        })()
-            .then((listServerRelativeUrl) => {
-            const listAbsoluteUrl = utils_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
-            const requestUrl = `${args.options.webUrl}/_api/SP_CompliancePolicy_SPPolicyStoreProxy_SetListComplianceTag`;
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: {
-                    listUrl: listAbsoluteUrl,
-                    complianceTagValue: args.options.label,
-                    blockDelete: args.options.blockDelete || false,
-                    blockEdit: args.options.blockEdit || false,
-                    syncToItems: args.options.syncToItems || false
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _SpoListLabelSetCommand_instances = new WeakSet(), _SpoListLabelSetCommand_initTelemetry = function _SpoListLabelSetCommand_initTelemetry() {
@@ -113,10 +117,10 @@ _SpoListLabelSetCommand_instances = new WeakSet(), _SpoListLabelSetCommand_initT
     });
 }, _SpoListLabelSetCommand_initValidators = function _SpoListLabelSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoListLabelSetCommand_initOptionSets = function _SpoListLabelSetCommand_initOptionSets() {
     this.optionSets.push(['listId', 'listTitle', 'listUrl']);

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListListCommand_instances, _SpoListListCommand_initTelemetry, _SpoListListCommand_initOptions, _SpoListListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListListCommand extends SpoCommand_1.default {
@@ -36,28 +36,31 @@ class SpoListListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Title', 'Url', 'Id'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving all lists in site at ${args.options.webUrl}...`);
-        }
-        const suffix = args.options.executeWithLimitedPermissions ? '&$select=RootFolder/ServerRelativeUrl,*' : '';
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/lists?$expand=RootFolder${suffix}`,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((listInstances) => {
-            listInstances.value.forEach(l => {
-                l.Url = l.RootFolder.ServerRelativeUrl;
-            });
-            logger.log(listInstances.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving all lists in site at ${args.options.webUrl}...`);
+            }
+            const suffix = args.options.executeWithLimitedPermissions ? '&$select=RootFolder/ServerRelativeUrl,*' : '';
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/lists?$expand=RootFolder${suffix}`,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const listInstances = yield request_1.default.get(requestOptions);
+                listInstances.value.forEach(l => {
+                    l.Url = l.RootFolder.ServerRelativeUrl;
+                });
+                logger.log(listInstances.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoListListCommand_instances = new WeakSet(), _SpoListListCommand_initTelemetry = function _SpoListListCommand_initTelemetry() {
@@ -73,7 +76,7 @@ _SpoListListCommand_instances = new WeakSet(), _SpoListListCommand_initTelemetry
         option: '--executeWithLimitedPermissions'
     });
 }, _SpoListListCommand_initValidators = function _SpoListListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoListListCommand();
 //# sourceMappingURL=list-list.js.map

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

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRemoveCommand_instances, _SpoListRemoveCommand_initTelemetry, _SpoListRemoveCommand_initOptions, _SpoListRemoveCommand_initValidators, _SpoListRemoveCommand_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 SpoListRemoveCommand extends SpoCommand_1.default {
@@ -35,53 +36,51 @@ class SpoListRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified list';
     }
-    commandAction(logger, args, cb) {
-        const removeList = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing list in site at ${args.options.webUrl}...`);
-            }
-            let requestUrl = '';
-            if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
-            }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.title)}')`;
-            }
-            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) {
-            removeList();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the list ${args.options.id || args.options.title} from site ${args.options.webUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeList = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing list in site at ${args.options.webUrl}...`);
+                }
+                let requestUrl = '';
+                if (args.options.id) {
+                    requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
                 }
                 else {
-                    removeList();
+                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
+                }
+                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);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeList();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the list ${args.options.id || args.options.title} from site ${args.options.webUrl}?`
+                });
+                if (result.continue) {
+                    yield removeList();
+                }
+            }
+        });
     }
 }
 _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelemetry = function _SpoListRemoveCommand_initTelemetry() {
@@ -104,12 +103,12 @@ _SpoListRemoveCommand_instances = new WeakSet(), _SpoListRemoveCommand_initTelem
     });
 }, _SpoListRemoveCommand_initValidators = function _SpoListRemoveCommand_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.id &&
-            !utils_1.validation.isValidGuid(args.options.id)) {
+            !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_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");
@@ -37,44 +39,42 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Adds a role assignment to list permissions';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Adding role assignment to list 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)}')/`;
-        }
-        this.GetRoleDefinitionId(args.options)
-            .then((roleDefinitionId) => {
-            args.options.roleDefinitionId = roleDefinitionId;
-            if (args.options.upn) {
-                this.GetUserPrincipalId(args.options)
-                    .then((userPrincipalId) => {
-                    args.options.principalId = userPrincipalId;
-                    this.AddRoleAssignment(requestUrl, logger, args.options, cb);
-                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Adding role assignment to list in site at ${args.options.webUrl}...`);
             }
-            else if (args.options.groupName) {
-                this.GetGroupPrincipalId(args.options)
-                    .then((groupPrincipalId) => {
-                    args.options.principalId = groupPrincipalId;
-                    this.AddRoleAssignment(requestUrl, logger, args.options, cb);
-                }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            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)}')/`;
+                }
+                args.options.roleDefinitionId = yield this.GetRoleDefinitionId(args.options);
+                if (args.options.upn) {
+                    args.options.principalId = yield this.GetUserPrincipalId(args.options);
+                    yield this.AddRoleAssignment(requestUrl, logger, args.options);
+                }
+                else if (args.options.groupName) {
+                    args.options.principalId = yield this.GetGroupPrincipalId(args.options);
+                    this.AddRoleAssignment(requestUrl, logger, args.options);
+                }
+                else {
+                    yield this.AddRoleAssignment(requestUrl, logger, args.options);
+                }
             }
-            else {
-                this.AddRoleAssignment(requestUrl, logger, args.options, cb);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
-    AddRoleAssignment(requestUrl, logger, options, cb) {
+    AddRoleAssignment(requestUrl, logger, options) {
         const requestOptions = {
             url: `${requestUrl}roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
             method: 'POST',
@@ -84,9 +84,10 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             },
             responseType: 'json'
         };
-        request_1.default
+        return request_1.default
             .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            .then(_ => Promise.resolve())
+            .catch((err) => Promise.reject(err));
     }
     GetRoleDefinitionId(options) {
         if (!options.roleDefinitionName) {
@@ -98,7 +99,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             debug: this.debug,
             verbose: this.verbose
         };
-        return cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) })
+        return Cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) })
             .then((output) => {
             const getRoleDefinitionListOutput = JSON.parse(output.stdout);
             const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
@@ -115,7 +116,7 @@ class SpoListRoleAssignmentAddCommand 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);
@@ -132,7 +133,7 @@ class SpoListRoleAssignmentAddCommand 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);
@@ -176,11 +177,11 @@ _SpoListRoleAssignmentAddCommand_instances = new WeakSet(), _SpoListRoleAssignme
     });
 }, _SpoListRoleAssignmentAddCommand_initValidators = function _SpoListRoleAssignmentAddCommand_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.principalId && isNaN(args.options.principalId)) {

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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleAssignmentRemoveCommand_instances, _SpoListRoleAssignmentRemoveCommand_initTelemetry, _SpoListRoleAssignmentRemoveCommand_initOptions, _SpoListRoleAssignmentRemoveCommand_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,60 +38,57 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes a role assignment from list permissions';
     }
-    commandAction(logger, args, cb) {
-        const removeRoleAssignment = () => {
-            if (this.verbose) {
-                logger.logToStderr(`Removing role assignment from list 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)}')/`;
-            }
-            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 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 list 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)}')/`;
+                    }
+                    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 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',
@@ -99,9 +98,10 @@ class SpoListRoleAssignmentRemoveCommand 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 = {
@@ -111,7 +111,7 @@ class SpoListRoleAssignmentRemoveCommand 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);
@@ -128,7 +128,7 @@ class SpoListRoleAssignmentRemoveCommand 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);
@@ -169,11 +169,11 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
     });
 }, _SpoListRoleAssignmentRemoveCommand_initValidators = function _SpoListRoleAssignmentRemoveCommand_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.principalId && isNaN(args.options.principalId)) {