@plusscommunities/pluss-core-aws 1.3.4-beta.0 → 1.3.8-beta.0

package/aws/getDefaultEmailAddress.js

@@ -1,24 +1,26 @@
 const AWS = require("aws-sdk");
-const { getConfig } = require("../config");
 
-module.exports = (access = null) => {
+module.exports = (accessKey, secretKey) => {
   return new Promise((resolve, reject) => {
-    const { serverlessConfig } = getConfig();
-    AWS.config.update({
-      accessKeyId: access ? access.key : serverlessConfig.key,
-      secretAccessKey: access ? access.secret : serverlessConfig.secret,
-    });
+    if (accessKey && secretKey) {
+      AWS.config.update({
+        accessKeyId: accessKey,
+        secretAccessKey: secretKey,
+      });
 
-    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
-      );
-    });
+      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
+        );
+      });
+    } else {
+      resolve(null);
+    }
   });
 };

package/aws/getEmailService.js

@@ -0,0 +1,21 @@
+const AWS = require("aws-sdk");
+
+module.exports = (accessKey, secretKey) => {
+  return new Promise((resolve, reject) => {
+    if (accessKey && secretKey) {
+      AWS.config.update({
+        accessKeyId: accessKey,
+        secretAccessKey: secretKey,
+      });
+
+      const sesv2 = new AWS.SESV2();
+      const params = {};
+      sesv2.getAccount(params, (err, data) => {
+        if (err) return reject(err);
+        return resolve(data);
+      });
+    } else {
+      resolve(null);
+    }
+  });
+};

package/aws/getEmailServiceInfo.js

@@ -0,0 +1,21 @@
+const getEmailService = require("./getEmailService");
+const getDefaultEmailAddress = require("./getDefaultEmailAddress");
+
+module.exports = async (accessKey, secretKey) => {
+  const result = {
+    enabled: false,
+    sender: null,
+  };
+  const service = await getEmailService(accessKey, secretKey);
+  console.log("Amazon SES status", service);
+  if (service && service.SendingEnabled && service.ProductionAccessEnabled) {
+    result.enabled = true;
+    const sender = await getDefaultEmailAddress(accessKey, secretKey);
+    console.log("Amazon SES sender", sender);
+    if (sender) {
+      result.sender = sender.IdentityName;
+    }
+  }
+
+  return result;
+};

package/db/scheduledActions/deleteActionQueue.js

@@ -0,0 +1,5 @@
+const deleteRef = require("../common/deleteRef");
+
+module.exports = (id) => {
+  return deleteRef("actionqueue", "RowId", id);
+};

package/db/scheduledActions/getActionQueueById.js

@@ -0,0 +1,13 @@
+const getRef = require("../common/getRef");
+
+module.exports = (rowId) => {
+  return new Promise((resolve, reject) => {
+    getRef("actionqueue", "RowId", rowId)
+      .then((ev) => {
+        resolve(ev);
+      })
+      .catch((error) => {
+        reject(error);
+      });
+  });
+};

package/db/scheduledActions/updateActionQueue.js

@@ -0,0 +1,31 @@
+const uuid = require("uuid");
+const moment = require("moment");
+const editRef = require("../common/editRef");
+
+module.exports = (rowId, update) => {
+  return new Promise(async (resolve, reject) => {
+    try {
+      const now = moment().valueOf();
+      const { Created, Updated, TriggerAt, Status, Recipients } = update;
+      if (!rowId) {
+        rowId = uuid.v1();
+        if (!Created) update.Created = now;
+        if (!Status) update.Status = "READY";
+      } else {
+        if (!Updated) update.Updated = now;
+      }
+      if (TriggerAt) update.TriggerAt = moment(TriggerAt).valueOf();
+      if (Recipients)
+        update.Recipients =
+          typeof Recipients === "string" || Recipients instanceof String
+            ? Recipients.split(",").map((r) => r.trim())
+            : Recipients;
+
+      const updated = await editRef("actionqueue", "RowId", rowId, update);
+
+      resolve(updated);
+    } catch (error) {
+      reject(error);
+    }
+  });
+};

package/helper/sendEmail.js

@@ -1,6 +1,6 @@
 const nodemailer = require("nodemailer");
 const sendEmail = require("../aws/sendEmail");
-const getDefaultEmailAddress = require("../aws/getDefaultEmailAddress");
+const getEmailServiceInfo = require("../aws/getEmailServiceInfo");
 const { getConfig } = require("../config");
 
 module.exports = async (
@@ -52,13 +52,16 @@ module.exports = async (
     html: content,
   };
 
-  if (serverlessConfig && serverlessConfig.key && serverlessConfig.secret) {
+  const sesInfo = await getEmailServiceInfo(
+    serverlessConfig.key,
+    serverlessConfig.secret
+  );
+
+  if (sesInfo.enabled) {
     try {
+      console.log("Using Amazon SES", mailOptions);
       mailOptions.from =
-        fromEmail ||
-        (await getDefaultEmailAddress(serverlessConfig)).IdentityName;
-
-      console.log("serverlessConfig exists, using Amazon SES", mailOptions);
+        fromEmail || `${communityConfig.name} <${sesInfo.sender}>`;
       const result = await sendEmail(
         mailOptions.from,
         mailOptions.to,
@@ -72,10 +75,7 @@ module.exports = async (
       throw error;
     }
   } else {
-    console.log(
-      "serverlessConfig doesn't exist, fall back to nodemailer",
-      mailOptions
-    );
+    console.log("Cannot use Amazon SES, fall back to nodemailer", mailOptions);
     const transporter = nodemailer.createTransport({
       //host: 'smtp.ethereal.email',
       service: "gmail",

package/notification/prepNotification.js

@@ -114,6 +114,10 @@ module.exports = (noti) => {
       thisNoti.Text = `There is a new document: ${noti.Data.Name}`;
       thisNoti.Icon = "file-o";
       break;
+    case "ScheduledAction":
+      thisNoti.Text = noti.Data.message;
+      thisNoti.Icon = "bell-o";
+      break;
     default:
       thisNoti.Text = "You have received a notification";
       thisNoti.Icon = "bell-o";

package/package.json

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