@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.3a04435

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

@@ -13,11 +13,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoListWebhookSetCommand_instances, _SpoListWebhookSetCommand_initTelemetry, _SpoListWebhookSetCommand_initOptions, _SpoListWebhookSetCommand_initValidators;
+var _SpoListWebhookSetCommand_instances, _SpoListWebhookSetCommand_initTelemetry, _SpoListWebhookSetCommand_initOptions, _SpoListWebhookSetCommand_initValidators, _SpoListWebhookSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 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 SpoListWebhookSetCommand extends SpoCommand_1.default {
@@ -27,6 +29,7 @@ class SpoListWebhookSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListWebhookSetCommand_instances, "m", _SpoListWebhookSetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListWebhookSetCommand_instances, "m", _SpoListWebhookSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListWebhookSetCommand_instances, "m", _SpoListWebhookSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListWebhookSetCommand_instances, "m", _SpoListWebhookSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_WEBHOOK_SET;
@@ -34,50 +37,56 @@ class SpoListWebhookSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Updates the specified webhook';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Updating webhook ${args.options.id} belonging to list ${args.options.listId ? args.options.listId : args.options.listTitle} located at site ${args.options.webUrl}...`);
-        }
-        let requestUrl = '';
-        if (args.options.listId) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
-        }
-        else {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
-        }
-        const requestBody = {};
-        if (args.options.notificationUrl) {
-            requestBody.notificationUrl = args.options.notificationUrl;
-        }
-        if (args.options.expirationDateTime) {
-            requestBody.expirationDateTime = args.options.expirationDateTime;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            method: 'PATCH',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: requestBody,
-            responseType: 'json'
-        };
-        request_1.default
-            .patch(requestOptions)
-            .then(() => {
-            // REST patch call doesn't return anything
-            cb();
-        }, (err) => {
-            this.handleRejectedODataJsonPromise(err, logger, cb);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Updating webhook ${args.options.id} belonging to list ${args.options.listId || args.options.listTitle || args.options.listUrl} located at site ${args.options.webUrl}...`);
+            }
+            let requestUrl = `${args.options.webUrl}/_api/web`;
+            if (args.options.listId) {
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+            }
+            else if (args.options.listTitle) {
+                requestUrl += `/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+            }
+            const requestBody = {};
+            if (args.options.notificationUrl) {
+                requestBody.notificationUrl = args.options.notificationUrl;
+            }
+            if (args.options.expirationDateTime) {
+                requestBody.expirationDateTime = args.options.expirationDateTime;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                method: 'PATCH',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.patch(requestOptions);
+                // REST patch call doesn't return anything
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
         });
     }
 }
 _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_initTelemetry = function _SpoListWebhookSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            listId: (!(!args.options.listId)).toString(),
-            listTitle: (!(!args.options.listTitle)).toString(),
-            notificationUrl: (!(!args.options.notificationUrl)).toString(),
-            expirationDateTime: (!(!args.options.expirationDateTime)).toString()
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            notificationUrl: typeof args.options.notificationUrl !== 'undefined',
+            expirationDateTime: typeof args.options.expirationDateTime !== 'undefined'
         });
     });
 }, _SpoListWebhookSetCommand_initOptions = function _SpoListWebhookSetCommand_initOptions() {
@@ -87,6 +96,8 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id <id>'
     }, {
@@ -96,24 +107,18 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
     });
 }, _SpoListWebhookSetCommand_initValidators = function _SpoListWebhookSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        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) {
-            if (!utils_1.validation.isValidGuid(args.options.listId)) {
+            if (!validation_1.validation.isValidGuid(args.options.listId)) {
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         if (!args.options.notificationUrl && !args.options.expirationDateTime) {
             return 'Specify notificationUrl, expirationDateTime or both, at least one is required';
         }
@@ -127,6 +132,8 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
         }
         return true;
     }));
