@plusscommunities/pluss-newsletter-aws-sharing 1.2.14 → 1.3.5

package/common/helper/audience/filterByAudienceType.js

@@ -0,0 +1,3 @@
+const filterByAudienceType = require("@plusscommunities/pluss-core-aws/helper/audience/filterByAudienceType");
+
+module.exports = filterByAudienceType;

package/common/helper/opengraph/getOpenGraph.js

@@ -1,3 +1,30 @@
-const getOpenGraph = require("@plusscommunities/pluss-core-aws/helper/opengraph/getOpenGraph");
+// const getOpenGraph = require("@plusscommunities/pluss-core-aws/helper/opengraph/getOpenGraph");
 
-module.exports = getOpenGraph;
+// module.exports = getOpenGraph;
+
+const axios = require("axios");
+
+module.exports = async (url) => {
+  return new Promise(async (resolve, reject) => {
+    const request = {
+      method: "GET",
+      url: "https://opengraph-io.p.rapidapi.com/api/1.1/sites",
+      params: {
+        url,
+        accept_lang: "en-US,en;q=0.9",
+        max_cache_age: "432000000",
+      },
+      headers: {
+        "x-rapidapi-host": "opengraph-io.p.rapidapi.com",
+        "x-rapidapi-key": "3941bc0a39msh60f09652e936b3dp1afe26jsn4163bac965cc",
+      },
+    };
+
+    try {
+      const response = await axios(request);
+      return resolve(response.data);
+    } catch (e) {
+      return reject(e);
+    }
+  });
+};

package/feature.config.coaching.js

