Tansition to amazon SES email.

client/src/components/email-overlay/email-overlay.container.jsx

@@ -71,7 +71,10 @@ export function EmailOverlayContainer({
         ...defaultEmailFrom,
         ...values,
         html: rawHtml,
-        attachments,
+        attachments: await Promise.all(
+          values.fileList.map(async (f) => await toBase64(f.originFileObj))
+        ),
+        //attachments,
       });
       notification["success"]({ message: t("emails.successes.sent") });
       toggleEmailOverlayVisible();

package.json

@@ -17,6 +17,7 @@
     "start": "node server.js"
   },
   "dependencies": {
+    "aws-sdk": "^2.891.0",
     "body-parser": "^1.18.3",
     "cloudinary": "^1.25.0",
     "compression": "^1.7.4",
@@ -34,6 +35,7 @@
     "moment": "^2.29.1",
     "node-fetch": "^2.6.1",
     "node-mailjet": "^3.3.1",
+    "nodemailer": "^6.5.0",
     "phone": "^2.4.20",
     "stripe": "^8.143.0",
     "twilio": "^3.60.0",

server/email/sendemail.js

@@ -6,62 +6,113 @@ require("dotenv").config({
   ),
 });
 
-const inlineCssTool = require("inline-css");
-
 const mailjet = require("node-mailjet").connect(
   process.env.email_api,
   process.env.email_secret
 );
 
