@plusscommunities/pluss-core-aws 2.0.20 → 2.0.22

package/helper/auth/checkTokenBlacklist.js

@@ -0,0 +1,25 @@
+const crypto = require("crypto");
+const { getRef } = require("../../db/common/getRef");
+
+module.exports = async (token) => {
+  if (!token) return false;
+
+  try {
+    // Create hash of token for TokenId lookup
+    const tokenHash = crypto.createHash("sha256").update(token).digest("hex");
+
+    // Check if token exists in blacklist
+    const blacklistedToken = await getRef(
+      "invalidTokens",
+      "TokenId",
+      tokenHash
+    );
+
+    // Return true if found (blacklisted), false if not found
+    return !!blacklistedToken;
+  } catch (error) {
+    // If error occurs during lookup, assume token is not blacklisted
+    // This ensures authentication doesn't fail due to blacklist issues
+    return false;
+  }
+};

package/helper/auth/getSessionUser.js

@@ -1,9 +1,21 @@
 const https = require("https");
 const jose = require("node-jose");
 const { getConfig } = require("../../config");
+const checkTokenBlacklist = require("./checkTokenBlacklist");
 
 module.exports = async (token) => {
-  return new Promise((resolve, reject) => {
+  return new Promise(async (resolve, reject) => {
+    if (!token) {
+      return resolve(null);
+    }
+
+    // Check if token is blacklisted before expensive verification
+    const isBlacklisted = await checkTokenBlacklist(token);
+    if (isBlacklisted) {
+      reject("Token has been invalidated");
+      return;
+    }
+
     var sections = token.split(".");
     // get the kid from the headers prior to verification
     var header = jose.util.base64url.decode(sections[0]);

package/helper/sendEmail.js

@@ -1,26 +1,52 @@
-const nodemailer = require("nodemailer");
+const axios = require("axios");
+const moment = require("moment");
 const sendEmail = require("../aws/sendEmail");
 const getEmailServiceInfo = require("../aws/getEmailServiceInfo");
 const { getConfig } = require("../config");
+const { log } = require("./");
+const getRef = require("../db/common/getRef");
+const updateRef = require("../db/common/updateRef");
 
-const sendFallback = (mailOptions, emailConfig) => {
+const sendFallback = (mailOptions, emailConfig, accessConfig) => {
   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);
+    const logId = log("sendFallback", "Email", mailOptions);
+    if (emailConfig.isFallback) {
+      log(
+        "sendFallback",
+        "isFallback",
+        "Not allowed to use this account as it is the fallback itself",
+        logId
+      );
+      return reject(
+        new Error(
+          "Not allowed to use this account as it is the fallback itself"
+        )
+      );
+    }
+
+    // Calling organisation account as the fallback
+    log("sendFallback", "Fallback", emailConfig.fallbackUrl, logId);
+    axios({
+      method: "POST",
+      url: emailConfig.fallbackUrl,
+      headers: {
+        Authorization: accessConfig.authSecret,
+      },
+      data: {
+        to: mailOptions.to,
+        subject: mailOptions.subject,
+        body: mailOptions.html,
+        from: mailOptions.from,
+      },
+    })
+      .then((response) => {
+        log("sendFallback", "response", response.data, logId);
+        resolve(response.data);
+      })
+      .catch((error) => {
+        log("sendFallback", "error", error, logId);
         reject(error);
-      } else {
-        console.log("Email success", mailOptions.to, mailOptions.subject);
-        resolve();
-      }
-    });
+      });
   });
 };
 
