@plusscommunities/pluss-core-aws 1.4.19-beta.0 → 1.4.21-beta.0

package/helper/generateJsonResponse.js

@@ -1,22 +1,29 @@
-const replaceErrors = (key, value) => {
-  if (value instanceof Error) {
-    var error = {};
-    Object.getOwnPropertyNames(value).forEach(function (key) {
-      error[key] = value[key];
-    });
-    return error;
-  }
-  return value;
+const getCircularReplacer = () => {
+  const seen = new WeakSet();
+  return (key, value) => {
+    if (value instanceof Error) {
+      var error = {};
+      Object.getOwnPropertyNames(value).forEach((key) => {
+        error[key] = value[key];
+      });
+      return error;
+    } else if (typeof value === "object" && value !== null) {
+      if (seen.has(value)) return;
+      seen.add(value);
+    }
+    return value;
+  };
 };
 
 module.exports = (statusCode, body) => {
   if ([400, 402, 422].includes(statusCode)) console.error(body);
+  const jsonBody = JSON.stringify(body.error || body, getCircularReplacer());
   return {
     statusCode,
     headers: {
       "Content-Type": "application/json",
       "Access-Control-Allow-Origin": "*",
     },
-    body: JSON.stringify(body, replaceErrors),
+    body: jsonBody,
   };
 };

package/helper/sendEmail.js

@@ -13,7 +13,7 @@ module.exports = async (
     excludeClientBranding = false,
     brandingImage = null,
     bcc = null,
-  }
+  } = {}
 ) => {
   const { communityConfig, serverlessConfig } = getConfig();
 

package/helper/templates/replacePlaceHolders.js

@@ -0,0 +1,32 @@
+module.exports = (template, toReplace = null, user = null) => {
+  let replaced = template;
+  if (toReplace) {
+    Object.keys(toReplace).forEach((key) => {
+      replaced = replaced.replace(
+        new RegExp(`{{${key}}}`, "g"),
+        toReplace[key] || ""
+      );
+    });
+  }
+  if (user) {
+    const nameReplace =
+      (toReplace?.names && toReplace?.names[user.Id]) || user.displayName;
+    const phoneReplace =
+      (toReplace?.phoneNumbers && toReplace?.phoneNumbers[user.Id]) ||
+      user.phoneNumber;
+    // Remove surname
+    const firstname = nameReplace
+      ? nameReplace.split(" ").map((n) => n.trim())[0]
+      : null;
+    replaced = replaced
+      .replace(new RegExp("{{name}}", "g"), firstname || "{{name}}")
+      .replace(new RegExp("{{fullname}}", "g"), nameReplace || "{{fullname}}")
+      .replace(
+        new RegExp("{{phoneNumber}}", "g"),
+        phoneReplace || "{{phoneNumber}}"
+      )
+      .replace(new RegExp("{{email}}", "g"), user.email || "{{email}}");
+  }
+
+  return replaced;
+};

package/notification/sendNotifications.js

@@ -43,41 +43,37 @@ const SendNotification = async (tokens, message, type, key, params, config) => {
       }
       messages.push(msg);
     } else {
-      log(
-        "SendNotification",
-        "IsTokenError",
-        `Push token ${token} is not a valid Expo push token`,
-        logId
-      );
-      if (config.raiseError) throw error;
+      const message = `Push token ${token} is not a valid Expo push token`;
+      log("SendNotification", "IsTokenError", message, logId);
+      if (config.raiseError) throw new Error(message);
     }
   }
 
   log("SendNotification", "messages", messages);
   const chunks = expo.chunkPushNotifications(messages);
   for (const chunk of chunks) {
-    expo
-      .sendPushNotificationsAsync(chunk)
-      .then((receipts) => {
-        log("SendNotification", "Receipts", receipts, logId);
-      })
-      .catch((error) => {
-        if (error.code && error.code === "PUSH_TOO_MANY_EXPERIENCE_IDS") {
-          log(
-            "SendNotification",
-            "CaughtError",
-            "PUSH_TOO_MANY_EXPERIENCE_IDS",
-            logId
-          );
-          // send separately
-          _.values(error.details).forEach((appTokens) => {
-            SendNotification(appTokens, message, type, key, params, config);
-          });
-        } else {
-          log("SendNotification", "SendError", error, logId);
-          if (config.raiseError) throw error;
-        }
-      });
+    try {
+      const receipts = await expo.sendPushNotificationsAsync(chunk);
+      log("SendNotification", "Receipts", receipts, logId);
+    } catch (error) {
+      if (error.code && error.code === "PUSH_TOO_MANY_EXPERIENCE_IDS") {
+        log(
+          "SendNotification",
+          "CaughtError",
+          "PUSH_TOO_MANY_EXPERIENCE_IDS",
+          logId
+        );
+        // send separately
+        await Promise.all(
+          _.values(error.details).map((appTokens) =>
+            SendNotification(appTokens, message, type, key, params, config)
+          )
+        );
+      } else {
+        log("SendNotification", "SendError", error, logId);
+        if (config.raiseError) throw error;
+      }
+    }
   }
 };
 

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@plusscommunities/pluss-core-aws",
-  "version": "1.4.19-beta.0",
+  "version": "1.4.21-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": "npm i && npm i && npm publish --access public --tag beta",
     "betaupload:p": "npm run betapatch && npm run betaupload",
-    "upload": "npm publish --access public",
+    "upload": "npm i && npm i && npm publish --access public",
     "upload:p": "npm run patch && npm run upload"
   },
   "author": "Phillip Suh",