@plusscommunities/pluss-core-aws 1.3.3-beta.0 → 1.3.4-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/helper/sendEmail.js

@@ -1,8 +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,
@@ -10,13 +11,11 @@ module.exports = function (
   fromEmail,
   excludeClientBranding,
   brandingImage
-) {
-  return new Promise((resolve, reject) => {
-    console.log("sending email");
-    const { communityConfig, serverlessConfig, emailConfig } = getConfig();
+) => {
+  const { communityConfig, serverlessConfig } = 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}
                         ${
@@ -41,59 +40,59 @@ module.exports = function (
                         </div>
                     </div>
                 </div>`;
-    }
+  }
+
+  const mailOptions = {
+    from:
+      fromEmail ||
+      `"${communityConfig.name}" noreply@${communityConfig.subdomain}.plusscommunities.com'`,
+    to: toEmail,
+    subject,
+    text: content,
+    html: content,
+  };
 
-    const defaultFrom = emailConfig
-      ? emailConfig.contactEmail
-      : `"${communityConfig.name}" noreply@${communityConfig.subdomain}.plusscommunities.com'`;
-    const mailOptions = {
-      from: fromEmail != null ? fromEmail : defaultFrom,
-      to: toEmail,
-      subject,
-      text: content,
-      html: content,
-    };
+  if (serverlessConfig && serverlessConfig.key && serverlessConfig.secret) {
+    try {
+      mailOptions.from =
+        fromEmail ||
+        (await getDefaultEmailAddress(serverlessConfig)).IdentityName;
 
-    if (serverlessConfig && serverlessConfig.key && serverlessConfig.secret) {
       console.log("serverlessConfig exists, using Amazon SES", mailOptions);
-      sendEmail(
+      const result = await sendEmail(
         mailOptions.from,
         mailOptions.to,
         mailOptions.subject,
         mailOptions.html,
         serverlessConfig
-      )
-        .then((result) => {
-          console.log("Email success", toEmail, subject, result);
-          resolve();
-        })
-        .catch((error) => {
-          console.log("Email failed", toEmail, subject, error);
-          reject(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);
-          reject(error);
-        } else {
-          console.log("Email success", toEmail, subject);
-          resolve();
-        }
-      });
+      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);
+        reject(error);
+      } else {
+        console.log("Email success", toEmail, subject);
+        resolve();
+      }
+    });
+  }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-core-aws",
-  "version": "1.3.3-beta.0",
+  "version": "1.3.4-beta.0",
   "description": "Core extension package for Pluss Communities platform",
   "scripts": {
     "betapatch": "npm version prepatch --preid=beta",