+}, _SpoListWebhookSetCommand_initOptionSets = function _SpoListWebhookSetCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListWebhookSetCommand();
 //# sourceMappingURL=list-webhook-set.js.map

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

@@ -13,10 +13,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoListItemAddCommand_instances, _SpoListItemAddCommand_initTelemetry, _SpoListItemAddCommand_initOptions, _SpoListItemAddCommand_initValidators, _SpoListItemAddCommand_initTypes;
+var _SpoListItemAddCommand_instances, _SpoListItemAddCommand_initTelemetry, _SpoListItemAddCommand_initOptions, _SpoListItemAddCommand_initValidators, _SpoListItemAddCommand_initTypes, _SpoListItemAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemAddCommand extends SpoCommand_1.default {
@@ -27,6 +30,7 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoListItemAddCommand_instances, "m", _SpoListItemAddCommand_initOptionSets).call(this);
     }
     allowUnknownOptions() {
         return true;
@@ -37,132 +41,123 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Creates a list item in the specified list';
     }
-    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 contentTypeName = '';
-        let targetFolderServerRelativeUrl = '';
-        if (this.verbose) {
-            logger.logToStderr(`Getting content types for list...`);
-        }
-        const requestOptions = {
-            url: `${listRestUrl}/contenttypes?$select=Name,Id`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((response) => {
-            if (args.options.contentType) {
-                const foundContentType = response.value.filter((ct) => {
-                    const contentTypeMatch = ct.Id.StringValue === args.options.contentType || ct.Name === args.options.contentType;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                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 contentTypeName = '';
+                let targetFolderServerRelativeUrl = '';
+                if (this.verbose) {
+                    logger.logToStderr(`Getting content types for list...`);
+                }
+                let requestOptions = {
+                    url: `${listRestUrl}/contenttypes?$select=Name,Id`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const ctypes = yield request_1.default.get(requestOptions);
+                if (args.options.contentType) {
+                    const foundContentType = ctypes.value.filter((ct) => {
+                        const contentTypeMatch = ct.Id.StringValue === args.options.contentType || ct.Name === args.options.contentType;
+                        if (this.debug) {
+                            logger.logToStderr(`Checking content type value [${ct.Name}]: ${contentTypeMatch}`);
+                        }
+                        return contentTypeMatch;
+                    });
                     if (this.debug) {
-                        logger.logToStderr(`Checking content type value [${ct.Name}]: ${contentTypeMatch}`);
+                        logger.logToStderr('content type filter output...');
+                        logger.logToStderr(foundContentType);
+                    }
+                    if (foundContentType.length > 0) {
+                        contentTypeName = foundContentType[0].Name;
+                    }
+                    // After checking for content types, throw an error if the name is blank
+                    if (!contentTypeName || contentTypeName === '') {
+                        throw `Specified content type '${args.options.contentType}' doesn't exist on the target list`;
+                    }
+                    if (this.debug) {
+                        logger.logToStderr(`using content type name: ${contentTypeName}`);
                     }
-                    return contentTypeMatch;
-                });
-                if (this.debug) {
-                    logger.logToStderr('content type filter output...');
-                    logger.logToStderr(foundContentType);
                 }
-                if (foundContentType.length > 0) {
-                    contentTypeName = foundContentType[0].Name;
+                if (args.options.folder) {
+                    if (this.debug) {
+                        logger.logToStderr('setting up folder lookup response ...');
+                    }
+                    requestOptions = {
+                        url: `${listRestUrl}/rootFolder`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const rootFolderResponse = yield request_1.default.get(requestOptions);
+                    targetFolderServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(rootFolderResponse["ServerRelativeUrl"], args.options.folder);
+                    yield spo_1.spo.ensureFolder(args.options.webUrl, targetFolderServerRelativeUrl, logger, this.debug);
                 }
-                // After checking for content types, throw an error if the name is blank
-                if (!contentTypeName || contentTypeName === '') {
-                    return Promise.reject(`Specified content type '${args.options.contentType}' doesn't exist on the target list`);
+                if (this.verbose) {
+                    logger.logToStderr(`Creating item in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
                 }
-                if (this.debug) {
-                    logger.logToStderr(`using content type name: ${contentTypeName}`);
+                const requestBody = {
+                    formValues: this.mapRequestBody(args.options)
+                };
+                if (args.options.folder) {
+                    requestBody.listItemCreateInfo = {
+                        FolderPath: {
+                            DecodedUrl: targetFolderServerRelativeUrl
+                        }
+                    };
                 }
-            }
-            if (args.options.folder) {
-                if (this.debug) {
-                    logger.logToStderr('setting up folder lookup response ...');
+                if (args.options.contentType && contentTypeName !== '') {
+                    if (this.debug) {
+                        logger.logToStderr(`Specifying content type name [${contentTypeName}] in request body`);
+                    }
+                    requestBody.formValues.push({
+                        FieldName: 'ContentType',
+                        FieldValue: contentTypeName
+                    });
                 }
-                const requestOptions = {
-                    url: `${listRestUrl}/rootFolder`,
+                requestOptions = {
+                    url: `${listRestUrl}/AddValidateUpdateItemUsingPath()`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
+                    data: requestBody,
                     responseType: 'json'
                 };
-                return request_1.default
-                    .get(requestOptions)
-                    .then(rootFolderResponse => {
-                    targetFolderServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(rootFolderResponse["ServerRelativeUrl"], args.options.folder);
-                    return utils_1.spo.ensureFolder(args.options.webUrl, targetFolderServerRelativeUrl, logger, this.debug);
+                const response = yield request_1.default.post(requestOptions);
+                // Response is from /AddValidateUpdateItemUsingPath POST call, perform get on added item to get all field values
+                const fieldValues = response.value;
+                const idField = fieldValues.filter((thisField) => {
+                    return (thisField.FieldName === "Id");
                 });
-            }
-            else {
-                return Promise.resolve();
-            }
-        })
-            .then(() => {
-            if (this.verbose) {
-                logger.logToStderr(`Creating item in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
-            }
-            const requestBody = {
-                formValues: this.mapRequestBody(args.options)
-            };
-            if (args.options.folder) {
-                requestBody.listItemCreateInfo = {
-                    FolderPath: {
-                        DecodedUrl: targetFolderServerRelativeUrl
-                    }
-                };
-            }
-            if (args.options.contentType && contentTypeName !== '') {
                 if (this.debug) {
-                    logger.logToStderr(`Specifying content type name [${contentTypeName}] in request body`);
+                    logger.logToStderr(`field values returned:`);
+                    logger.logToStderr(fieldValues);
+                    logger.logToStderr(`Id returned by AddValidateUpdateItemUsingPath: ${idField}`);
                 }
-                requestBody.formValues.push({
-                    FieldName: 'ContentType',
-                    FieldValue: contentTypeName
-                });
-            }
-            const requestOptions = {
-                url: `${listRestUrl}/AddValidateUpdateItemUsingPath()`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: requestBody,
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((response) => {
-            // Response is from /AddValidateUpdateItemUsingPath POST call, perform get on added item to get all field values
-            const fieldValues = response.value;
-            const idField = fieldValues.filter((thisField) => {
-                return (thisField.FieldName === "Id");
-            });
-            if (this.debug) {
-                logger.logToStderr(`field values returned:`);
-                logger.logToStderr(fieldValues);
-                logger.logToStderr(`Id returned by AddValidateUpdateItemUsingPath: ${idField}`);
+                if (idField.length === 0) {
+                    return Promise.reject(`Item didn't add successfully`);
+                }
+                requestOptions = {
+                    url: `${listRestUrl}/items(${idField[0].FieldValue})`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                const item = yield request_1.default.get(requestOptions);
+                logger.log(item);
             }
-            if (idField.length === 0) {
-                return Promise.reject(`Item didn't add successfully`);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: `${listRestUrl}/items(${idField[0].FieldValue})`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })
-            .then((response) => {
-            logger.log(response);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     mapRequestBody(options) {
         const requestBody = [];
@@ -207,24 +202,20 @@ _SpoListItemAddCommand_instances = new WeakSet(), _SpoListItemAddCommand_initTel
     });
 }, _SpoListItemAddCommand_initValidators = function _SpoListItemAddCommand_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 && !args.options.listTitle) {
-            return `Specify listId or listTitle`;
-        }
-        if (args.options.listId && args.options.listTitle) {
-            return `Specify listId or listTitle but not both`;
-        }
         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;
     }));
 }, _SpoListItemAddCommand_initTypes = function _SpoListItemAddCommand_initTypes() {
     this.types.string.push('webUrl', 'listId', 'listTitle', 'contentType', 'folder');
+}, _SpoListItemAddCommand_initOptionSets = function _SpoListItemAddCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListItemAddCommand();
 //# sourceMappingURL=listitem-add.js.map

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

@@ -13,10 +13,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoListItemAttachmentListCommand_instances, _SpoListItemAttachmentListCommand_initTelemetry, _SpoListItemAttachmentListCommand_initOptions, _SpoListItemAttachmentListCommand_initValidators;
+var _SpoListItemAttachmentListCommand_instances, _SpoListItemAttachmentListCommand_initTelemetry, _SpoListItemAttachmentListCommand_initOptions, _SpoListItemAttachmentListCommand_initValidators, _SpoListItemAttachmentListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 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 SpoListItemAttachmentListCommand extends SpoCommand_1.default {
@@ -26,6 +27,7 @@ class SpoListItemAttachmentListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListItemAttachmentListCommand_instances, "m", _SpoListItemAttachmentListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListItemAttachmentListCommand_instances, "m", _SpoListItemAttachmentListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListItemAttachmentListCommand_instances, "m", _SpoListItemAttachmentListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListItemAttachmentListCommand_instances, "m", _SpoListItemAttachmentListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LISTITEM_ATTACHMENT_LIST;
@@ -36,33 +38,36 @@ class SpoListItemAttachmentListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['FileName', 'ServerRelativeUrl'];
     }
-    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)}')`);
-        const requestOptions = {
-            url: `${listRestUrl}/items(${args.options.itemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((attachmentFiles) => {
-            if (attachmentFiles.AttachmentFiles && attachmentFiles.AttachmentFiles.length > 0) {
-                logger.log(attachmentFiles.AttachmentFiles);
-            }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('No attachments found');
+    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)}')`);
+            const requestOptions = {
+                url: `${listRestUrl}/items(${args.options.itemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
+                method: 'GET',
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const attachmentFiles = yield request_1.default.get(requestOptions);
+                if (attachmentFiles.AttachmentFiles && attachmentFiles.AttachmentFiles.length > 0) {
+                    logger.log(attachmentFiles.AttachmentFiles);
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('No attachments found');
+                    }
                 }
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachmentListCommand_initTelemetry = function _SpoListItemAttachmentListCommand_initTelemetry() {
@@ -84,17 +89,11 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
     });
 }, _SpoListItemAttachmentListCommand_initValidators = function _SpoListItemAttachmentListCommand_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 && !args.options.listTitle) {
-            return `Specify listId or listTitle`;
-        }
-        if (args.options.listId && args.options.listTitle) {
-            return `Specify listId or listTitle but not both`;
-        }
-        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`;
         }
         if (isNaN(parseInt(args.options.itemId))) {
@@ -102,6 +101,8 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
         }
         return true;
     }));
+}, _SpoListItemAttachmentListCommand_initOptionSets = function _SpoListItemAttachmentListCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle']);
 };
 module.exports = new SpoListItemAttachmentListCommand();
 //# sourceMappingURL=listitem-attachment-list.js.map