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

package/access.js

@@ -214,6 +214,7 @@ module.exports = (definition) => {
         async function updateRoles() {
           const roots = await Promise.all(rolesTreesRoots)
           const accessesRoles = roots.map(root => computeNodeRoles(root))
+          output.debug(outputObjectId, "Accesses roles:", accessesRoles)
           const firstAccessRoles = accessesRoles.shift()
           let roles = firstAccessRoles
           for(const accessRoles of accessesRoles) {

package/accessControl.js

@@ -1,6 +1,6 @@
 const definition = require('./definition.js')
 const App = require("@live-change/framework")
-const { ObservableValue, ObservableList, ObservableProxy } = require("@live-change/dao")
+const { ObservableValue, ObservableList, ObservableProxy, ObservablePromiseProxy } = require("@live-change/dao")
 const app = App.app()
 const access = require('./access.js')(definition)
 
@@ -20,9 +20,10 @@ definition.processor({
         const [ properties, context, emit ] = args
         const { client } = context
 
+        const { objectType, object } = properties
         const objects = [].concat(
-          config.objects ? config.objects(properties) : [],
-          (objectType && object) ? [{ objectType, object }] : []
+          config.objects ? config.objects(properties) :
+            ((objectType && object) ? [{ objectType, object }] : [])
         )
         if(objects.length == 0) {
           throw new Error('no objects for access control to work')
@@ -48,8 +49,8 @@ definition.processor({
         const { client } = context
         const { objectType, object } = properties
         const objects = [].concat(
-          config.objects ? config.objects(properties) : [],
-          (objectType && object) ? [{ objectType, object }] : []
+          config.objects ? config.objects(properties) :
+            ((objectType && object) ? [{ objectType, object }] : [])
         )
         if(objects.length == 0) {
           throw new Error('no objects for access control to work in view ' + viewName)
@@ -64,8 +65,8 @@ definition.processor({
         const { client } = context
         const { objectType, object } = properties
         const objects = [].concat(
-          config.objects ? config.objects(properties) : [],
-          (objectType && object) ? [{ objectType, object }] : []
+          config.objects ? config.objects(properties) :
+            ((objectType && object) ? [{ objectType, object }] : [])
         )
         if(objects.length == 0) {
           throw new Error('no objects for access control to work')
@@ -88,8 +89,12 @@ definition.processor({
           if(newAccessible !== accessible) {
             if(newAccessible === true /*&& !valueObservable*/) {
               valueObservable = oldObservable.apply(view, args)
+              if(valueObservable.then) {
+                valueObservable = new ObservablePromiseProxy(valueObservable)
+              }
             }
-            observableProxy.setTarget(accessible ? valueObservable : errorObservable)
+            observableProxy.setTarget(newAccessible ? valueObservable : errorObservable)
+            accessible = newAccessible
           }
         }
         rolesObservable.observe(rolesObserver)

package/package.json

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