@plusscommunities/pluss-core-aws 1.5.14 → 1.5.15-beta.0

package/aws/getEmailServiceInfo.js

@@ -1,14 +1,27 @@
 const getEmailService = require("./getEmailService");
 const getDefaultEmailAddress = require("./getDefaultEmailAddress");
+const { getConfig } = require("../config");
 
 module.exports = async (accessKey, secretKey) => {
   const result = {
     enabled: false,
     sender: null,
   };
+  const { emailConfig } = getConfig();
   const service = await getEmailService(accessKey, secretKey);
-  console.log("Amazon SES status", service);
-  if (service && service.SendingEnabled && service.ProductionAccessEnabled) {
+  console.log("Amazon SES status", {
+    service,
+    allwoSandbox: emailConfig.allwoSandbox,
+    forceFallback: emailConfig.forceFallback,
+  });
+  if (emailConfig.forceFallback) return result;
+
+  if (
+    service &&
+    service.SendingEnabled &&
+    (emailConfig.allwoSandbox || service.ProductionAccessEnabled) &&
+    service.SendQuota.Max24HourSend > service.SendQuota.SentLast24Hours
+  ) {
     result.enabled = true;
     const sender = await getDefaultEmailAddress(accessKey, secretKey);
     console.log("Amazon SES sender", sender);
@@ -16,6 +29,5 @@ module.exports = async (accessKey, secretKey) => {
       result.sender = sender.IdentityName;
     }
   }
-
   return result;
 };

package/helper/sendEmail.js

@@ -3,6 +3,27 @@ const sendEmail = require("../aws/sendEmail");
 const getEmailServiceInfo = require("../aws/getEmailServiceInfo");
 const { getConfig } = require("../config");
 
+const sendFallback = (mailOptions, emailConfig) => {
+  return new Promise((resolve, reject) => {
+    console.log("Cannot use Amazon SES, fall back to nodemailer", mailOptions);
+    const transporter = nodemailer.createTransport({
+      //host: 'smtp.ethereal.email',
+      service: "gmail",
+      //port: 587,
+      auth: emailConfig.fallbackAuth,
+    });
+    transporter.sendMail(mailOptions, (error) => {
+      if (error) {
+        console.log("Email failed", mailOptions.to, mailOptions.subject, error);
+        reject(error);
+      } else {
+        console.log("Email success", mailOptions.to, mailOptions.subject);
+        resolve();
+      }
+    });
+  });
+};
+
 module.exports = async (
   toEmail,
   subject,
@@ -15,7 +36,7 @@ module.exports = async (
     bcc = null,
   } = {}
 ) => {
-  const { communityConfig, serverlessConfig } = getConfig();
+  const { communityConfig, serverlessConfig, emailConfig } = getConfig();
 
   if (useTemplate) {
     content = `<div style="padding: 24px; padding-top: 0px; background-color: #f2f4f8;margin: 0px;">
@@ -77,27 +98,9 @@ module.exports = async (
       console.log("Email success", toEmail, subject, result);
     } catch (error) {
       console.log("Email failed", toEmail, subject, error);
-      throw error;
+      await sendFallback(mailOptions, emailConfig);
     }
   } else {
-    console.log("Cannot use Amazon SES, 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();
-      }
-    });
+    await sendFallback(mailOptions, emailConfig);
   }
 };

package/package.json

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