+let nodemailer = require("nodemailer");
+let aws = require("aws-sdk");
+
+const ses = new aws.SES({
+  apiVersion: "2010-12-01",
+  region: "ca-central-1",
+});
+
+let transporter = nodemailer.createTransport({
+  SES: { ses, aws },
+});
+
 exports.sendEmail = async (req, res) => {
   if (process.env.NODE_ENV !== "production") {
     console.log("[EMAIL] Incoming Message", req.body.from.name);
   }
 
+  transporter.sendMail(
+    {
+      from: `${req.body.from.name} <${req.body.from.address}>`,
+      replyTo: req.body.ReplyTo.Email,
+      to: req.body.to,
+      cc: req.body.cc,
+      subject: "Message",
+      attachments:
+        (req.body.attachments &&
+          req.body.attachments.map((a) => {
+            return {
+              path: a,
+            };
+          })) ||
+        null,
+      html: req.body.html,
+      ses: {
+        // optional extra arguments for SendRawEmail
+        Tags: [
+          {
+            Name: "tag_name",
+            Value: "tag_value",
+          },
+        ],
+      },
+    },
+    (err, info) => {
+      console.log(err || info);
+      if (info) {
+        console.log("[EMAIL] Email sent: " + info);
+        res.json({ success: true, response: info });
+      } else {
+        console.log("[EMAIL] Email send failed. ", err);
+        res.json({ success: false, error: err });
+      }
+    }
+  );
+
   // const inlinedCssHtml = await inlineCssTool(req.body.html, {
   //   url: "https://imex.online",
   // });
 
   // console.log("inlinedCssHtml", inlinedCssHtml);
 
-  const request = mailjet.post("send", { version: "v3.1" }).request({
+  // Create the promise and SES service object
-    Messages: [
+
-      {
+  // const request = mailjet.post("send", { version: "v3.1" }).request({
-        From: {
+  //   Messages: [
-          Email: req.body.from.address,
+  //     {
-          Name: req.body.from.name,
+  //       From: {
-        },
+  //         Email: req.body.from.address,
-        To:
+  //         Name: req.body.from.name,
-          req.body.to &&
+  //       },
-          req.body.to.map((i) => {
+  //       To:
-            return { Email: i };
+  //         req.body.to &&
-          }),
+  //         req.body.to.map((i) => {
-        CC:
+  //           return { Email: i };
-          req.body.cc &&
+  //         }),
-          req.body.cc.map((i) => {
+  //       CC:
-            return { Email: i };
+  //         req.body.cc &&
-          }),
+  //         req.body.cc.map((i) => {
-        ReplyTo: {
+  //           return { Email: i };
-          Email: req.body.ReplyTo.Email,
+  //         }),
-          Name: req.body.ReplyTo.Name,
+  //       ReplyTo: {
-        },
+  //         Email: req.body.ReplyTo.Email,
-        Subject: req.body.subject,
+  //         Name: req.body.ReplyTo.Name,
-        // TextPart:
+  //       },
-        //   "Dear passenger 1, welcome to Mailjet! May the delivery force be with you!",
+  //       Subject: req.body.subject,
-        HTMLPart: req.body.html,
+  //       // TextPart:
-        Attachments: req.body.attachments || null,
+  //       //   "Dear passenger 1, welcome to Mailjet! May the delivery force be with you!",
-      },
+  //       HTMLPart: req.body.html,
-    ],
+  //       Attachments: req.body.attachments || null,
-  });
+  //     },
-  request
+  //   ],
-    .then((result) => {
+  // });
-      console.log("[EMAIL] Email sent: " + result);
+
-      res.json({ success: true, response: result });
+  // request
-    })
+  //   .then((result) => {
-    .catch((err) => {
+  //     console.log("[EMAIL] Email sent: " + result);
-      console.log("[EMAIL] Email send failed. ", err);
+  //     res.json({ success: true, response: result });
-      res.json({ success: false, error: err.message });
+  //   })
-    });
+  //   .catch((err) => {
+  //     console.log("[EMAIL] Email send failed. ", err);
+  //     res.json({ success: false, error: err.message });
+  //   });
 
   // transporter.sendMail(
   //   {
@@ -82,22 +133,3 @@ exports.sendEmail = async (req, res) => {
   //   }
   // );
 };
-
-// var transporter = nodemailer.createTransport({
-//   host: process.env.email_server,
-//   port: 465,
-//   secure: true, // upgrade later with STARTTLS
-//   auth: {
-//     user: process.env.email_api,
-//     pass: process.env.email_secret,
-//   },
-// });
-
-// // verify connection configuration
-// transporter.verify(function (error, success) {
-//   if (error) {
-//     console.log(error);
-//   } else {
-//     console.log("[EMAIL] Succesfully connected to SMTP server.");
-//   }
-// });

yarn.lock

@@ -483,6 +483,21 @@ atob@2.1.2:
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
   integrity sha512-Wm6ukoaOGJi/73p/cl2GvLjTI5JM1k/O14isD73YML8StrH/7/lRFgmg8nICZgD3bZZvjwCGxtMOD3wWNAu8cg==
 
+aws-sdk@^2.891.0:
+  version "2.891.0"
+  resolved "https://registry.yarnpkg.com/aws-sdk/-/aws-sdk-2.891.0.tgz#02cc2cc6adb94e0d471a5be6dd5668d0c5aacd9e"
+  integrity sha512-st6bKbmA1iWyAz9Fn7CHHNVk/6d51aemPBNpg5sK0kkOSYEob/pCAVSLiN1tGVX6qvjtD41ljeeJDQ3pwRTJfA==
+  dependencies:
+    buffer "4.9.2"
+    events "1.1.1"
+    ieee754 "1.1.13"
+    jmespath "0.15.0"
+    querystring "0.2.0"
+    sax "1.2.1"
+    url "0.10.3"
+    uuid "3.3.2"
+    xml2js "0.4.19"
+
 axios@^0.21.1:
   version "0.21.1"
   resolved "https://registry.yarnpkg.com/axios/-/axios-0.21.1.tgz#22563481962f4d6bde9a76d516ef0e5d3c09b2b8"
@@ -495,7 +510,7 @@ balanced-match@^1.0.0:
   resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
   integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
 
-base64-js@^1.3.0:
+base64-js@^1.0.2, base64-js@^1.3.0:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/base64-js/-/base64-js-1.5.1.tgz#1b1b440160a5bf7ad40b650f095963481903930a"
   integrity sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==
@@ -564,6 +579,15 @@ buffer-from@^1.0.0:
   resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef"
   integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A==
 
+buffer@4.9.2:
+  version "4.9.2"
+  resolved "https://registry.yarnpkg.com/buffer/-/buffer-4.9.2.tgz#230ead344002988644841ab0244af8c44bbe3ef8"
+  integrity sha512-xq+q3SRMOxGivLhBNaUdC64hDTQwejJ+H0T/NB1XMtTVEwNTrfFF3gAxiyW0Bu/xWEGhjVKgUcMhCrUy2+uCWg==
+  dependencies:
+    base64-js "^1.0.2"
+    ieee754 "^1.1.4"
+    isarray "^1.0.0"
+
 bytes@3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/bytes/-/bytes-3.0.0.tgz#d32815404d689699f85a4ea4fa8755dd13a96048"
@@ -1322,6 +1346,11 @@ event-target-shim@^5.0.0:
   resolved "https://registry.yarnpkg.com/event-target-shim/-/event-target-shim-5.0.1.tgz#5d4d3ebdf9583d63a5333ce2deb7480ab2b05789"
   integrity sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==
 
+events@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/events/-/events-1.1.1.tgz#9ebdb7635ad099c70dcc4c2a1f5004288e8bd924"
+  integrity sha1-nr23Y1rQmccNzEwqH1AEKI6L2SQ=
+
 express@^4.16.4:
   version "4.17.1"
   resolved "https://registry.yarnpkg.com/express/-/express-4.17.1.tgz#4491fc38605cf51f8629d39c2b5d026f98a4c134"
@@ -1880,6 +1909,16 @@ iconv-lite@0.4.24:
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
+ieee754@1.1.13:
+  version "1.1.13"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.1.13.tgz#ec168558e95aa181fd87d37f55c32bbcb6708b84"
+  integrity sha512-4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg==
+
+ieee754@^1.1.4:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
+  integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
+
 ignore@^4.0.6:
   version "4.0.6"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
@@ -2040,7 +2079,7 @@ isarray@0.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-0.0.1.tgz#8a18acfca9a8f4177e09abfc6038939b05d1eedf"
   integrity sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8=
 
-isarray@~1.0.0:
+isarray@^1.0.0, isarray@~1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11"
   integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=
@@ -2060,6 +2099,11 @@ jake@^10.6.1:
     filelist "^1.0.1"
     minimatch "^3.0.4"
 
+jmespath@0.15.0:
+  version "0.15.0"
+  resolved "https://registry.yarnpkg.com/jmespath/-/jmespath-0.15.0.tgz#a3f222a9aae9f966f5d27c796510e28091764217"
+  integrity sha1-o/Iiqarp+Wb10nx5ZRDigJF2Qhc=
+
 js-tokens@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
@@ -2512,6 +2556,11 @@ node-mailjet@^3.3.1:
     superagent "^3.5.2"
     superagent-proxy "^1.0.2"
 
+nodemailer@^6.5.0:
+  version "6.5.0"
+  resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.5.0.tgz#d12c28d8d48778918e25f1999d97910231b175d9"
+  integrity sha512-Tm4RPrrIZbnqDKAvX+/4M+zovEReiKlEXWDzG4iwtpL9X34MJY+D5LnQPH/+eghe8DLlAVshHAJZAZWBGhkguw==
+
 normalize-package-data@^2.5.0:
   version "2.5.0"
   resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-2.5.0.tgz#e66db1838b200c1dfc233225d12cb36520e234a8"
@@ -2840,6 +2889,11 @@ pumpify@^2.0.0:
     inherits "^2.0.3"
     pump "^3.0.0"
 
+punycode@1.3.2:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/punycode/-/punycode-1.3.2.tgz#9653a036fb7c1ee42342f2325cceefea3926c48d"
+  integrity sha1-llOgNvt8HuQjQvIyXM7v6jkmxI0=
+
 punycode@^2.1.0, punycode@^2.1.1:
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec"
@@ -2881,6 +2935,11 @@ query-string@^6.12.1:
     split-on-first "^1.0.0"
     strict-uri-encode "^2.0.0"
 
+querystring@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/querystring/-/querystring-0.2.0.tgz#b209849203bb25df820da756e747005878521620"
+  integrity sha1-sgmEkgO7Jd+CDadW50cAWHhSFiA=
+
 querystringify@^2.1.1:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz#3345941b4153cb9d082d8eee4cda2016a9aef7f6"
@@ -3063,6 +3122,16 @@ safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@~5.2.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
+sax@1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.1.tgz#7b8e656190b228e81a66aea748480d828cd2d37a"
+  integrity sha1-e45lYZCyKOgaZq6nSEgNgozS03o=
+
+sax@>=0.6.0:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/sax/-/sax-1.2.4.tgz#2816234e2378bddc4e5354fab5caa895df7100d9"
+  integrity sha512-NqVDv9TpANUjFm0N8uM5GxL36UgKi9/atZw+x7YFnQ8ckwFGKrl4xX4yWtrey3UJm5nP1kUbnYgLopqWNSRhWw==
+
 scmp@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/scmp/-/scmp-2.1.0.tgz#37b8e197c425bdeb570ab91cc356b311a11f9c9a"
@@ -3644,6 +3713,14 @@ url-parse@^1.5.0:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
+url@0.10.3:
+  version "0.10.3"
+  resolved "https://registry.yarnpkg.com/url/-/url-0.10.3.tgz#021e4d9c7705f21bbf37d03ceb58767402774c64"
+  integrity sha1-Ah5NnHcF8hu/N9A861h2dAJ3TGQ=
+  dependencies:
+    punycode "1.3.2"
+    querystring "0.2.0"
+
 util-deprecate@^1.0.1, util-deprecate@~1.0.1:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf"
@@ -3654,6 +3731,11 @@ utils-merge@1.0.1:
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
+uuid@3.3.2:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
+  integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
+
 uuid@^8.0.0:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
@@ -3760,6 +3842,14 @@ xdg-basedir@^4.0.0:
   resolved "https://registry.yarnpkg.com/xdg-basedir/-/xdg-basedir-4.0.0.tgz#4bc8d9984403696225ef83a1573cbbcb4e79db13"
   integrity sha512-PSNhEJDejZYV7h50BohL09Er9VaIefr2LMAf3OEmpCkjOi34eYyQYAXUTjEQtZJTKcF0E2UKTh+osDLsgNim9Q==
 
+xml2js@0.4.19:
+  version "0.4.19"
+  resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.4.19.tgz#686c20f213209e94abf0d1bcf1efaa291c7827a7"
+  integrity sha512-esZnJZJOiJR9wWKMyuvSE1y6Dq5LCuJanqhxslH2bxM6duahNZ+HMpCLhBQGZkbX6xRf8x1Y2eJlgt2q3qo49Q==
+  dependencies:
+    sax ">=0.6.0"
+    xmlbuilder "~9.0.1"
+
 xmlbuilder2@^2.4.1:
   version "2.4.1"
   resolved "https://registry.yarnpkg.com/xmlbuilder2/-/xmlbuilder2-2.4.1.tgz#899c783a833188c5a5aa6f3c5428a3963f3e479d"
@@ -3776,6 +3866,11 @@ xmlbuilder@^13.0.2:
   resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-13.0.2.tgz#02ae33614b6a047d1c32b5389c1fdacb2bce47a7"
   integrity sha512-Eux0i2QdDYKbdbA6AM6xE4m6ZTZr4G4xF9kahI2ukSEMCzwce2eX9WlTI5J3s+NU7hpasFsr8hWIONae7LluAQ==
 
+xmlbuilder@~9.0.1:
+  version "9.0.7"
+  resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-9.0.7.tgz#132ee63d2ec5565c557e20f4c22df9aca686b10d"
+  integrity sha1-Ey7mPS7FVlxVfiD0wi35rKaGsQ0=
+
 xregexp@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/xregexp/-/xregexp-2.0.0.tgz#52a63e56ca0b84a7f3a5f3d61872f126ad7a5943"