@plusscommunities/pluss-core-aws 1.6.11 → 1.6.13

package/helper/auth/getSessionUserFromReqAuthKey.js

@@ -1,5 +1,16 @@
+const getRef = require("../../db/common/getRef");
 const getSessionUser = require("./getSessionUser");
 
 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;
+  }
+  if (!event.headers.authkey) {
+    return null;
+  }
   return getSessionUser(event.headers.authkey);
 };

package/helper/auth/validateApiKey.js

@@ -0,0 +1,43 @@
+const _ = require("lodash");
+const { log, generateLogId } = require("../");
+const getRef = require("../../db/common/getRef");
+
+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);
+    log("ApiKey", "Key", key, logId);
+
+    if (key.UserId) {
+      const validateMasterAuth = require("./validateMasterAuth");
+      return await validateMasterAuth(undefined, actionType, site, undefined, {
+        userId: key.UserId,
+      });
+    }
+
+    const validSite = key.Site === site;
+    const isHQKey = key.Site === "hq";
+    log("ApiKey", "validSite", validSite, logId);
+    log("ApiKey", "isHQKey", isHQKey, logId);
+
+    if (!validSite && !isHQKey) {
+      log("ApiKey", "Result", false, logId);
+      return false;
+    }
+
+    const isAny = actionType === "any";
+    const isMaster = _.includes(key.Permissions, "master");
+    const hasPermission = _.includes(key.Permissions, actionType);
+    const result = isAny || isMaster || hasPermission;
+
+    log("ApiKey", "isAny", isAny, logId);
+    log("ApiKey", "isMaster", isMaster, logId);
+    log("ApiKey", "hasPermission", hasPermission, logId);
+    log("ApiKey", "Result", result, logId);
+    return result;
+  } catch (e) {
+    log("ApiKey", "Error", e, logId);
+    return false;
+  }
+};

package/helper/auth/validateMasterAuth.js

@@ -6,7 +6,8 @@ const {
 } = require("./validKioskActions");
 const getUserAuth = require("../../db/auth/getUserAuth");
 const getSiteUserTypes = require("../../db/auth/getSiteUserTypes");