@@ -34,9 +60,37 @@ module.exports = async (
     excludeClientBranding = false,
     brandingImage = null,
     bcc = null,
+    rateLimitId = null,
   } = {}
 ) => {
-  const { communityConfig, serverlessConfig, emailConfig } = getConfig();
+  const { communityConfig, serverlessConfig, emailConfig, accessConfig } =
+    getConfig();
+  const now = moment.utc();
+  let rateLimitIdToUse;
+
+  const logId = log("sendEmail", "Email", {
+    toEmail,
+    subject,
+  });
+
+  if (rateLimitId) {
+    try {
+      rateLimitIdToUse = `email_${rateLimitId}`;
+      const item = await getRef("ratelimit", "Id", rateLimitIdToUse);
+      const dayAgo = moment(now).add(-1, "d");
+      if (item && item.LastSent && item.LastSent > dayAgo.valueOf()) {
+        log(
+          "sendEmail",
+          "RateLimit",
+          `Rate limit reached for ${rateLimitIdToUse}`,
+          logId
+        );
+        return { RateLimited: true };
+      }
+    } catch (e) {
+      // continue
+    }
+  }
 
   if (useTemplate) {
     content = `<div style="padding: 24px; padding-top: 0px; background-color: #f2f4f8;margin: 0px;">
@@ -48,28 +102,31 @@ module.exports = async (
                             : `
                             <div style='margin-top: 32px; border-top: 2px solid #e0e0e0;'></div>
                             <div style='padding-top: 24px;  display: block;'>
-                              <div style='clear: both; height: 30px;'>
-                                <img height="30" width="auto" src="${communityConfig.emailBrandingAbovePoweredBy.image}" style="float: left; height: 30px; width: auto; background-repeat: no-repeat; background-size: contain;"></img>
-                              </div>
+                                <div style='clear: both; height: 30px;'>
+                                    <img height="30" width="auto" src="${communityConfig.emailBrandingAbovePoweredBy.image}" style="float: left; height: 30px; width: auto; background-repeat: no-repeat; background-size: contain;"></img>
+                                </div>
                             </div>
                         `
                         }
                     </div>
                     <div style='margin-top: 30px;'>
-                        <div style='margin: 0 auto; width: fit-content;'>
-                            <div style='vertical-align: top; height: 20px; margin-right: 10px; color: #828282; display: inline-block;'>
-                                <span style=' font-size: 13px; line-height: 20px;'>powered by</span>
-                            </div>
-                            <img height="20" width="142" src="https://pluss-prd-uploads.s3.ap-southeast-2.amazonaws.com/uploads/users/ap-southeast-2:80aecdcb-9955-493e-a341-2f2263f64777/public/9c785b064c6abbec00bd4ef12b/logoplusscommunitieslong.png" style="display: inline-block; height: 20px; width: 142px; background-repeat: no-repeat; background-size:contain;"></img>
+                      <div style='margin: 0 auto; width: fit-content;'>
+                        <div style='vertical-align: top; height: 20px; margin-right: 10px; color: #828282; display: inline-block;'>
+                          <span style=' font-size: 13px; line-height: 20px;'>powered by</span>
                         </div>
+                        <img height="20" width="142" src="https://pluss-prd-uploads.s3.ap-southeast-2.amazonaws.com/uploads/users/ap-southeast-2:80aecdcb-9955-493e-a341-2f2263f64777/public/9c785b064c6abbec00bd4ef12b/logoplusscommunitieslong.png" style="display: inline-block; height: 20px; width: 142px; background-repeat: no-repeat; background-size:contain;"></img>
+                      </div>
                     </div>
                 </div>`;
   }
 
+  const sesInfo = await getEmailServiceInfo(
+    serverlessConfig.key,
+    serverlessConfig.secret
+  );
+
   const mailOptions = {
-    from:
-      fromEmail ||
-      `"${communityConfig.name}" noreply@${communityConfig.subdomain}.plusscommunities.com'`,
+    from: fromEmail || `${communityConfig.name} <${sesInfo.sender}>`,
     to: toEmail,
     bcc,
     subject,
@@ -77,16 +134,9 @@ module.exports = async (
     html: content,
   };
 
-  const sesInfo = await getEmailServiceInfo(
-    serverlessConfig.key,
-    serverlessConfig.secret
-  );
-
   if (sesInfo.enabled) {
     try {
-      console.log("Using Amazon SES", mailOptions);
-      mailOptions.from =
-        fromEmail || `${communityConfig.name} <${sesInfo.sender}>`;
+      log("sendEmail", "SES", { toEmail, subject }, logId);
       const result = await sendEmail(
         mailOptions.from,
         mailOptions.to,
@@ -95,12 +145,19 @@ module.exports = async (
         serverlessConfig,
         mailOptions.bcc
       );
-      console.log("Email success", toEmail, subject, result);
+      log("sendEmail", "Success", { toEmail, subject }, logId);
     } catch (error) {
-      console.log("Email failed", toEmail, subject, error);
-      await sendFallback(mailOptions, emailConfig);
+      log("sendEmail", "Error:SES", { toEmail, subject, error }, logId);
+      await sendFallback(mailOptions, emailConfig, accessConfig);
     }
   } else {
-    await sendFallback(mailOptions, emailConfig);
+    await sendFallback(mailOptions, emailConfig, accessConfig);
+  }
+
+  if (rateLimitIdToUse) {
+    await updateRef("ratelimit", {
+      Id: rateLimitIdToUse,
+      LastSent: now.valueOf(),
+    });
   }
 };

package/package.json

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