Skip to content

Commit c10184b

Browse files
authored
Merge pull request #53 from topcoder-platform/ptc/email
Ptc/email
2 parents e1744cb + 343eb29 commit c10184b

File tree

2 files changed

+19
-12
lines changed

2 files changed

+19
-12
lines changed

connect/service.js

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -11,29 +11,34 @@ sgMail.setApiKey(config.SENDGRID_API_KEY);
1111

1212
const sendEmail = (templateId, message) => { // send email
1313

14+
let msg = {}
1415
const from = message.from ? message.from : config.EMAIL_FROM;
1516
const replyTo = message.replyTo ? message.replyTo : config.EMAIL_FROM;
16-
const substitutions = message.data ;
17-
const categories = message.categories ? message.categories: [];
17+
const substitutions = message.data;
18+
const categories = message.categories ? message.categories : [];
1819
const to = message.recipients;
19-
const cc = message.cc ? message.cc : [];
20+
const cc = message.cc ? message.cc : [];
2021
const bcc = message.bcc ? message.bcc : [];
22+
const sendAt = message.sendAt ? message.sendAt : null;
23+
const personalizations = message.personalizations ? message.personalizations : null
2124
const attachments = message.attachments ? message.attachments : [];
22-
23-
if (message.version && message.version=="v3"){
24-
return sgMail.send({
25+
26+
if (message.version && message.version == "v3") {
27+
msg = {
2528
to,
2629
templateId,
2730
dynamicTemplateData: substitutions,
31+
personalizations,
2832
from,
2933
replyTo,
3034
categories,
3135
cc,
3236
bcc,
33-
attachments
34-
});
35-
} else{
36-
return sgMail.send({
37+
attachments,
38+
sendAt
39+
};
40+
} else {
41+
msg = {
3742
to,
3843
templateId,
3944
substitutions,
@@ -43,8 +48,9 @@ const sendEmail = (templateId, message) => { // send email
4348
categories,
4449
cc,
4550
bcc,
46-
});
51+
};
4752
}
53+
return sgMail.send(msg)
4854
}
4955
module.exports = {
5056
sendEmail,

package-lock.json

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)