@plusscommunities/pluss-core-aws 1.4.18-beta.0 → 1.4.20

package/db/notifications/publishNotifications.js

@@ -21,14 +21,14 @@ const saveNotification = (receiver, notification) => {
     });
 };
 
-module.exports = (
+module.exports = async (
   receivers,
   type,
   site,
   id,
   data,
   sendPush,
-  config = { type: "app", id: null, ignoreMute: false }
+  config = { type: "app", id: null, ignoreMute: false, raiseError: false }
 ) => {
   const notification = {};
   notification.Timestamp = moment.utc().valueOf();
@@ -42,6 +42,13 @@ module.exports = (
   });
   if (sendPush) {
     const notiData = prepNotification(notification);
-    sendNotifications(receivers, notiData.Text, type, id, notiData, config);
+    await sendNotifications(
+      receivers,
+      notiData.Text,
+      type,
+      id,
+      notiData,
+      config
+    );
   }
 };

package/helper/sendEmail.js

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

package/notification/sendNotifications.js

@@ -5,7 +5,7 @@ const getUser = require("../db/users/getUser");
 const getNotificationSetting = require("../db/notifications/getNotificationSetting");
 const { log } = require("../helper");
 
-const SendNotification = (tokens, message, type, key, params, config) => {
+const SendNotification = async (tokens, message, type, key, params, config) => {
   const logId = log("SendNotification", "input", {
     tokens,
     message,
@@ -43,39 +43,37 @@ const SendNotification = (tokens, message, type, key, params, config) => {
       }
       messages.push(msg);
     } else {
-      log(
-        "SendNotification",
-        "IsTokenError",
-        `Push token ${token} is not a valid Expo push token`,
-        logId
-      );
+      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);
-        }
-      });
+    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;
+      }
+    }
   }
 };
 
@@ -104,13 +102,13 @@ const checkMuted = async (userId, config) => {
   return false;
 };
 
-module.exports = (
+module.exports = async (
   receiverKeys,
   message,
   type,
   key,
   value,
-  config = { type: "app", id: null, ignoreMute: false }
+  config = { type: "app", id: null, ignoreMute: false, raiseError: false }
 ) => {
   const logId = log("sendNotifications", "input", {
     receiverKeys,
@@ -142,6 +140,7 @@ module.exports = (
               }
             } catch (error) {
               log("sendNotifications", "error", error.toString());
+              if (config.raiseError) reject(error);
             }
             resolve();
           })
@@ -151,7 +150,6 @@ module.exports = (
       })
     );
   });
-  Promise.all(promises).then((res) => {
-    SendNotification(tokens, message, type, key, value, config);
-  });
+  await Promise.all(promises);
+  await SendNotification(tokens, message, type, key, value, config);
 };

package/package.json

@@ -1,13 +1,13 @@
 {
   "name": "@plusscommunities/pluss-core-aws",
-  "version": "1.4.18-beta.0",
+  "version": "1.4.20",
   "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",