@pnp/cli-microsoft365 6.0.0-beta.c377306 → 6.0.0-beta.c5b75e1

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoCustomActionListCommand_instances, _SpoCustomActionListCommand_initTelemetry, _SpoCustomActionListCommand_initOptions, _SpoCustomActionListCommand_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 SpoCustomActionListCommand extends SpoCommand_1.default {
@@ -36,32 +36,37 @@ class SpoCustomActionListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Name', 'Location', 'Scope', 'Id'];
     }
-    commandAction(logger, args, cb) {
-        const scope = args.options.scope ? args.options.scope : 'All';
-        (() => {
-            if (this.debug) {
-                logger.logToStderr(`Attempt to get custom actions list with scope: ${scope}`);
-                logger.logToStderr('');
-            }
-            if (scope && scope.toLowerCase() !== "all") {
-                return this.getCustomActions(args.options);
-            }
-            return this.searchAllScopes(args.options);
-        })()
-            .then((customActions) => {
-            if (customActions.length === 0) {
-                if (this.verbose) {
-                    logger.logToStderr(`Custom actions not found`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const scope = args.options.scope ? args.options.scope : 'All';
+                if (this.debug) {
+                    logger.logToStderr(`Attempt to get custom actions list with scope: ${scope}`);
+                    logger.logToStderr('');
                 }
-            }
-            else {
-                if (args.options.output !== 'json') {
-                    customActions.forEach(a => a.Scope = this.humanizeScope(a.Scope));
+                let customActions;
+                if (scope && scope.toLowerCase() !== "all") {
+                    customActions = yield this.getCustomActions(args.options);
+                }
+                else {
+                    customActions = yield this.searchAllScopes(args.options);
+                }
+                if (customActions.length === 0) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Custom actions not found`);
+                    }
+                }
+                else {
+                    if (args.options.output !== 'json') {
+                        customActions.forEach(a => a.Scope = this.humanizeScope(a.Scope));
+                    }
+                    logger.log(customActions);
                 }
-                logger.log(customActions);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
     getCustomActions(options) {
         const requestOptions = {
@@ -129,7 +134,7 @@ _SpoCustomActionListCommand_instances = new WeakSet(), _SpoCustomActionListComma
     });
 }, _SpoCustomActionListCommand_initValidators = function _SpoCustomActionListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (typeof isValidUrl === 'string') {
             return isValidUrl;
         }

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoCustomActionRemoveCommand_instances, _SpoCustomActionRemoveCommand_initTelemetry, _SpoCustomActionRemoveCommand_initOptions, _SpoCustomActionRemoveCommand_initValidators, _SpoCustomActionRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
@@ -35,41 +35,42 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified custom action';
     }
-    commandAction(logger, args, cb) {
-        const removeCustomAction = () => {
-            (() => {
-                if (args.options.scope && args.options.scope.toLowerCase() !== "all") {
-                    return this.removeScopedCustomAction(args.options);
-                }
-                return this.searchAllScopes(args.options);
-            })()
-                .then((customAction) => {
-                if (this.verbose) {
-                    if (customAction && customAction["odata.null"] === true) {
-                        logger.logToStderr(`Custom action with id ${args.options.id} not found`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeCustomAction = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    let customAction;
+                    if (args.options.scope && args.options.scope.toLowerCase() !== "all") {
+                        customAction = yield this.removeScopedCustomAction(args.options);
+                    }
+                    else {
+                        customAction = yield this.searchAllScopes(args.options);
+                    }
+                    if (this.verbose) {
+                        if (customAction && customAction["odata.null"] === true) {
+                            logger.logToStderr(`Custom action with id ${args.options.id} not found`);
+                        }
                     }
                 }
-                cb();
-            }, (err) => this.handleRejectedPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeCustomAction();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the ${args.options.id} user custom action?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    removeCustomAction();
+                catch (err) {
+                    this.handleRejectedPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeCustomAction();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the ${args.options.id} user custom action?`
+                });
+                if (result.continue) {
+                    yield removeCustomAction();
+                }
+            }
+        });
     }
     getCustomActionId(options) {
         if (options.id) {
@@ -159,10 +160,10 @@ _SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveC
     });
 }, _SpoCustomActionRemoveCommand_initValidators = function _SpoCustomActionRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && utils_1.validation.isValidGuid(args.options.id) === false) {
+        if (args.options.id && validation_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action Id (GUID) expected.`;
         }
-        const isValidUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (typeof isValidUrl === 'string') {
             return isValidUrl;
         }

package/dist/m365/spo/commands/customaction/customaction-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoCustomActionSetCommand_instances, _SpoCustomActionSetCommand_initTelemetry, _SpoCustomActionSetCommand_initOptions, _SpoCustomActionSetCommand_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 base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
@@ -47,24 +47,29 @@ class SpoCustomActionSetCommand extends SpoCommand_1.default {
         }
         return result;
     }
-    commandAction(logger, args, cb) {
-        (() => {
-            if (!args.options.scope) {
-                args.options.scope = 'All';
-            }
-            if (args.options.scope.toLowerCase() !== "all") {
-                return this.updateCustomAction(args.options);
-            }
-            return this.searchAllScopes(args.options);
-        })()
-            .then((customAction) => {
-            if (this.verbose) {
-                if (customAction && customAction["odata.null"] === true) {
-                    logger.logToStderr(`Custom action with id ${args.options.id} not found`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let customAction;
+                if (!args.options.scope) {
+                    args.options.scope = 'All';
+                }
+                if (args.options.scope.toLowerCase() !== "all") {
+                    customAction = yield this.updateCustomAction(args.options);
+                }
+                else {
+                    customAction = yield this.searchAllScopes(args.options);
                 }
+                if (this.verbose) {
+                    if (customAction && customAction["odata.null"] === true) {
+                        logger.logToStderr(`Custom action with id ${args.options.id} not found`);
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     updateCustomAction(options) {
         const requestBody = this.mapRequestBody(options);
@@ -246,10 +251,10 @@ _SpoCustomActionSetCommand_instances = new WeakSet(), _SpoCustomActionSetCommand
     });
 }, _SpoCustomActionSetCommand_initValidators = function _SpoCustomActionSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (utils_1.validation.isValidGuid(args.options.id) === false) {
+        if (validation_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action id (Guid) expected`;
         }
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -267,7 +272,7 @@ _SpoCustomActionSetCommand_instances = new WeakSet(), _SpoCustomActionSetCommand
         if (args.options.sequence && (args.options.sequence < 0 || args.options.sequence > 65536)) {
             return 'Invalid option sequence. Expected value in range from 0 to 65536';
         }
-        if (args.options.clientSideComponentId && utils_1.validation.isValidGuid(args.options.clientSideComponentId) === false) {
+        if (args.options.clientSideComponentId && validation_1.validation.isValidGuid(args.options.clientSideComponentId) === false) {
             return `ClientSideComponentId ${args.options.clientSideComponentId} is not a valid GUID`;
         }
         if (args.options.scope &&

package/dist/m365/spo/commands/eventreceiver/eventreceiver-get.js

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoEventreceiverGetCommand_instances, _SpoEventreceiverGetCommand_initTelemetry, _SpoEventreceiverGetCommand_initOptions, _SpoEventreceiverGetCommand_initValidators, _SpoEventreceiverGetCommand_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 SpoEventreceiverGetCommand extends SpoCommand_1.default {
@@ -34,45 +36,48 @@ class SpoEventreceiverGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets a specific event receiver attached to the web, site or list (if any of the list options are filled in) by receiver name of id';
     }
-    commandAction(logger, args, cb) {
-        let requestUrl = `${args.options.webUrl}/_api/`;
-        let listUrl = '';
-        let filter = '?$filter=';
-        if (args.options.listId) {
-            listUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
-        }
-        else if (args.options.listTitle) {
-            listUrl = `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);
-            listUrl = `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-        }
-        if (!args.options.scope || args.options.scope === 'web') {
-            requestUrl += `web/${listUrl}eventreceivers`;
-        }
-        else {
-            requestUrl += 'site/eventreceivers';
-        }
-        if (args.options.id) {
-            filter += `receiverid eq (guid'${args.options.id}')`;
-        }
-        else {
-            filter += `receivername eq '${args.options.name}'`;
-        }
-        const requestOptions = {
-            url: requestUrl + filter,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = `${args.options.webUrl}/_api/`;
+            let listUrl = '';
+            let filter = '?$filter=';
+            if (args.options.listId) {
+                listUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
+            }
+            else if (args.options.listTitle) {
+                listUrl = `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);
+                listUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+            }
+            if (!args.options.scope || args.options.scope === 'web') {
+                requestUrl += `web/${listUrl}eventreceivers`;
+            }
+            else {
+                requestUrl += 'site/eventreceivers';
+            }
+            if (args.options.id) {
+                filter += `receiverid eq (guid'${args.options.id}')`;
+            }
+            else {
+                filter += `receivername eq '${args.options.name}'`;
+            }
+            const requestOptions = {
+                url: requestUrl + filter,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoEventreceiverGetCommand_instances = new WeakSet(), _SpoEventreceiverGetCommand_initTelemetry = function _SpoEventreceiverGetCommand_initTelemetry() {
@@ -105,7 +110,7 @@ _SpoEventreceiverGetCommand_instances = new WeakSet(), _SpoEventreceiverGetComma
     });
 }, _SpoEventreceiverGetCommand_initValidators = function _SpoEventreceiverGetCommand_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;
         }
@@ -113,7 +118,7 @@ _SpoEventreceiverGetCommand_instances = new WeakSet(), _SpoEventreceiverGetComma
         if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
             return `Specify either list id or title or list url`;
         }
-        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.scope && ['web', 'site'].indexOf(args.options.scope) === -1) {

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoEventreceiverListCommand_instances, _SpoEventreceiverListCommand_initTelemetry, _SpoEventreceiverListCommand_initOptions, _SpoEventreceiverListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoEventreceiverListCommand extends SpoCommand_1.default {
@@ -36,38 +37,41 @@ class SpoEventreceiverListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['ReceiverId', 'ReceiverName'];
     }
-    commandAction(logger, args, cb) {
-        let requestUrl = `${args.options.webUrl}/_api/`;
-        let listUrl = '';
-        if (args.options.listId) {
-            listUrl = `lists(guid'${encodeURIComponent(args.options.listId)}')/`;
-        }
-        else if (args.options.listTitle) {
-            listUrl = `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/`;
-        }
-        else if (args.options.listUrl) {
-            const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-            listUrl = `GetList('${encodeURIComponent(listServerRelativeUrl)}')/`;
-        }
-        if (!args.options.scope || args.options.scope === 'web') {
-            requestUrl += `web/${listUrl}eventreceivers`;
-        }
-        else {
-            requestUrl += 'site/eventreceivers';
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = `${args.options.webUrl}/_api/`;
+            let listUrl = '';
+            if (args.options.listId) {
+                listUrl = `lists(guid'${encodeURIComponent(args.options.listId)}')/`;
+            }
+            else if (args.options.listTitle) {
+                listUrl = `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                listUrl = `GetList('${encodeURIComponent(listServerRelativeUrl)}')/`;
+            }
+            if (!args.options.scope || args.options.scope === 'web') {
+                requestUrl += `web/${listUrl}eventreceivers`;
+            }
+            else {
+                requestUrl += 'site/eventreceivers';
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoEventreceiverListCommand_instances = new WeakSet(), _SpoEventreceiverListCommand_initTelemetry = function _SpoEventreceiverListCommand_initTelemetry() {
@@ -94,7 +98,7 @@ _SpoEventreceiverListCommand_instances = new WeakSet(), _SpoEventreceiverListCom
     });
 }, _SpoEventreceiverListCommand_initValidators = function _SpoEventreceiverListCommand_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;
         }
@@ -102,7 +106,7 @@ _SpoEventreceiverListCommand_instances = new WeakSet(), _SpoEventreceiverListCom
         if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
             return `Specify either list id or title or list url`;
         }
-        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.scope && ['web', 'site'].indexOf(args.options.scope) === -1) {

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

@@ -15,10 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoExternalUserListCommand_instances, _SpoExternalUserListCommand_initTelemetry, _SpoExternalUserListCommand_initOptions, _SpoExternalUserListCommand_initValidators;
 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 SpoExternalUserListCommand extends SpoCommand_1.default {
@@ -35,63 +36,59 @@ class SpoExternalUserListCommand extends SpoCommand_1.default {
     get description() {
         return 'Lists external users in the tenant';
     }
-    commandAction(logger, args, cb) {
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving information about external users...`);
-            }
-            const position = parseInt(args.options.position || '0');
-            const pageSize = parseInt(args.options.pageSize || '10');
-            const sortOrder = args.options.sortOrder === 'desc' ? 1 : 0;
-            let payload = '';
-            if (args.options.siteUrl) {
-                payload = `<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><ObjectPath Id="135" ObjectPathId="134" /><Query Id="136" ObjectPathId="134"><Query SelectAllProperties="false"><Properties><Property Name="TotalUserCount" ScalarProperty="true" /><Property Name="UserCollectionPosition" ScalarProperty="true" /><Property Name="ExternalUserCollection"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="false"><Properties><Property Name="DisplayName" ScalarProperty="true" /><Property Name="InvitedAs" ScalarProperty="true" /><Property Name="UniqueId" ScalarProperty="true" /><Property Name="AcceptedAs" ScalarProperty="true" /><Property Name="WhenCreated" ScalarProperty="true" /><Property Name="InvitedBy" ScalarProperty="true" /></Properties></ChildItemQuery></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="134" ParentId="131" Name="GetExternalUsersForSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.siteUrl)}</Parameter><Parameter Type="Int32">${position}</Parameter><Parameter Type="Int32">${pageSize}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.filter || '')}</Parameter><Parameter Type="Enum">${sortOrder}</Parameter></Parameters></Method><Constructor Id="131" TypeId="{e45fd516-a408-4ca4-b6dc-268e2f1f0f83}" /></ObjectPaths></Request>`;
-            }
-            else {
-                payload = `<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><ObjectPath Id="109" ObjectPathId="108" /><Query Id="110" ObjectPathId="108"><Query SelectAllProperties="false"><Properties><Property Name="TotalUserCount" ScalarProperty="true" /><Property Name="UserCollectionPosition" ScalarProperty="true" /><Property Name="ExternalUserCollection"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="false"><Properties><Property Name="DisplayName" ScalarProperty="true" /><Property Name="InvitedAs" ScalarProperty="true" /><Property Name="UniqueId" ScalarProperty="true" /><Property Name="AcceptedAs" ScalarProperty="true" /><Property Name="WhenCreated" ScalarProperty="true" /><Property Name="InvitedBy" ScalarProperty="true" /></Properties></ChildItemQuery></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="108" ParentId="105" Name="GetExternalUsers"><Parameters><Parameter Type="Int32">${position}</Parameter><Parameter Type="Int32">${pageSize}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.filter || '')}</Parameter><Parameter Type="Enum">${sortOrder}</Parameter></Parameters></Method><Constructor Id="105" TypeId="{e45fd516-a408-4ca4-b6dc-268e2f1f0f83}" /></ObjectPaths></Request>`;
-            }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue
-                },
-                data: payload
-            };
-            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));
-                return;
-            }
-            else {
-                const results = json.pop();
-                if (results.TotalUserCount > 0) {
-                    logger.log(results.ExternalUserCollection._Child_Items_.map(e => {
-                        delete e._ObjectType_;
-                        const dateChunks = e.WhenCreated
-                            .replace('/Date(', '')
-                            .replace(')/', '')
-                            .split(',')
-                            .map(c => {
-                            return parseInt(c);
-                        });
-                        e.WhenCreated = new Date(dateChunks[0], dateChunks[1], dateChunks[2], dateChunks[3], dateChunks[4], dateChunks[5], dateChunks[6]);
-                        return e;
-                    }));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving information about external users...`);
+                }
+                const position = parseInt(args.options.position || '0');
+                const pageSize = parseInt(args.options.pageSize || '10');
+                const sortOrder = args.options.sortOrder === 'desc' ? 1 : 0;
+                let payload = '';
+                if (args.options.siteUrl) {
+                    payload = `<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><ObjectPath Id="135" ObjectPathId="134" /><Query Id="136" ObjectPathId="134"><Query SelectAllProperties="false"><Properties><Property Name="TotalUserCount" ScalarProperty="true" /><Property Name="UserCollectionPosition" ScalarProperty="true" /><Property Name="ExternalUserCollection"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="false"><Properties><Property Name="DisplayName" ScalarProperty="true" /><Property Name="InvitedAs" ScalarProperty="true" /><Property Name="UniqueId" ScalarProperty="true" /><Property Name="AcceptedAs" ScalarProperty="true" /><Property Name="WhenCreated" ScalarProperty="true" /><Property Name="InvitedBy" ScalarProperty="true" /></Properties></ChildItemQuery></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="134" ParentId="131" Name="GetExternalUsersForSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.siteUrl)}</Parameter><Parameter Type="Int32">${position}</Parameter><Parameter Type="Int32">${pageSize}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.filter || '')}</Parameter><Parameter Type="Enum">${sortOrder}</Parameter></Parameters></Method><Constructor Id="131" TypeId="{e45fd516-a408-4ca4-b6dc-268e2f1f0f83}" /></ObjectPaths></Request>`;
+                }
+                else {
+                    payload = `<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><ObjectPath Id="109" ObjectPathId="108" /><Query Id="110" ObjectPathId="108"><Query SelectAllProperties="false"><Properties><Property Name="TotalUserCount" ScalarProperty="true" /><Property Name="UserCollectionPosition" ScalarProperty="true" /><Property Name="ExternalUserCollection"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="false"><Properties><Property Name="DisplayName" ScalarProperty="true" /><Property Name="InvitedAs" ScalarProperty="true" /><Property Name="UniqueId" ScalarProperty="true" /><Property Name="AcceptedAs" ScalarProperty="true" /><Property Name="WhenCreated" ScalarProperty="true" /><Property Name="InvitedBy" ScalarProperty="true" /></Properties></ChildItemQuery></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="108" ParentId="105" Name="GetExternalUsers"><Parameters><Parameter Type="Int32">${position}</Parameter><Parameter Type="Int32">${pageSize}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.filter || '')}</Parameter><Parameter Type="Enum">${sortOrder}</Parameter></Parameters></Method><Constructor Id="105" TypeId="{e45fd516-a408-4ca4-b6dc-268e2f1f0f83}" /></ObjectPaths></Request>`;
+                }
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': reqDigest.FormDigestValue
+                    },
+                    data: payload
+                };
+                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 results = json.pop();
+                    if (results.TotalUserCount > 0) {
+                        logger.log(results.ExternalUserCollection._Child_Items_.map(e => {
+                            delete e._ObjectType_;
+                            const dateChunks = e.WhenCreated
+                                .replace('/Date(', '')
+                                .replace(')/', '')
+                                .split(',')
+                                .map(c => {
+                                return parseInt(c);
+                            });
+                            e.WhenCreated = new Date(dateChunks[0], dateChunks[1], dateChunks[2], dateChunks[3], dateChunks[4], dateChunks[5], dateChunks[6]);
+                            return e;
+                        }));
+                    }
                 }
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
 }
 _SpoExternalUserListCommand_instances = new WeakSet(), _SpoExternalUserListCommand_initTelemetry = function _SpoExternalUserListCommand_initTelemetry() {
@@ -143,7 +140,7 @@ _SpoExternalUserListCommand_instances = new WeakSet(), _SpoExternalUserListComma
             return `${args.options.sortOrder} is not a valid sortOrder value. Allowed values asc|desc`;
         }
         if (args.options.siteUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         }
         return true;
     }));