@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7920dfd

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

@@ -13,11 +13,14 @@ 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 _SpoListItemSetCommand_instances, _SpoListItemSetCommand_initTelemetry, _SpoListItemSetCommand_initOptions, _SpoListItemSetCommand_initValidators, _SpoListItemSetCommand_initTypes;
+var _SpoListItemSetCommand_instances, _SpoListItemSetCommand_initTelemetry, _SpoListItemSetCommand_initOptions, _SpoListItemSetCommand_initValidators, _SpoListItemSetCommand_initTypes, _SpoListItemSetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemSetCommand extends SpoCommand_1.default {
@@ -28,6 +31,7 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListItemSetCommand_instances, "m", _SpoListItemSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListItemSetCommand_instances, "m", _SpoListItemSetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListItemSetCommand_instances, "m", _SpoListItemSetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoListItemSetCommand_instances, "m", _SpoListItemSetCommand_initOptionSets).call(this);
     }
     allowUnknownOptions() {
         return true;
@@ -38,189 +42,177 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Updates 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 formDigestValue = '';
-        let environmentListId = '';
-        (() => {
-            if (args.options.systemUpdate) {
-                if (this.verbose) {
-                    logger.logToStderr(`Getting list id...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let contentTypeName = '';
+            let listId = '';
+            try {
+                let requestUrl = `${args.options.webUrl}/_api/web`;
+                if (args.options.listId) {
+                    listId = args.options.listId;
+                    requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
                 }
-                const listRequestOptions = {
-                    url: `${listRestUrl}/id`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.get(listRequestOptions);
-            }
-            else {
-                return Promise.resolve();
-            }
-        })()
-            .then((dataReturned) => {
-            if (dataReturned) {
-                environmentListId = dataReturned.value;
-            }
-            if (args.options.contentType) {
-                if (this.verbose) {
-                    logger.logToStderr(`Getting content types for list...`);
+                else if (args.options.listTitle) {
+                    requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
                 }
-                const requestOptions = {
-                    url: `${listRestUrl}/contenttypes?$select=Name,Id`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.get(requestOptions);
-            }
-            else {
-                return Promise.resolve();
-            }
-        })
-            .then((response) => {
-            if (args.options.contentType) {
-                if (this.debug) {
-                    logger.logToStderr('content type lookup response...');
-                    logger.logToStderr(response);
+                else if (args.options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                }
+                if (args.options.systemUpdate && !args.options.listId) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Getting list id...`);
+                    }
+                    const listRequestOptions = {
+                        url: `${requestUrl}?$select=Id`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const list = yield request_1.default.get(listRequestOptions);
+                    listId = list.Id;
                 }
-                const foundContentType = response.value.filter((ct) => {
-                    const contentTypeMatch = ct.Id.StringValue === args.options.contentType || ct.Name === args.options.contentType;
+                if (args.options.contentType) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Getting content types for list...`);
+                    }
+                    const requestOptions = {
+                        url: `${requestUrl}/contenttypes?$select=Name,Id`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const contentTypes = yield request_1.default.get(requestOptions);
                     if (this.debug) {
-                        logger.logToStderr(`Checking content type value [${ct.Name}]: ${contentTypeMatch}`);
+                        logger.logToStderr('content type lookup response...');
+                        logger.logToStderr(contentTypes);
+                    }
+                    const foundContentType = contentTypes.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('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;
+                let res = undefined;
+                if (args.options.systemUpdate) {
+                    if (this.debug) {
+                        logger.logToStderr(`getting request digest for systemUpdate request`);
+                    }
+                    res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 }
-                // 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(`Updating item in list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site ${args.options.webUrl}...`);
                 }
-                if (this.debug) {
-                    logger.logToStderr(`using content type name: ${contentTypeName}`);
+                const formDigestValue = args.options.systemUpdate ? res['FormDigestValue'] : '';
+                let objectIdentity = '';
+                if (args.options.systemUpdate) {
+                    objectIdentity = yield this.requestObjectIdentity(args.options.webUrl, logger, formDigestValue);
                 }
-            }
-            if (args.options.systemUpdate) {
-                if (this.debug) {
-                    logger.logToStderr(`getting request digest for systemUpdate request`);
+                const additionalContentType = (args.options.systemUpdate && args.options.contentType && contentTypeName !== '') ? `
+            <Parameters>
+              <Parameter Type="String">ContentType</Parameter>
+              <Parameter Type="String">${contentTypeName}</Parameter>
+            </Parameters>`
+                    : ``;
+                const requestBody = args.options.systemUpdate ?
+                    `<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>
+            <Method Name="ParseAndSetFieldValue" Id="1" ObjectPathId="147">${this.mapRequestBody(args.options).join()}${additionalContentType}
+            </Method>
+            <Method Name="SystemUpdate" Id="2" ObjectPathId="147" />
+          </Actions>
+          <ObjectPaths>
+            <Identity Id="147" Name="${objectIdentity}:list:${listId}:item:${args.options.id},1" />
+          </ObjectPaths>
+        </Request>`
+                    : {
+                        formValues: this.mapRequestBody(args.options)
+                    };
+                if (args.options.contentType && contentTypeName !== '' && !args.options.systemUpdate) {
+                    if (this.debug) {
+                        logger.logToStderr(`Specifying content type name [${contentTypeName}] in request body`);
+                    }
+                    requestBody.formValues.push({
+                        FieldName: 'ContentType',
+                        FieldValue: contentTypeName
+                    });
                 }
-                return utils_1.spo.getRequestDigest(args.options.webUrl);
-            }
-            else {
-                return Promise.resolve(undefined);
-            }
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Updating item in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
-            }
-            formDigestValue = args.options.systemUpdate ? res['FormDigestValue'] : '';
-            if (args.options.systemUpdate) {
-                return this.requestObjectIdentity(args.options.webUrl, logger, formDigestValue);
-            }
-            return Promise.resolve('');
-        }).then((objectIdentity) => {
-            const additionalContentType = (args.options.systemUpdate && args.options.contentType && contentTypeName !== '') ? `
-              <Parameters>
-                <Parameter Type="String">ContentType</Parameter>
-                <Parameter Type="String">${contentTypeName}</Parameter>
-              </Parameters>`
-                : ``;
-            const requestBody = args.options.systemUpdate ?
-                `<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>
-              <Method Name="ParseAndSetFieldValue" Id="1" ObjectPathId="147">${this.mapRequestBody(args.options).join()}${additionalContentType}
-              </Method>
-              <Method Name="SystemUpdate" Id="2" ObjectPathId="147" />
-            </Actions>
-            <ObjectPaths>
-              <Identity Id="147" Name="${objectIdentity}:list:${environmentListId}:item:${args.options.id},1" />
-            </ObjectPaths>
-          </Request>`
-                : {
-                    formValues: this.mapRequestBody(args.options)
-                };
-            if (args.options.contentType && contentTypeName !== '' && !args.options.systemUpdate) {
-                if (this.debug) {
-                    logger.logToStderr(`Specifying content type name [${contentTypeName}] in request body`);
+                const requestOptions = args.options.systemUpdate ?
+                    {
+                        url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                        headers: {
+                            'Content-Type': 'text/xml',
+                            'X-RequestDigest': formDigestValue
+                        },
+                        data: requestBody
+                    } :
+                    {
+                        url: `${requestUrl}/items(${args.options.id})/ValidateUpdateListItem()`,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        data: requestBody,
+                        responseType: 'json'
+                    };
+                const response = yield request_1.default.post(requestOptions);
+                let itemId = 0;
+                if (args.options.systemUpdate) {
+                    if (response.indexOf("ErrorMessage") > -1) {
+                        throw `Error occurred in systemUpdate operation - ${response}`;
+                    }
+                    else {
+                        itemId = Number(args.options.id);
+                    }
                 }
-                requestBody.formValues.push({
-                    FieldName: 'ContentType',
-                    FieldValue: contentTypeName
-                });
-            }
-            const requestOptions = args.options.systemUpdate ?
-                {
-                    url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'Content-Type': 'text/xml',
-                        'X-RequestDigest': formDigestValue
-                    },
-                    data: requestBody
-                } :
-                {
-                    url: `${listRestUrl}/items(${args.options.id})/ValidateUpdateListItem()`,
+                else {
+                    // Response is from /ValidateUpdateListItem POST call, perform get on updated item to get all field values
+                    const returnedData = response.value;
+                    if (!returnedData[0].ItemId) {
+                        throw `Item didn't update successfully`;
+                    }
+                    else {
+                        itemId = returnedData[0].ItemId;
+                    }
+                }
+                const requestOptionsItems = {
+                    url: `${requestUrl}/items(${itemId})`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
-                    data: requestBody,
                     responseType: 'json'
                 };
-            return request_1.default.post(requestOptions);
-        })
-            .then((response) => {
-            let itemId = 0;
-            if (args.options.systemUpdate) {
-                if (response.indexOf("ErrorMessage") > -1) {
-                    return Promise.reject(`Error occurred in systemUpdate operation - ${response}`);
-                }
-                else {
-                    itemId = Number(args.options.id);
-                }
+                const itemsResponse = yield request_1.default.get(requestOptionsItems);
+                logger.log(itemsResponse);
             }
-            else {
-                // Response is from /ValidateUpdateListItem POST call, perform get on updated item to get all field values
-                const returnedData = response.value;
-                if (!returnedData[0].ItemId) {
-                    return Promise.reject(`Item didn't update successfully`);
-                }
-                else {
-                    itemId = returnedData[0].ItemId;
-                }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            const requestOptions = {
-                url: `${listRestUrl}/items(${itemId})`,
-                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 = [];
         const excludeOptions = [
             'listTitle',
             'listId',
+            'listUrl',
             'webUrl',
             'id',
             'contentType',
@@ -263,31 +255,28 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
      * @param cmd command cmd
      */
     requestObjectIdentity(webUrl, logger, formDigestValue) {
-        const requestOptions = {
-            url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
-            headers: {
-                'X-RequestDigest': formDigestValue
-            },
-            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="1" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
-        };
-        return new Promise((resolve, reject) => {
-            request_1.default.post(requestOptions).then((res) => {
-                if (this.debug) {
-                    logger.logToStderr('Attempt to get _ObjectIdentity_ key values');
-                }
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x['ErrorInfo']; });
-                if (contents && contents.ErrorInfo) {
-                    reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                const identityObject = json.find(x => { return x['_ObjectIdentity_']; });
-                if (identityObject) {
-                    resolve(identityObject['_ObjectIdentity_']);
-                }
-                reject('Cannot proceed. _ObjectIdentity_ not found'); // this is not supposed to happen
-            }).catch((err) => {
-                reject(err);
-            });
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': formDigestValue
+                },
+                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="1" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
+            };
+            const response = yield request_1.default.post(requestOptions);
+            if (this.debug) {
+                logger.logToStderr('Attempt to get _ObjectIdentity_ key values');
+            }
+            const json = JSON.parse(response);
+            const contents = json.find(x => { return x['ErrorInfo']; });
+            if (contents && contents.ErrorInfo) {
+                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+            }
+            const identityObject = json.find(x => { return x['_ObjectIdentity_']; });
+            if (identityObject) {
+                return identityObject['_ObjectIdentity_'];
+            }
+            throw 'Cannot proceed. _ObjectIdentity_ not found'; // this is not supposed to happen
         });
     }
 }
@@ -296,6 +285,7 @@ _SpoListItemSetCommand_instances = new WeakSet(), _SpoListItemSetCommand_initTel
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             contentType: typeof args.options.contentType !== 'undefined',
             systemUpdate: typeof args.options.systemUpdate !== 'undefined'
         });
@@ -309,6 +299,8 @@ _SpoListItemSetCommand_instances = new WeakSet(), _SpoListItemSetCommand_initTel
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-c, --contentType [contentType]'
     }, {
@@ -316,25 +308,21 @@ _SpoListItemSetCommand_instances = new WeakSet(), _SpoListItemSetCommand_initTel
     });
 }, _SpoListItemSetCommand_initValidators = function _SpoListItemSetCommand_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;
     }));
 }, _SpoListItemSetCommand_initTypes = function _SpoListItemSetCommand_initTypes() {
-    this.types.string.push('webUrl', 'listId', 'listTitle', 'id', 'contentType');
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'id', 'contentType');
     this.types.boolean.push('systemUpdate');