-const { log, getBody } = require("../");
+const { log, generateLogId } = require("../");
+const validateApiKey = require("./validateApiKey");
 
 const checkSite = (roles, site, actionType) => {
   return new Promise((resolve) => {
@@ -67,84 +68,136 @@ const checkSite = (roles, site, actionType) => {
   });
 };
 
-module.exports = async (req, actionType, site, plussStaffOnly, options) => {
+const checkApiKey = async (
+  req,
+  actionType,
+  site,
+  plussStaffOnly,
+  options,
+  logId
+) => {
   return new Promise((resolve) => {
-    const data = getBody(req);
-
-    if (actionType == null || _.isUndefined(actionType)) {
-      log("validateMasterAuth", "Error:noActionType");
-      return resolve(false);
+    if (plussStaffOnly) {
+      return resolve(validateApiKey(req, actionType, "plussSpace"));
     }
-    if (!site) {
-      if (!data.site) {
-        log("validateMasterAuth", "Error:noSite", data);
+    const promises = [];
+    site.forEach((s) => {
+      promises.push(validateApiKey(req, actionType, s));
+    });
+
+    Promise.all(promises).then((results) => {
+      log("validateMasterAuth", "ValidationResults", results, logId);
+      if (options && options.resolveAllSites) {
+        log("validateMasterAuth", "resolveAllSites", true, logId);
+        // check all sites individually
+        const authResult = site.map((s, i) => {
+          return { site: s, valid: results[i] };
+        });
+        log("validateMasterAuth", "AuthorisedAllSites", authResult, logId);
+        return resolve(authResult);
+      }
+
+      // check if any site is valid
+      const authorised = _.includes(results, true);
+      log("validateMasterAuth", "Authorised", authorised, logId);
+      return resolve(authorised);
+    });
+  });
+};
+
+module.exports = async (req, actionType, site, plussStaffOnly, options) => {
+  return new Promise(async (resolve) => {
+    const logId = generateLogId();
+    let uid = null;
+    let data = {};
+    if (!req) {
+      uid = options.userId; // allow for not using the request header
+    } else {
+      const data = JSON.parse(req.body);
+      if (!site) {
+        if (!data.site) {
+          log("validateMasterAuth", "Error:noSite", data, logId);
+          return resolve(false);
+        }
+        site = data.site;
+      }
+      if (req.headers.apikey) {
+        log("validateMasterAuth", "checkApiKey", req.headers.apikey, logId);
+        return resolve(
+          checkApiKey(
+            req,
+            actionType,
+            Array.isArray(site) ? site : [site],
+            plussStaffOnly,
+            options,
+            logId
+          )
+        );
+      }
+      if (!req.headers.authkey) {
+        log("validateMasterAuth", "Error:noAuthKey", req.headers, logId);
         return resolve(false);
       }
-      site = data.site;
+
+      uid = await getSessionUser(req.headers.authkey);
+    }
+
+    if (actionType == null || _.isUndefined(actionType)) {
+      log("validateMasterAuth", "Error:noActionType", null, logId);
+      return resolve(false);
     }
     if (!Array.isArray(site)) {
       // support array of sites
       site = [site];
     }
-    if (!req.headers.authkey) {
-      log("validateMasterAuth", "Error:noAuthKey", req.headers);
-      return resolve(false);
-    }
 
-    getSessionUser(req.headers.authkey)
-      .then((uid) => {
-        log("validateMasterAuth", "SessionUser", uid);
-        getUserAuth(uid)
-          .then((roles) => {
-            // If user a master level admin
-            if (
-              _.some(roles, (r) => {
-                return r.type === "master";
-              })
-            ) {
-              if (
-                plussStaffOnly &&
-                !_.some(roles, (r) => {
-                  return r.site === "plussSpace" && r.type === "master";
-                })
-              ) {
-                return resolve(false);
-              }
-              if (options && options.resolveAllSites) {
-                return resolve(
-                  site.map((s, i) => {
-                    return { site: s, valid: true };
-                  })
-                );
-              }
-              return resolve(true);
-            }
-
-            // allow for multiple sites to be checked
-            const promises = [];
-            site.forEach((s) => {
-              promises.push(checkSite(roles, s, actionType));
-            });
-            Promise.all(promises).then((results) => {
-              const authorised = _.includes(results, true);
-              if (options && options.resolveAllSites) {
-                return resolve(
-                  site.map((s, i) => {
-                    return { site: s, valid: results[i] };
-                  })
-                );
-              }
-              log("validateMasterAuth", "Authorised", authorised);
-              return resolve(authorised);
-            });
+    log("validateMasterAuth", "SessionUser", uid);
+    getUserAuth(uid)
+      .then((roles) => {
+        // If user a master level admin
+        if (
+          _.some(roles, (r) => {
+            return r.type === "master";
           })
-          .catch((error2) => {
-            log("validateMasterAuth", "Error:getUserAuth", error2);
+        ) {
+          if (
+            plussStaffOnly &&
+            !_.some(roles, (r) => {
+              return r.site === "plussSpace" && r.type === "master";
+            })
+          ) {
             return resolve(false);
-          });
+          }
+          if (options && options.resolveAllSites) {
+            return resolve(
+              site.map((s, i) => {
+                return { site: s, valid: true };
+              })
+            );
+          }
+          return resolve(true);
+        }
+
+        // allow for multiple sites to be checked
+        const promises = [];
+        site.forEach((s) => {
+          promises.push(checkSite(roles, s, actionType));
+        });
+        Promise.all(promises).then((results) => {
+          const authorised = _.includes(results, true);
+          if (options && options.resolveAllSites) {
+            return resolve(
+              site.map((s, i) => {
+                return { site: s, valid: results[i] };
+              })
+            );
+          }
+          log("validateMasterAuth", "Authorised", authorised);
+          return resolve(authorised);
+        });
       })
-      .catch((sessionError) => {
-        log("validateMasterAuth", "Error:getSessionUser", sessionError);
+      .catch((error2) => {
+        log("validateMasterAuth", "Error:getUserAuth", error2);
         return resolve(false);
       });
   });

package/helper/auth/validateSiteAccess.js

@@ -1,10 +1,14 @@
 const validateMasterAuth = require("./validateMasterAuth");
+const validateApiKey = require("./validateApiKey");
 
 module.exports = async (req, site) => {
   return new Promise(async (resolve) => {
     if (!site) {
       return resolve(false);
     }
+    if (req.headers.apikey) {
+      return resolve(validateApiKey(req, "any", site));
+    }
     if (!req.headers.authkey) {
       return resolve(false);
     }

package/helper/auth/validateUserLoggedIn.js

@@ -1,13 +1,13 @@
-const getSessionUser = require("./getSessionUser");
+const getSessionUserFromReqAuthKey = require("./getSessionUserFromReqAuthKey");
 
 module.exports = async (req, userId) => {
   return new Promise((resolve) => {
-    if (!req.headers.authkey) {
+    if (!req.headers.authkey && !req.headers.apikey) {
       resolve(false);
       return;
     }
 
-    getSessionUser(req.headers.authkey)
+    getSessionUserFromReqAuthKey(req)
       .then((uid) => {
         if (userId && uid !== userId) {
           resolve(false);

package/helper/sendEmail.js

@@ -49,7 +49,7 @@ 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="${communityConfig.emailBrandingAbovePoweredBy.height}" width="${communityConfig.emailBrandingAbovePoweredBy.width}" src="${communityConfig.emailBrandingAbovePoweredBy.image}" style="float: left; height: ${communityConfig.emailBrandingAbovePoweredBy.height}px; width: ${communityConfig.emailBrandingAbovePoweredBy.width}px; background-repeat: no-repeat; background-size: contain;"></img>
+                                <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>
                         `
@@ -60,7 +60,7 @@ module.exports = async (
                             <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="29" width="71" src="https://pluss-prd-uploads.s3.ap-southeast-2.amazonaws.com/uploads/users/ap-southeast-2:80aecdcb-9955-493e-a341-2f2263f64777/public/04ee254a473dab894f9a15c418/plusslogo.png" style="display: inline-block; height: 29px; width: 71px; background-repeat: no-repeat; background-size:contain;"></img>
+                            <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>`;

package/package.json

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