diff --git a/connect/service.js b/connect/service.js index 64b1ace..a0f8f73 100644 --- a/connect/service.js +++ b/connect/service.js @@ -11,29 +11,34 @@ sgMail.setApiKey(config.SENDGRID_API_KEY); const sendEmail = (templateId, message) => { // send email + let msg = {} const from = message.from ? message.from : config.EMAIL_FROM; const replyTo = message.replyTo ? message.replyTo : config.EMAIL_FROM; - const substitutions = message.data ; - const categories = message.categories ? message.categories: []; + const substitutions = message.data; + const categories = message.categories ? message.categories : []; const to = message.recipients; - const cc = message.cc ? message.cc : []; + const cc = message.cc ? message.cc : []; const bcc = message.bcc ? message.bcc : []; + const sendAt = message.sendAt ? message.sendAt : null; + const personalizations = message.personalizations ? message.personalizations : null const attachments = message.attachments ? message.attachments : []; - - if (message.version && message.version=="v3"){ - return sgMail.send({ + + if (message.version && message.version == "v3") { + msg = { to, templateId, dynamicTemplateData: substitutions, + personalizations, from, replyTo, categories, cc, bcc, - attachments - }); - } else{ - return sgMail.send({ + attachments, + sendAt + }; + } else { + msg = { to, templateId, substitutions, @@ -43,8 +48,9 @@ const sendEmail = (templateId, message) => { // send email categories, cc, bcc, - }); + }; } + return sgMail.send(msg) } module.exports = { sendEmail, diff --git a/package-lock.json b/package-lock.json index 3c495ca..a12e3d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2005,7 +2005,8 @@ "jsbn": { "version": "0.1.1", "resolved": "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz", - "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=" + "integrity": "sha1-peZUwuWi3rXyAdls77yoDA7y9RM=", + "optional": true }, "json-schema": { "version": "0.2.3",