@plusscommunities/pluss-core-aws 1.3.2 → 1.3.6-beta.0

package/aws/getDefaultEmailAddress.js

@@ -0,0 +1,24 @@
+const AWS = require("aws-sdk");
+const { getConfig } = require("../config");
+
+module.exports = (access = null) => {
+  return new Promise((resolve, reject) => {
+    const { serverlessConfig } = getConfig();
+    AWS.config.update({
+      accessKeyId: access ? access.key : serverlessConfig.key,
+      secretAccessKey: access ? access.secret : serverlessConfig.secret,
+    });
+
+    const sesv2 = new AWS.SESV2();
+    const params = { PageSize: 1 };
+    sesv2.listEmailIdentities(params, (err, data) => {
+      if (err) return reject(err);
+      const { EmailIdentities } = data;
+      return resolve(
+        EmailIdentities && EmailIdentities.length > 0
+          ? EmailIdentities[0]
+          : null
+      );
+    });
+  });
+};

package/aws/sendEmail.js

@@ -0,0 +1,36 @@
+const AWS = require("aws-sdk");
+const { getConfig } = require("../config");
+
+module.exports = (from, to, subject, content, access = null) => {
+  return new Promise((resolve, reject) => {
+    const { serverlessConfig } = getConfig();
+    AWS.config.update({
+      accessKeyId: access ? access.key : serverlessConfig.key,
+      secretAccessKey: access ? access.secret : serverlessConfig.secret,
+    });
+
+    const sesv2 = new AWS.SESV2();
+    const params = {
+      Content: {
+        Simple: {
+          Body: {
+            Html: {
+              Data: content,
+            },
+          },
+          Subject: {
+            Data: subject,
+          },
+        },
+      },
+      Destination: {
+        ToAddresses: to.split(",").map((i) => i.trim()),
+      },
+      FromEmailAddress: from,
+    };
+    sesv2.sendEmail(params, (err, data) => {
+      if (err) return reject(err);
+      return resolve(data);
+    });
+  });
+};

package/helper/sendEmail.js

@@ -1,7 +1,9 @@
 const nodemailer = require("nodemailer");
+const sendEmail = require("../aws/sendEmail");
+const getDefaultEmailAddress = require("../aws/getDefaultEmailAddress");
 const { getConfig } = require("../config");
 
-module.exports = function (
+module.exports = async (
   toEmail,
   subject,
   content,
@@ -9,23 +11,11 @@ module.exports = function (
   fromEmail,
   excludeClientBranding,
   brandingImage
-) {
-  return new Promise((resolve, reject) => {
-    console.log("sending email");
+) => {
+  const { communityConfig, serverlessConfig } = getConfig();
 
-    const transporter = nodemailer.createTransport({
-      //host: 'smtp.ethereal.email',
-      service: "gmail",
-      //port: 587,
-      auth: {
-        user: "info@joinpluss.com",
-        pass: "smartcommunities",
-      },
-    });
-
-    const { communityConfig } = getConfig();
-    if (useTemplate) {
-      content = `<div style="padding: 24px; padding-top: 0px; background-color: #f2f4f8;margin: 0px;">
+  if (useTemplate) {
+    content = `<div style="padding: 24px; padding-top: 0px; background-color: #f2f4f8;margin: 0px;">
                     <div style="background-color: #fff; padding: 48px; padding-top: 65px; padding-bottom: 24px;">
                         ${content}
                         ${
@@ -50,19 +40,53 @@ module.exports = function (
                         </div>
                     </div>
                 </div>`;
-    }
+  }
 
-    const mailOptions = {
-      from:
-        fromEmail != null
-          ? fromEmail
-          : `"${communityConfig.name}" noreply@${communityConfig.subdomain}.plusscommunities.com'`,
-      to: toEmail,
-      subject,
-      text: content,
-      html: content,
-    };
+  const mailOptions = {
+    from:
+      fromEmail ||
+      `"${communityConfig.name}" noreply@${communityConfig.subdomain}.plusscommunities.com'`,
+    to: toEmail,
+    subject,
+    text: content,
+    html: content,
+  };
 
+  if (serverlessConfig && serverlessConfig.key && serverlessConfig.secret) {
+    try {
+      mailOptions.from =
+        fromEmail ||
+        `${communityConfig.name} <${
+          (await getDefaultEmailAddress(serverlessConfig)).IdentityName
+        }>`;
+
+      console.log("serverlessConfig exists, using Amazon SES", mailOptions);
+      const result = await sendEmail(
+        mailOptions.from,
+        mailOptions.to,
+        mailOptions.subject,
+        mailOptions.html,
+        serverlessConfig
+      );
+      console.log("Email success", toEmail, subject, result);
+    } catch (error) {
+      console.log("Email failed", toEmail, subject, error);
+      throw error;
+    }
+  } else {
+    console.log(
+      "serverlessConfig doesn't exist, fall back to nodemailer",
+      mailOptions
+    );
+    const transporter = nodemailer.createTransport({
+      //host: 'smtp.ethereal.email',
+      service: "gmail",
+      //port: 587,
+      auth: {
+        user: "info@joinpluss.com",
+        pass: "smartcommunities",
+      },
+    });
     transporter.sendMail(mailOptions, (error) => {
       if (error) {
         console.log("Email failed", toEmail, subject, error);
@@ -72,5 +96,5 @@ module.exports = function (
         resolve();
       }
     });
-  });
+  }
 };

package/package.json

@@ -1,9 +1,12 @@
 {
   "name": "@plusscommunities/pluss-core-aws",
-  "version": "1.3.2",
+  "version": "1.3.6-beta.0",
   "description": "Core extension package for Pluss Communities platform",
   "scripts": {
+    "betapatch": "npm version prepatch --preid=beta",
     "patch": "npm version patch",
+    "betaupload": "npm publish --access public --tag beta",
+    "betaupload:p": "npm run betapatch && npm run betaupload",
     "upload": "npm publish --access public",
     "upload:p": "npm run patch && npm run upload"
   },