+}, _SpoListItemSetCommand_initOptionSets = function _SpoListItemSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListItemSetCommand();
 //# sourceMappingURL=listitem-set.js.map

package/dist/m365/spo/commands/mail/mail-send.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoMailSendCommand_instances, _SpoMailSendCommand_initTelemetry, _SpoMailSendCommand_initOptions, _SpoMailSendCommand_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 SpoMailSendCommand extends SpoCommand_1.default {
@@ -33,51 +33,56 @@ class SpoMailSendCommand extends SpoCommand_1.default {
     get description() {
         return 'Sends an e-mail from SharePoint';
     }
-    commandAction(logger, args, cb) {
-        const params = {
-            properties: {
-                __metadata: { "type": "SP.Utilities.EmailProperties" },
-                Body: args.options.body,
-                Subject: args.options.subject,
-                To: { results: args.options.to.replace(/\s+/g, '').split(',') }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const params = {
+                properties: {
+                    __metadata: { "type": "SP.Utilities.EmailProperties" },
+                    Body: args.options.body,
+                    Subject: args.options.subject,
+                    To: { results: args.options.to.replace(/\s+/g, '').split(',') }
+                }
+            };
+            if (args.options.from && args.options.from.length > 0) {
+                params.properties.From = args.options.from;
+            }
+            if (args.options.cc && args.options.cc.length > 0) {
+                params.properties.CC = { results: args.options.cc.replace(/\s+/g, '').split(',') };
+            }
+            if (args.options.bcc && args.options.bcc.length > 0) {
+                params.properties.BCC = { results: args.options.bcc.replace(/\s+/g, '').split(',') };
+            }
+            if (args.options.additionalHeaders) {
+                const h = JSON.parse(args.options.additionalHeaders);
+                params.properties.AdditionalHeaders = {
+                    __metadata: { "type": "Collection(SP.KeyValue)" },
+                    results: Object.keys(h).map(key => {
+                        return {
+                            __metadata: {
+                                type: 'SP.KeyValue'
+                            },
+                            Key: key,
+                            Value: h[key],
+                            ValueType: 'Edm.String'
+                        };
+                    })
+                };
             }
-        };
-        if (args.options.from && args.options.from.length > 0) {
-            params.properties.From = args.options.from;
-        }
-        if (args.options.cc && args.options.cc.length > 0) {
-            params.properties.CC = { results: args.options.cc.replace(/\s+/g, '').split(',') };
-        }
-        if (args.options.bcc && args.options.bcc.length > 0) {
-            params.properties.BCC = { results: args.options.bcc.replace(/\s+/g, '').split(',') };
-        }
-        if (args.options.additionalHeaders) {
-            const h = JSON.parse(args.options.additionalHeaders);
-            params.properties.AdditionalHeaders = {
-                __metadata: { "type": "Collection(SP.KeyValue)" },
-                results: Object.keys(h).map(key => {
-                    return {
-                        __metadata: {
-                            type: 'SP.KeyValue'
-                        },
-                        Key: key,
-                        Value: h[key],
-                        ValueType: 'Edm.String'
-                    };
-                })
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/SP.Utilities.Utility.SendEmail`,
+                headers: {
+                    'content-type': 'application/json;odata=verbose'
+                },
+                responseType: 'json',
+                data: params
             };
-        }
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/SP.Utilities.Utility.SendEmail`,
-            headers: {
-                'content-type': 'application/json;odata=verbose'
-            },
-            responseType: 'json',
-            data: params
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoMailSendCommand_instances = new WeakSet(), _SpoMailSendCommand_initTelemetry = function _SpoMailSendCommand_initTelemetry() {
@@ -108,7 +113,7 @@ _SpoMailSendCommand_instances = new WeakSet(), _SpoMailSendCommand_initTelemetry
         option: '--additionalHeaders [additionalHeaders]'
     });
 }, _SpoMailSendCommand_initValidators = function _SpoMailSendCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoMailSendCommand();
 //# sourceMappingURL=mail-send.js.map