@live-change/access-control-service 0.8.52 → 0.8.54

package/access.js

@@ -54,8 +54,6 @@ export default (definition) => {
   }
 
   async function getUnitClientRoles(client, { objectType, object }, ignorePublic) {
-    const [ sessionOrUserType, sessionOrUser ] =
-      client.user ? ['user_User', client.user] : ['session_Session', client.session]
     const [
       publicAccessData,
       sessionAccess,
@@ -74,6 +72,9 @@ export default (definition) => {
     }
     if(sessionAccess) roles.push(...sessionAccess.roles)
     if(userAccess) roles.push(...userAccess.roles)
+    if(objectType === 'user_User' && object === client.user) roles.push('owner')
+    if(objectType === 'session_Session' && object === client.session) roles.push('owner')
+    //console.log("GOT UNIT CLIENT:", client, "ROLES:", roles, "IGNORE PUBLIC:", ignorePublic)
     return Array.from(new Set(roles))
   }
 
@@ -105,7 +106,8 @@ export default (definition) => {
   async function checkRoles(client, { objectType, object, objects }, callback, ignorePublic) {
     const allObjects = ((objectType && object) ? [{ objectType, object }] : []).concat(objects || [])
     const roles = await getClientObjectsRoles(client, allObjects, ignorePublic)
-    console.log('checkRoles', allObjects, roles)
+    //console.log('checkRoles', allObjects, roles)
+    //console.trace("CHECK ROLES!")
     return await callback(roles, client, { objectType, object })
   }
 
@@ -123,7 +125,8 @@ export default (definition) => {
         publicSessionRoles: [],
         publicUserRoles: [],
         sessionRoles: [],
-        userRoles: []
+        userRoles: [],
+        ownerRoles: [],
       }
       let objectObserver, publicAccessObserver, sessionAccessObserver, userAccessObserver
 
@@ -150,6 +153,9 @@ export default (definition) => {
         if(isLoaded()) updateRoles()
       })
 
+      if(objectType === 'user_User' && object === client.user) node.ownerRoles.push('owner')
+      if(objectType === 'session_Session' && object === client.session) node.ownerRoles.push('owner')
+
       async function disposeParents() {
         const oldParents = node.parents
         return Promise.all(oldParents.map(parent => parent.dispose()))
@@ -186,7 +192,8 @@ export default (definition) => {
         ...node.publicUserRoles,
         ...node.publicSessionRoles,
         ...node.userRoles,
-        ...node.sessionRoles
+        ...node.sessionRoles,
+        ...node.ownerRoles,
       ]))
     }
     return { treeNode, computeNodeRoles }

package/accessControl.js

@@ -43,7 +43,7 @@ definition.processor({
       if(!view.accessControl) continue
       const config = view.accessControl
 
-      console.log("ACCESS CONTROL", service.name, "VIEW", view.name)
+      //console.log("ACCESS CONTROL", service.name, "VIEW", view.name, "CONFIG", config)
 
       const oldGet = view.get
       const oldObservable = view.observable
@@ -58,8 +58,8 @@ definition.processor({
         if(objects.length === 0) {
           throw new Error('no objects for access control to work in view ' + viewName)
         }
-        console.log("OBJECTS", objects)
-        /*console.log("CLIENT", client)
+        /*console.log("OBJECTS", objects)
+        console.log("CLIENT", client)
         console.log("ROLES", config.roles)*/
         const accessible = await access.clientHasAccessRoles(client, { objects }, config.roles)
         if(!accessible) throw 'notAuthorized'

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/access-control-service",
-  "version": "0.8.52",
+  "version": "0.8.54",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.8.52"
+    "@live-change/framework": "^0.8.54"
   },
-  "gitHead": "d06ad62415cc92e15b5dee87078614d4f883eb83",
+  "gitHead": "1558b41fc331424507874c0afd3d149ffb849ca8",
   "type": "module"
 }