@plusscommunities/pluss-core-aws 2.0.9 → 2.0.10

package/db/notifications/deleteNotificationsByEntity.js

@@ -0,0 +1,29 @@
+const indexQuery = require("../common/indexQuery");
+const deleteRef = require("../common/deleteRef");
+
+module.exports = async (entityId, type = null, site = null) => {
+  const query = {
+    IndexName: "NotificationsIdIndex",
+    KeyConditionExpression: "Id = :entityId",
+    ExpressionAttributeValues: {
+      ":entityId": entityId,
+    },
+  };
+
+  let toDelete = [];
+  const { Items } = await indexQuery("notifications", query);
+  if (type || site) {
+    toDelete = Items.filter(
+      (i) => (!type || i.Type === type) && (!site || i.Site === site)
+    );
+  } else {
+    toDelete = Items;
+  }
+
+  const promises = [];
+  toDelete.forEach((i) => {
+    promises.push(deleteRef("notifications", "RowId", i.RowId));
+  });
+
+  return Promise.all(promises);
+};

package/helper/auth/getApiKeyFromReq.js

@@ -0,0 +1,6 @@
+const getRef = require("../../db/common/getRef");
+
+module.exports = async (event) => {
+  if (!event?.headers?.apikey) return null;
+  return await getRef("accesskeys", "Key", event.headers.apikey);
+};

package/helper/auth/getSessionUserFromReqAuthKey.js

@@ -1,13 +1,13 @@
-const getRef = require("../../db/common/getRef");
 const getSessionUser = require("./getSessionUser");
+const getApiKeyFromReq = require("./getApiKeyFromReq");
 
 module.exports = async (event) => {
   if (!event.headers) {
     return null;
   }
   if (event.headers.apikey) {
-    const key = await getRef("accesskeys", "Key", event.headers.apikey);
-    return key.UserId;
+    const key = await getApiKeyFromReq(event);
+    return key?.UserId;
   }
   if (!event.headers.authkey) {
     return null;

package/helper/auth/validateApiKey.js

@@ -1,12 +1,12 @@
 const _ = require("lodash");
 const { log, generateLogId } = require("../");
-const getRef = require("../../db/common/getRef");
+const getApiKeyFromReq = require("./getApiKeyFromReq");
 
 module.exports = async (req, actionType, site) => {
   const logId = generateLogId();
   try {
     log("ApiKey", "Input", req.headers.apikey, logId);
-    const key = await getRef("accesskeys", "Key", req.headers.apikey);
+    const key = await getApiKeyFromReq(req);
     log("ApiKey", "Key", key, logId);
 
     if (key.UserId) {

package/package.json

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