expressa 2.0.14 → 2.0.15

package/middleware/permissions.js

@@ -2,15 +2,9 @@ const util = require('../util')
 let authenticatedRoleExists
 
 async function addRolePermissions (req, roles) {
-  req.permissions = req.permissions || {}
-  const roleDocs = await Promise.all(roles.map((name) => req.db.role.get(name)))
-  roleDocs.forEach((roleDoc) => {
-    for (const permission in roleDoc.permissions) {
-      if (roleDoc.permissions[permission]) {
-        req.permissions[permission] = true
-      }
-    }
-  })
+  const rolePermissions = await util.getEffectivePermissionsForRoles(roles, req.db)
+  req.permissions ??= {}
+  req.permissions = { ...req.permissions, ...rolePermissions }
 }
 
 async function doesAuthenticatedRoleExist(req) {
@@ -31,7 +25,7 @@ module.exports.addRolePermissionsAsync = async function addRolePermissionsMiddle
     req.hasPermission = () => true
     return
   }
-  req.hasPermission = (permission) => req.permissions && req.permissions[permission]
+  req.hasPermission = (permission) => util.hasPermission(req.permissions, permission)
   let roles = ['Anonymous']
   const isAuthenticatedRole = await doesAuthenticatedRoleExist(req)
   if (req.uid) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "expressa",
-  "version": "2.0.14",
+  "version": "2.0.15",
   "description": "API framework using JSON schemas",
   "main": "index.js",
   "repository": "https://github.com/thomas4019/expressa",

package/util.js

@@ -499,6 +499,23 @@ exports.getDatabaseOffset = function getDatabaseOffset(page, itemsPerPage) {
   return (page - 1) * itemsPerPage
 }
 
+exports.hasPermission = function hasPermission(permissions, permission) {
+  return permissions && permissions[permission]
+}
+
+exports.getEffectivePermissionsForRoles = async function getEffectivePermissionsForRoles(roles, db) {
+  const permissions = {}
+  const roleDocs = await Promise.all(roles.map((name) => db.role.get(name)))
+  roleDocs.forEach((roleDoc) => {
+    for (const permission in roleDoc.permissions) {
+      if (roleDoc.permissions[permission]) {
+        permissions[permission] = true
+      }
+    }
+  })
+  return permissions
+}
+
 exports.createHash = auth.createHash
 exports.isHashed = auth.isHashed
 exports.doLogin = auth.doLogin