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

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

@@ -16,7 +16,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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 {
@@ -38,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 = [];
@@ -208,12 +202,12 @@ _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 &&
-            !utils_1.validation.isValidGuid(args.options.listId)) {
+            !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         return true;

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 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 {
@@ -37,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() {
@@ -85,11 +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 && !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))) {

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListItemGetCommand_instances, _SpoListItemGetCommand_initTelemetry, _SpoListItemGetCommand_initOptions, _SpoListItemGetCommand_initValidators, _SpoListItemGetCommand_initTypes, _SpoListItemGetCommand_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 SpoListItemGetCommand extends SpoCommand_1.default {
@@ -38,31 +39,34 @@ class SpoListItemGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Gets a list item from 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)}')`);
-        const propertiesSelect = args.options.properties ? args.options.properties.split(',') : [];
-        const propertiesWithSlash = propertiesSelect.filter(item => item.includes('/'));
-        const propertiesToExpand = propertiesWithSlash.map(e => e.split('/')[0]);
-        const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
-        const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
-        const requestOptions = {
-            url: `${listRestUrl}/items(${args.options.id})?$select=${encodeURIComponent(propertiesSelect.join(","))}${fieldExpand}`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((response) => {
-            delete response['ID'];
-            logger.log(response);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    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 propertiesSelect = args.options.properties ? args.options.properties.split(',') : [];
+            const propertiesWithSlash = propertiesSelect.filter(item => item.includes('/'));
+            const propertiesToExpand = propertiesWithSlash.map(e => e.split('/')[0]);
+            const expandPropertiesArray = propertiesToExpand.filter((item, pos) => propertiesToExpand.indexOf(item) === pos);
+            const fieldExpand = expandPropertiesArray.length > 0 ? `&$expand=${expandPropertiesArray.join(",")}` : ``;
+            const requestOptions = {
+                url: `${listRestUrl}/items(${args.options.id})?$select=${encodeURIComponent(propertiesSelect.join(","))}${fieldExpand}`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                const response = yield request_1.default.get(requestOptions);
+                delete response['ID'];
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTelemetry = function _SpoListItemGetCommand_initTelemetry() {
@@ -86,12 +90,12 @@ _SpoListItemGetCommand_instances = new WeakSet(), _SpoListItemGetCommand_initTel
     });
 }, _SpoListItemGetCommand_initValidators = function _SpoListItemGetCommand_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)) {
+            !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         if (isNaN(parseInt(args.options.id))) {

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

@@ -16,10 +16,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListItemIsRecordCommand_instances, _SpoListItemIsRecordCommand_initTelemetry, _SpoListItemIsRecordCommand_initOptions, _SpoListItemIsRecordCommand_initValidators, _SpoListItemIsRecordCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-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 SpoListItemIsRecordCommand extends SpoCommand_1.default {
@@ -37,75 +38,73 @@ class SpoListItemIsRecordCommand extends SpoCommand_1.default {
     get description() {
         return 'Checks if the specified list item is a record';
     }
-    commandAction(logger, args, cb) {
-        const resource = Auth_1.Auth.getResourceFromUrl(args.options.webUrl);
-        const listIdArgument = args.options.listId || '';
-        const listTitleArgument = args.options.listTitle || '';
-        const listRestUrl = (args.options.listId ?
-            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
-        let formDigestValue = '';
-        let listId = '';
-        if (this.debug) {
-            logger.logToStderr(`Retrieving access token for ${resource}...`);
-        }
-        (() => {
-            if (typeof args.options.listId !== 'undefined') {
-                if (this.verbose) {
-                    logger.logToStderr(`List Id passed in as an argument.`);
-                }
-                return Promise.resolve({ Id: args.options.listId });
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Getting list id...`);
-            }
-            const requestOptions = {
-                url: `${listRestUrl}?$select=Id`,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.get(requestOptions);
-        })()
-            .then((res) => {
-            listId = res.Id;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const resource = Auth_1.Auth.getResourceFromUrl(args.options.webUrl);
+            const listIdArgument = args.options.listId || '';
+            const listTitleArgument = args.options.listTitle || '';
+            const listRestUrl = (args.options.listId ?
+                `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(listIdArgument)}')`
+                : `${args.options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
+            let formDigestValue = '';
+            let listId = '';
             if (this.debug) {
-                logger.logToStderr(`Getting request digest for request`);
-            }
-            return utils_1.spo.getRequestDigest(args.options.webUrl);
-        })
-            .then((res) => {
-            formDigestValue = res.FormDigestValue;
-            return utils_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
-        })
-            .then((webIdentityResp) => {
-            if (this.verbose) {
-                logger.logToStderr(`Checking if list item is a record in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
+                logger.logToStderr(`Retrieving access token for ${resource}...`);
             }
-            const requestBody = this.getIsRecordRequestBody(webIdentityResp.objectIdentity, listId, args.options.id);
-            const requestOptions = {
-                url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'Content-Type': 'text/xml',
-                    'X-RequestDigest': formDigestValue
-                },
-                data: requestBody
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
+            try {
+                if (typeof args.options.listId !== 'undefined') {
+                    if (this.verbose) {
+                        logger.logToStderr(`List Id passed in as an argument.`);
+                    }
+                    listId = args.options.listId;
+                }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr(`Getting list id...`);
+                    }
+                    const requestOptions = {
+                        url: `${listRestUrl}?$select=Id`,
+                        headers: {
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const list = yield request_1.default.get(requestOptions);
+                    listId = list.Id;
+                }
+                if (this.debug) {
+                    logger.logToStderr(`Getting request digest for request`);
+                }
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                formDigestValue = reqDigest.FormDigestValue;
+                const webIdentityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, formDigestValue);
+                if (this.verbose) {
+                    logger.logToStderr(`Checking if list item is a record in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
+                }
+                const requestBody = this.getIsRecordRequestBody(webIdentityResp.objectIdentity, listId, args.options.id);
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'Content-Type': 'text/xml',
+                        'X-RequestDigest': formDigestValue
+                    },
+                    data: requestBody
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                else {
+                    const result = json[json.length - 1];
+                    logger.log(result);
+                }
             }
-            else {
-                const result = json[json.length - 1];
-                logger.log(result);
-                cb();
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     getIsRecordRequestBody(webIdentity, listId, id) {
         const requestBody = `<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">
@@ -145,12 +144,12 @@ _SpoListItemIsRecordCommand_instances = new WeakSet(), _SpoListItemIsRecordComma
         if (id < 1) {
             return `Item ID must be a positive number`;
         }
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId &&
-            !utils_1.validation.isValidGuid(args.options.listId)) {
+            !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         return true;