@@ -19,6 +19,7 @@ const values = {
   notificationRejectNewsSubmission: "RejectNewsSubmissionCoaching",
   notificationNewsletterPublished: "NewsletterPublishedCoaching",
   routeEntityPath: "/newsCoaching/article/:id",
+  screenNewsletterPost: "newsletterPostCoaching",
   textNewNewsletterSubmission: "New Coaching Submission",
   textHasSubmittedANewNewsletterPost:
     "has submitted a new coaching for review.",
@@ -35,7 +36,8 @@ exports.entity = {
   permission: values.permissionNewsletter,
   table: values.tableNameNewsletterEntries,
   id: "RowId",
-  path: values.routeEntityPath,
+  webPath: values.routeEntityPath,
+  appPath: values.screenNewsletterPost,
 };
 
 exports.serverless = {

package/feature.config.curatedposts.js

@@ -19,6 +19,7 @@ const values = {
   notificationRejectNewsSubmission: "RejectNewsSubmissionCuratedPosts",
   notificationNewsletterPublished: "NewsletterPublishedCuratedPosts",
   routeEntityPath: "/newsCuratedPosts/article/:id",
+  screenNewsletterPost: "newsletterPostCuratedPosts",
   textNewNewsletterSubmission: "New Curated Post Submission",
   textHasSubmittedANewNewsletterPost:
     "has submitted a new curated post for review.",
@@ -35,7 +36,8 @@ exports.entity = {
   permission: values.permissionNewsletter,
   table: values.tableNameNewsletterEntries,
   id: "RowId",
-  path: values.routeEntityPath,
+  webPath: values.routeEntityPath,
+  appPath: values.screenNewsletterPost,
 };
 
 exports.serverless = {

package/feature.config.default.js

@@ -19,6 +19,7 @@ const values = {
   notificationRejectNewsSubmission: "RejectNewsSubmission",
   notificationNewsletterPublished: "NewsletterPublished",
   routeEntityPath: "/news/article/:id",
+  screenNewsletterPost: "newsletterPost",
   textNewNewsletterSubmission: "New Newsletter Submission",
   textHasSubmittedANewNewsletterPost:
     "has submitted a new newsletter post for review.",
@@ -35,7 +36,8 @@ exports.entity = {
   permission: values.permissionNewsletter,
   table: values.tableNameNewsletterEntries,
   id: "RowId",
-  path: values.routeEntityPath,
+  webPath: values.routeEntityPath,
+  appPath: values.screenNewsletterPost,
 };
 
 exports.serverless = {

package/feature.config.headoffice.js

@@ -19,6 +19,7 @@ const values = {
   notificationRejectNewsSubmission: "RejectNewsSubmissionHeadOffice",
   notificationNewsletterPublished: "NewsletterPublishedHeadOffice",
   routeEntityPath: "/newsHeadOffice/article/:id",
+  screenNewsletterPost: "newsletterPostHeadOffice",
   textNewNewsletterSubmission: "New Head Office News Submission",
   textHasSubmittedANewNewsletterPost:
     "has submitted a new head office post for review.",
@@ -35,7 +36,8 @@ exports.entity = {
   permission: values.permissionNewsletter,
   table: values.tableNameNewsletterEntries,
   id: "RowId",
-  path: values.routeEntityPath,
+  webPath: values.routeEntityPath,
+  appPath: values.screenNewsletterPost,
 };
 
 exports.serverless = {

package/feature.config.js

@@ -19,6 +19,7 @@ const values = {
   notificationRejectNewsSubmission: "RejectNewsSubmissionSharing",
   notificationNewsletterPublished: "NewsletterPublishedSharing",
   routeEntityPath: "/newsSharing/article/:id",
+  screenNewsletterPost: "newsletterPostSharing",
   textNewNewsletterSubmission: "New Sharing Submission",
   textHasSubmittedANewNewsletterPost:
     "has submitted a new sharing post for review.",
@@ -35,7 +36,8 @@ exports.entity = {
   permission: values.permissionNewsletter,
   table: values.tableNameNewsletterEntries,
   id: "RowId",
-  path: values.routeEntityPath,
+  webPath: values.routeEntityPath,
+  appPath: values.screenNewsletterPost,
 };
 
 exports.serverless = {

package/feature.config.menu.js

@@ -19,6 +19,7 @@ const values = {
   notificationRejectNewsSubmission: "RejectNewsSubmissionMenu",
   notificationNewsletterPublished: "NewsletterPublishedMenu",
   routeEntityPath: "/newsMenu/article/:id",
+  screenNewsletterPost: "newsletterPostMenu",
   textNewNewsletterSubmission: "New Menu Submission",
   textHasSubmittedANewNewsletterPost: "has submitted a new menu for review.",
 };
@@ -34,7 +35,8 @@ exports.entity = {
   permission: values.permissionNewsletter,
   table: values.tableNameNewsletterEntries,
   id: "RowId",
-  path: values.routeEntityPath,
+  webPath: values.routeEntityPath,
+  appPath: values.screenNewsletterPost,
 };
 
 exports.serverless = {

package/feature.config.noticeboard.js

@@ -19,6 +19,7 @@ const values = {
   notificationRejectNewsSubmission: "RejectNewsSubmissionNoticeBoard",
   notificationNewsletterPublished: "NewsletterPublishedNoticeBoard",
   routeEntityPath: "/newsNoticeBoard/article/:id",
+  screenNewsletterPost: "newsletterPostNoticeBoard",
   textNewNewsletterSubmission: "New Notice Board Submission",
   textHasSubmittedANewNewsletterPost:
     "has submitted a new notice board post for review.",
@@ -35,7 +36,8 @@ exports.entity = {
   permission: values.permissionNewsletter,
   table: values.tableNameNewsletterEntries,
   id: "RowId",
-  path: values.routeEntityPath,
+  webPath: values.routeEntityPath,
+  appPath: values.screenNewsletterPost,
 };
 
 exports.serverless = {

package/{feature.config.personaldevelopmenthub.js → feature.config.personaldev.js}

@@ -1,26 +1,25 @@
 const values = {
-  entityKey: "newsPersonalDevelopmentHub",
-  serviceKey: "newsletterPersonalDevelopmentHub",
-  updateKey: "newsPersonalDevelopmentHub",
-  tableKeyNewsletterEntries: "NewsletterEntriesPersonalDevelopmentHub",
-  tableKeyNewsletterSubmissions: "NewsletterSubmissionsPersonalDevelopmentHub",
-  tableKeyNewsletterUserEntries: "NewsletterUserEntriesPersonalDevelopmentHub",
-  tableNameNewsletterEntries: "newsletterentriesPersonalDevelopmentHub",
-  tableNameNewsletterSubmissions: "newslettersubmissionsPersonalDevelopmentHub",
-  tableNameNewsletterUserEntries: "newsletteruserentriesPersonalDevelopmentHub",
-  stringPostfixSubmissionEmail: "newssubmissionemailPersonalDevelopmentHub",
-  permissionNewsletter: "newsletterPersonalDevelopmentHub",
-  permissionNewsletterSubmit: "newsletterSubmitPersonalDevelopmentHub",
-  activityAddNewsSubmission: "AddNewsSubmissionPersonalDevelopmentHub",
-  activityAddNews: "AddNewsPersonalDevelopmentHub",
-  activityDeleteNews: "DeleteNewsPersonalDevelopmentHub",
-  activityEditNews: "EditNewsPersonalDevelopmentHub",
-  notificationApproveNewsSubmission:
-    "ApproveNewsSubmissionPersonalDevelopmentHub",
-  notificationRejectNewsSubmission:
-    "RejectNewsSubmissionPersonalDevelopmentHub",
-  notificationNewsletterPublished: "NewsletterPublishedPersonalDevelopmentHub",
-  routeEntityPath: "/newsPersonalDevelopmentHub/article/:id",
+  entityKey: "newsPersonalDev",
+  serviceKey: "newsletterPersonalDev",
+  updateKey: "newsPersonalDev",
+  tableKeyNewsletterEntries: "NewsletterEntriesPersonalDev",
+  tableKeyNewsletterSubmissions: "NewsletterSubmissionsPersonalDev",
+  tableKeyNewsletterUserEntries: "NewsletterUserEntriesPersonalDev",
+  tableNameNewsletterEntries: "newsletterentriesPersonalDev",
+  tableNameNewsletterSubmissions: "newslettersubmissionsPersonalDev",
+  tableNameNewsletterUserEntries: "newsletteruserentriesPersonalDev",
+  stringPostfixSubmissionEmail: "newssubmissionemailPersonalDev",
+  permissionNewsletter: "newsletterPersonalDev",
+  permissionNewsletterSubmit: "newsletterSubmitPersonalDev",
+  activityAddNewsSubmission: "AddNewsSubmissionPersonalDev",
+  activityAddNews: "AddNewsPersonalDev",
+  activityDeleteNews: "DeleteNewsPersonalDev",
+  activityEditNews: "EditNewsPersonalDev",
+  notificationApproveNewsSubmission: "ApproveNewsSubmissionPersonalDev",
+  notificationRejectNewsSubmission: "RejectNewsSubmissionPersonalDev",
+  notificationNewsletterPublished: "NewsletterPublishedPersonalDev",
+  routeEntityPath: "/newsPersonalDev/article/:id",
+  screenNewsletterPost: "newsletterPostPersonalDev",
   textNewNewsletterSubmission: "Personal Development Submission",
   textHasSubmittedANewNewsletterPost:
     "has submitted a new personal development post for review.",
@@ -37,7 +36,8 @@ exports.entity = {
   permission: values.permissionNewsletter,
   table: values.tableNameNewsletterEntries,
   id: "RowId",
-  path: values.routeEntityPath,
+  webPath: values.routeEntityPath,
+  appPath: values.screenNewsletterPost,
 };
 
 exports.serverless = {

package/feature.config.sales.js

@@ -19,6 +19,7 @@ const values = {
   notificationRejectNewsSubmission: "RejectNewsSubmissionSales",
   notificationNewsletterPublished: "NewsletterPublishedSales",
   routeEntityPath: "/newsSales/article/:id",
+  screenNewsletterPost: "newsletterPostSales",
   textNewNewsletterSubmission: "Sale Submission",
   textHasSubmittedANewNewsletterPost: "has submitted a new sale for review.",
 };
@@ -34,7 +35,8 @@ exports.entity = {
   permission: values.permissionNewsletter,
   table: values.tableNameNewsletterEntries,
   id: "RowId",
-  path: values.routeEntityPath,
+  webPath: values.routeEntityPath,
+  appPath: values.screenNewsletterPost,
 };
 
 exports.serverless = {

package/feature.config.sharing.js

@@ -19,6 +19,7 @@ const values = {
   notificationRejectNewsSubmission: "RejectNewsSubmissionSharing",
   notificationNewsletterPublished: "NewsletterPublishedSharing",
   routeEntityPath: "/newsSharing/article/:id",
+  screenNewsletterPost: "newsletterPostSharing",
   textNewNewsletterSubmission: "New Sharing Submission",
   textHasSubmittedANewNewsletterPost:
     "has submitted a new sharing post for review.",
@@ -35,7 +36,8 @@ exports.entity = {
   permission: values.permissionNewsletter,
   table: values.tableNameNewsletterEntries,
   id: "RowId",
-  path: values.routeEntityPath,
+  webPath: values.routeEntityPath,
+  appPath: values.screenNewsletterPost,
 };
 
 exports.serverless = {

package/feature.config.training.js

@@ -19,6 +19,7 @@ const values = {
   notificationRejectNewsSubmission: "RejectNewsSubmissionTraining",
   notificationNewsletterPublished: "NewsletterPublishedTraining",
   routeEntityPath: "/newsTraining/article/:id",
+  screenNewsletterPost: "newsletterPostTraining",
   textNewNewsletterSubmission: "Training Submission",
   textHasSubmittedANewNewsletterPost:
     "has submitted a new training for review.",
@@ -35,7 +36,8 @@ exports.entity = {
   permission: values.permissionNewsletter,
   table: values.tableNameNewsletterEntries,
   id: "RowId",
-  path: values.routeEntityPath,
+  webPath: values.routeEntityPath,
+  appPath: values.screenNewsletterPost,
 };
 
 exports.serverless = {

package/getFeaturedNewsletterEntries.js

@@ -5,9 +5,9 @@ const generateJsonResponse = require("./common/helper/generateJsonResponse");
 const { thisOrDefault } = require("./common/helper");
 const indexQuery = require("./common/db/common/indexQuery");
 const validateUserLoggedIn = require("./common/helper/auth/validateUserLoggedIn");
+const validateMasterAuth = require("./common/helper/auth/validateMasterAuth");
 const checkUpdateSource = require("./helper/checkUpdateSource");
-const getMatchingAudienceTypes = require("./common/helper/audience/getMatchingAudienceTypes");
-const filterOnAudienceType = require("./common/helper/audience/filterOnAudienceType");
+const filterByAudienceType = require("./common/helper/audience/filterByAudienceType");
 const { values } = require("./feature.config");
 
 module.exports.getFeaturedNewsletterEntries = (event, context, callback) => {
@@ -23,67 +23,64 @@ module.exports.getFeaturedNewsletterEntries = (event, context, callback) => {
   );
 
   validateUserLoggedIn(event)
-    .then((authorised) => {
+    .then(async (authorised) => {
       if (!authorised) {
         return callback(
           null,
           generateJsonResponse(422, { fail: true, error: "not authorised" })
         );
       }
-      getMatchingAudienceTypes(event.headers.authkey)
-        .then((types) => {
-          const query = {
-            IndexName: "NewsletterEntriesSiteFeaturedExpiryIndex",
-            KeyConditionExpression: "Site = :site and FeaturedExpiry > :time",
-            FilterExpression: "IsFeatured = :featured",
-            ExpressionAttributeValues: {
-              ":site": site,
-              ":time": time,
-              ":featured": true,
-            },
-          };
-          const hqQuery = _.cloneDeep(query);
-          hqQuery.ExpressionAttributeValues[":site"] = "hq";
-          console.log(`running query - ${JSON.stringify(query)}`);
 
-          const promises = [];
-          promises.push(indexQuery(values.tableNameNewsletterEntries, query));
-          if (!params.noHQ) {
-            promises.push(
-              indexQuery(values.tableNameNewsletterEntries, hqQuery)
+      const canManage = await validateMasterAuth(event, "newsletter", site);
+
+      const query = {
+        IndexName: "NewsletterEntriesSiteFeaturedExpiryIndex",
+        KeyConditionExpression: "Site = :site and FeaturedExpiry > :time",
+        FilterExpression: "IsFeatured = :featured",
+        ExpressionAttributeValues: {
+          ":site": site,
+          ":time": time,
+          ":featured": true,
+        },
+      };
+      const hqQuery = _.cloneDeep(query);
+      hqQuery.ExpressionAttributeValues[":site"] = "hq";
+      console.log(`running query - ${JSON.stringify(query)}`);
+
+      const promises = [];
+      promises.push(indexQuery(values.tableNameNewsletterEntries, query));
+      if (!params.noHQ) {
+        promises.push(indexQuery(values.tableNameNewsletterEntries, hqQuery));
+      }
+      Promise.all(promises)
+        .then(async (responses) => {
+          console.log("successful query");
+          const result = [];
+          responses.forEach((data) => {
+            result.push.apply(result, data.Items);
+          });
+          let filteredResult = _.filter(result, (entry) => {
+            return (
+              !entry.Private && entry.UnixTimestamp < time && !entry.Deleted
+            );
+          });
+          if (!canManage) {
+            filteredResult = await filterByAudienceType(
+              filteredResult,
+              event.headers.authkey,
+              site
             );
           }
-          Promise.all(promises)
-            .then((responses) => {
-              console.log("successful query");
-              const result = [];
-              responses.forEach((data) => {
-                result.push.apply(result, data.Items);
-              });
-              const filteredResult = filterOnAudienceType(
-                _.filter(result, (entry) => {
-                  return (
-                    !entry.Private &&
-                    entry.UnixTimestamp < time &&
-                    !entry.Deleted
-                  );
-                }),
-                types
-              );
-              const randomResults = _.shuffle(filteredResult).slice(0, count);
+          const randomResults = _.shuffle(filteredResult).slice(0, count);
 
-              checkUpdateSource(randomResults);
+          checkUpdateSource(randomResults);
 
-              callback(null, generateJsonResponse(200, randomResults));
-            })
-            .catch((error) => {
-              console.log("query failed");
-              console.log(error);
-              callback(null, generateJsonResponse(422, { error }));
-            });
+          callback(null, generateJsonResponse(200, randomResults));
         })
         .catch((error) => {
-          callback(null, generateJsonResponse(422, { fail: true, error }));
+          console.log("query failed");
+          console.log(error);
+          callback(null, generateJsonResponse(422, { error }));
         });
     })
     .catch((error) => {

package/getNewsletterEntries.js

@@ -4,9 +4,9 @@ const initConfig = require("./initConfig");
 const generateJsonResponse = require("./common/helper/generateJsonResponse");
 const { thisOrDefault } = require("./common/helper");
 const validateSiteAccess = require("./common/helper/auth/validateSiteAccess");
+const validateMasterAuth = require("./common/helper/auth/validateMasterAuth");
 const checkUpdateSource = require("./helper/checkUpdateSource");
-const getMatchingAudienceTypes = require("./common/helper/audience/getMatchingAudienceTypes");
-const filterOnAudienceType = require("./common/helper/audience/filterOnAudienceType");
+const filterByAudienceType = require("./common/helper/audience/filterByAudienceType");
 const indexQueryRecursive = require("./common/db/common/indexQueryRecursive");
 const { values } = require("./feature.config");
 
@@ -38,82 +38,79 @@ module.exports.getNewsletterEntries = (event, context, callback) => {
   console.log(`maxTime: ${maxTime}`);
 
   validateSiteAccess(event, site)
-    .then((authorised) => {
+    .then(async (authorised) => {
       if (!authorised) {
         return callback(
           null,
           generateJsonResponse(422, { fail: true, error: "not authorised" })
         );
       }
-      getMatchingAudienceTypes(event.headers.authkey)
-        .then((types) => {
-          const query = {
-            IndexName: "NewsletterEntriesSiteTimestampIndex",
-            KeyConditionExpression:
-              "Site = :site and UnixTimestampReverse BETWEEN :minTime and :maxTime",
-            ExpressionAttributeValues: {
-              ":site": site,
-              ":minTime": minTime,
-              ":maxTime": maxTime,
-            },
-          };
-          const hqQuery = _.cloneDeep(query);
-          hqQuery.ExpressionAttributeValues[":site"] = "hq";
-          console.log("running query");
-          console.log(query);
-          const promises = [];
-          promises.push(
-            indexQueryRecursive(values.tableNameNewsletterEntries, query)
-          );
-          if (!params.noHQ) {
-            promises.push(
-              indexQueryRecursive(values.tableNameNewsletterEntries, hqQuery)
+
+      const canManage = await validateMasterAuth(event, "newsletter", site);
+
+      const query = {
+        IndexName: "NewsletterEntriesSiteTimestampIndex",
+        KeyConditionExpression:
+          "Site = :site and UnixTimestampReverse BETWEEN :minTime and :maxTime",
+        ExpressionAttributeValues: {
+          ":site": site,
+          ":minTime": minTime,
+          ":maxTime": maxTime,
+        },
+      };
+      const hqQuery = _.cloneDeep(query);
+      hqQuery.ExpressionAttributeValues[":site"] = "hq";
+      console.log("running query");
+      console.log(query);
+      const promises = [];
+      promises.push(
+        indexQueryRecursive(values.tableNameNewsletterEntries, query)
+      );
+      if (!params.noHQ) {
+        promises.push(
+          indexQueryRecursive(values.tableNameNewsletterEntries, hqQuery)
+        );
+      }
+      Promise.all(promises)
+        .then(async (responses) => {
+          console.log("successful query");
+          const result = [];
+          responses.forEach((data) => {
+            result.push.apply(result, data);
+          });
+          let filteredResult = params.noFilter
+            ? result
+            : _.filter(result, (entry) => !entry.Private);
+          if (!params.noFilter && !canManage) {
+            filteredResult = await filterByAudienceType(
+              filteredResult,
+              event.headers.authkey,
+              site
             );
           }
-          Promise.all(promises)
-            .then((responses) => {
-              console.log("successful query");
-              const result = [];
-              responses.forEach((data) => {
-                result.push.apply(result, data);
-              });
-              const filteredResult = params.noFilter
-                ? result
-                : filterOnAudienceType(
-                    _.filter(result, (entry) => {
-                      return !entry.Private;
-                    }),
-                    types
-                  );
-              const sortedResult = _.sortBy(
-                filteredResult,
-                "UnixTimestampReverse"
-              );
 
-              checkUpdateSource(sortedResult);
+          const sortedResult = _.sortBy(filteredResult, "UnixTimestampReverse");
 
-              if (count) {
-                return callback(
-                  null,
-                  generateJsonResponse(200, {
-                    items: sortedResult.slice(skip, skip + count),
-                    skip,
-                    count,
-                    totalCount: sortedResult.length,
-                  })
-                );
-              }
+          checkUpdateSource(sortedResult);
+
+          if (count) {
+            return callback(
+              null,
+              generateJsonResponse(200, {
+                items: sortedResult.slice(skip, skip + count),
+                skip,
+                count,
+                totalCount: sortedResult.length,
+              })
+            );
+          }
 
-              callback(null, generateJsonResponse(200, sortedResult));
-            })
-            .catch((error) => {
-              console.log("query failed");
-              console.log(error);
-              callback(null, generateJsonResponse(422, { error }));
-            });
+          callback(null, generateJsonResponse(200, sortedResult));
         })
         .catch((error) => {
-          callback(null, generateJsonResponse(422, { fail: true, error }));
+          console.log("query failed");
+          console.log(error);
+          callback(null, generateJsonResponse(422, { error }));
         });
     })
     .catch((error) => {

package/getRecentNewsletterEntries.js

@@ -5,9 +5,9 @@ const generateJsonResponse = require("./common/helper/generateJsonResponse");
 const { thisOrDefault } = require("./common/helper");
 const indexQuery = require("./common/db/common/indexQuery");
 const validateSiteAccess = require("./common/helper/auth/validateSiteAccess");
+const validateMasterAuth = require("./common/helper/auth/validateMasterAuth");
 const checkUpdateSource = require("./helper/checkUpdateSource");
-const getMatchingAudienceTypes = require("./common/helper/audience/getMatchingAudienceTypes");
-const filterOnAudienceType = require("./common/helper/audience/filterOnAudienceType");
+const filterByAudienceType = require("./common/helper/audience/filterByAudienceType");
 const { values } = require("./feature.config");
 
 module.exports.getRecentNewsletterEntries = (event, context, callback) => {
@@ -36,66 +36,65 @@ module.exports.getRecentNewsletterEntries = (event, context, callback) => {
   }
 
   validateSiteAccess(event, site)
-    .then((authorised) => {
+    .then(async (authorised) => {
       if (!authorised) {
         return callback(
           null,
           generateJsonResponse(422, { fail: true, error: "not authorised" })
         );
       }
-      getMatchingAudienceTypes(event.headers.authkey)
-        .then((types) => {
-          const query = {
-            IndexName: "NewsletterEntriesSiteTimestampIndex",
-            KeyConditionExpression:
-              "Site = :site and UnixTimestampReverse > :maxTime",
-            ExpressionAttributeValues: {
-              ":site": site,
-              ":maxTime": maxTime,
-            },
-            Limit: limit,
-          };
-          const hqQuery = _.cloneDeep(query);
-          hqQuery.ExpressionAttributeValues[":site"] = "hq";
-          console.log("running query");
-          console.log(query);
-          const promises = [];
-          promises.push(indexQuery(values.tableNameNewsletterEntries, query));
-          if (!params.noHQ) {
-            promises.push(
-              indexQuery(values.tableNameNewsletterEntries, hqQuery)
+
+      const canManage = await validateMasterAuth(event, "newsletter", site);
+
+      const query = {
+        IndexName: "NewsletterEntriesSiteTimestampIndex",
+        KeyConditionExpression:
+          "Site = :site and UnixTimestampReverse > :maxTime",
+        ExpressionAttributeValues: {
+          ":site": site,
+          ":maxTime": maxTime,
+        },
+        Limit: limit,
+      };
+      const hqQuery = _.cloneDeep(query);
+      hqQuery.ExpressionAttributeValues[":site"] = "hq";
+      console.log("running query");
+      console.log(query);
+      const promises = [];
+      promises.push(indexQuery(values.tableNameNewsletterEntries, query));
+      if (!params.noHQ) {
+        promises.push(indexQuery(values.tableNameNewsletterEntries, hqQuery));
+      }
+      Promise.all(promises)
+        .then(async (responses) => {
+          console.log("successful query");
+          const result = [];
+          responses.forEach((data) => {
+            result.push.apply(result, data.Items);
+          });
+          let filteredResult = _.filter(result, (entry) => {
+            return !entry.Private && (!tvMode || entry.TVMode);
+          });
+          if (!canManage) {
+            filteredResult = await filterByAudienceType(
+              filteredResult,
+              event.headers.authkey,
+              site
             );
           }
-          Promise.all(promises)
-            .then((responses) => {
-              console.log("successful query");
-              const result = [];
-              responses.forEach((data) => {
-                result.push.apply(result, data.Items);
-              });
-              const filteredResult = filterOnAudienceType(
-                _.filter(result, (entry) => {
-                  return !entry.Private && (!tvMode || entry.TVMode);
-                }),
-                types
-              );
-              const sortedResult = _.take(
-                _.sortBy(filteredResult, "UnixTimestampReverse"),
-                limit
-              );
+          const sortedResult = _.take(
+            _.sortBy(filteredResult, "UnixTimestampReverse"),
+            limit
+          );
 
-              checkUpdateSource(sortedResult);
+          checkUpdateSource(sortedResult);
 
-              callback(null, generateJsonResponse(200, sortedResult));
-            })
-            .catch((error) => {
-              console.log("query failed");
-              console.log(error);
-              callback(null, generateJsonResponse(200, { error }));
-            });
+          callback(null, generateJsonResponse(200, sortedResult));
         })
         .catch((error) => {
-          callback(null, generateJsonResponse(422, { fail: true, error }));
+          console.log("query failed");
+          console.log(error);
+          callback(null, generateJsonResponse(200, { error }));
         });
     })
     .catch((error) => {

package/package-lock.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-newsletter-aws",
-  "version": "1.2.14",
+  "version": "1.3.5",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
@@ -13,9 +13,9 @@
       }
     },
     "@plusscommunities/pluss-core-aws": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-1.1.8.tgz",
-      "integrity": "sha512-4jRyH5RBtrA+QfodL4FY6xBw82NhGEz/MorOOwFu2DyroCvikRRh2a6rEvCohr+2Mi/LfwS8F4dQczaepeu9Qg==",
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/@plusscommunities/pluss-core-aws/-/pluss-core-aws-1.2.6.tgz",
+      "integrity": "sha512-GCBa9UaJCdQ3qyDL8KwgT8f4DwG7voomKdBYUs5DpyDspQvuKt+vrlsJ2d2xrzGLNlrKxw6aL9wcWjCM+nrbBA==",
       "requires": {
         "@aws/dynamodb-auto-marshaller": "^0.7.1",
         "amazon-cognito-identity-js": "^2.0.19",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@plusscommunities/pluss-newsletter-aws-sharing",
-  "version": "1.2.14",
+  "version": "1.3.5",
   "description": "Extension package to enable newsletter on Pluss Communities Platform",
   "scripts": {
     "gc": "node ../../tools/gc ./",
@@ -22,7 +22,7 @@
   "license": "ISC",
   "dependencies": {
     "@aws/dynamodb-auto-marshaller": "^0.7.1",
-    "@plusscommunities/pluss-core-aws": "^1.1.8",
+    "@plusscommunities/pluss-core-aws": "^1.2.6",
     "amazon-cognito-identity-js": "^2.0.19",
     "axios": "^0.18.0",
     "expo-server-sdk": "^3.0.1",