@live-change/access-control-service 0.2.43 → 0.2.45

package/access.js

@@ -48,7 +48,7 @@ module.exports = (definition) => {
 
   function clientHasAccessRoles(client, { objectType, object, objects }, roles) {
     return checkRoles(client, { objectType, object, objects },
-      (clientRoles) => testRoles(requiredRoles, roles)
+      (clientRoles) => testRoles(roles, clientRoles)
     )
   }
 
@@ -208,21 +208,20 @@ module.exports = (definition) => {
         let rolesTreesRoots = objects.map(({ object, objectType }) => treeNode(objectType, object, client))
 
         const outputObjectId = `${JSON.stringify(client.session)}:${JSON.stringify(client.user)}:` +
-                               objects.map( obj => `${JSON.stringify(objectType)}:${JSON.stringify(object)}`)
+                               objects.map( obj => `${JSON.stringify(obj.objectType)}:${JSON.stringify(obj.object)}`)
                                  .join(':')
         let oldOutputObject = null
         async function updateRoles() {
           const roots = await Promise.all(rolesTreesRoots)
-          const accesses = roots.map(root => computeNodeRoles(root))
-          const firstAccess = accesses.shift()
-          let roles = firstAccess.roles
-          for(const access of accesses) {
-            roles = roles.filter(role => access.roles.includes(role))
+          const accessesRoles = roots.map(root => computeNodeRoles(root))
+          const firstAccessRoles = accessesRoles.shift()
+          let roles = firstAccessRoles
+          for(const accessRoles of accessesRoles) {
+            roles = roles.filter(role => accessRoles.includes(role))
           }
-          const accessControlRoles = computeNodeRoles()
           const outputObject = {
             id: outputObjectId,
-            roles: Array.from(new Set([...accessControlRoles, ...client.roles]))
+            roles: Array.from(new Set([...roles, ...client.roles]))
           }
           output.change(outputObject, oldOutputObject)
           oldOutputObject = outputObject
@@ -232,7 +231,7 @@ module.exports = (definition) => {
         await updateRoles()
       }
     })`, {
-      objectType, object, parentsSourcesMap: parentsSources, client,
+      objects, parentsSourcesMap: parentsSources, client,
       accessTableName: Access.tableName, publicAccessTableName: PublicAccess.tableName,
       dbAccessFunctions: `(${dbAccessFunctions})`
     }]

package/accessControl.js

@@ -52,9 +52,10 @@ definition.processor({
           (objectType && object) ? [{ objectType, object }] : []
         )
         if(objects.length == 0) {
-          throw new Error('no objects for access control to work')
+          throw new Error('no objects for access control to work in view ' + viewName)
         }
-        const accessible = access.clientHasAccessRoles(client, { objects }, config.roles)
+        console.log("OBJECTS", objects)
+        const accessible = await access.clientHasAccessRoles(client, { objects }, config.roles)
         if(!accessible) throw 'notAuthorized'
         return oldGet.apply(view, args)
       }
@@ -103,6 +104,7 @@ definition.processor({
           rolesObservable.observe(rolesObserver)
           oldRespawn.apply(observableProxy)
         }
+        return observableProxy
       }
     }
 

package/invite.js

@@ -221,7 +221,10 @@ for(const contactType of config.contactTypes) {
     access: (params, { client, context, visibilityTest }) =>
         visibilityTest || access.clientCanInvite(client, params),
     async execute(params, { client, service }, emit) {
+      const { [contactTypeName]: contact } = params
+      const { objectType, object } = params
       const { roles } = params
+
       const myRoles = await access.getClientObjectRoles(client, { objectType, object }, true)
       if(!myRoles.includes('administrator')) {
         for(const requestedRole of roles) {
@@ -230,8 +233,6 @@ for(const contactType of config.contactTypes) {
       }
 
       const [ fromType, from ] = client.user ? ['user_User', client.user] : ['session_Session', client.session]
-      const { [contactTypeName]: contact } = params
-      const { objectType, object } = params
       const invitationData = { fromType, from }
       for(const propertyName in invitationProperties) invitationData[propertyName] = params[propertyName]
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/access-control-service",
-  "version": "0.2.43",
+  "version": "0.2.45",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,7 +21,7 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "0.6.10"
+    "@live-change/framework": "0.6.11"
   },
-  "gitHead": "8db9a604d14d85f750056ce9c3b7bb859aface27"
+  "gitHead": "aab9b222492335dda687dcf4a1c2794ec4fa610f"
 }