@live-change/access-control-service 0.8.49 → 0.8.50

package/access.js

@@ -54,7 +54,8 @@ export default (definition) => {
   }
 
   async function getUnitClientRoles(client, { objectType, object }, ignorePublic) {
-    const [ sessionOrUserType, sessionOrUser ] = client.user ? ['user_User', client.user] : ['session_Session']
+    const [ sessionOrUserType, sessionOrUser ] =
+      client.user ? ['user_User', client.user] : ['session_Session', client.session]
     const [
       publicAccessData,
       sessionAccess,
@@ -291,6 +292,7 @@ export default (definition) => {
     }]
   }
 
+/*
   function accessLimitedGet(client, objects, requiredRoles, path) {
     const roles = getClientObjectsRoles(client, objects)
     for(const requiredRole of requiredRoles) {
@@ -302,6 +304,7 @@ export default (definition) => {
     if(path[0] !== 'database') throw new Error("non database path "+ JSON.stringify(path))
     const isObject = path[1] === 'queryObject' || path[1] === ''
   }
+*/
 
   return {
     testRoles,

package/model.js

@@ -26,6 +26,12 @@ const Access = definition.model({
     resetAccess: (params, { client, context, visibilityTest }) =>
         visibilityTest || access.clientHasAdminAccess(client, params)
   },
+  indexes: {
+    byOwnerRoleAndObject: {
+      property: ['sessionOrUserType', 'sessionOrUser', 'roles', 'objectType', 'object'],
+      multi: true
+    }
+  },
   properties: {
     roles: rolesArrayType,
     lastUpdate: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/access-control-service",
-  "version": "0.8.49",
+  "version": "0.8.50",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.8.49"
+    "@live-change/framework": "^0.8.50"
   },
-  "gitHead": "568f730f1c8a6ce0247d1d8e49fcea110604800c",
+  "gitHead": "c967d5304bdac5150a6272c8d7cbe8974d7c25e6",
   "type": "module"
 }

package/view.js

@@ -5,6 +5,8 @@ const app = App.app()
 import accessModule from './access.js'
 const access = accessModule(definition)
 
+import { Access } from './model.js'
+
 definition.view({
   name: "myAccessTo",
   properties: {
@@ -32,12 +34,12 @@ definition.view({
   returns: {
     type: Array,
     of: {
-      type: String
+      type: Object
     }
   },
   async daoPath({ objectType, object, objects }, { client, service }, method) {
     const allObjects = ((objectType && object) ? [{ objectType, object }] : []).concat(objects || [])
-    if(allObjects.length == 0) throw 'empty_objects_list'
+    if(allObjects.length === 0) throw 'empty_objects_list'
     return access.accessPath(client, allObjects)
   }
 })
@@ -61,13 +63,62 @@ definition.view({
     }
   },
   returns: {
-    type: Array,
+    type: Object,
     of: {
       type: String
     }
   },
   async daoPath({ objects }, { client, service }, method) {
-    if(objects.length == 0) throw 'empty_objects_list'
+    if(objects.length === 0) throw 'empty_objects_list'
     return access.accessesPath(client, objects)
   }
 })
+
+definition.view({
+  name: 'myAccessesByObjectType',
+  properties: {
+    objectType: {
+      type: String
+    },
+    ...App.rangeProperties
+  },
+  returns: {
+    type: Array,
+    of: {
+      type: Access
+    }
+  },
+  async daoPath(properties, { client, service }, method) {
+    const [ sessionOrUserType, sessionOrUser ] = client.user ? ['user_User', client.user] : ['session_Session', client.session]
+    const { objectType } = properties
+    return Access.rangePath([sessionOrUserType, sessionOrUser, objectType], App.extractRange(properties))
+  }
+})
+
+definition.view({
+  name: 'myAccessesByObjectTypeAndRole',
+  properties: {
+    objectType: {
+      type: String
+    },
+    role: {
+      type: String
+    },
+    ...App.rangeProperties
+  },
+  returns: {
+    type: Array,
+    of: {
+      type: Access
+    }
+  },
+  async daoPath(properties, { client, service }, method) {
+    const [ sessionOrUserType, sessionOrUser ] =
+      client.user ? ['user_User', client.user] : ['session_Session', client.session]
+    const { objectType, role } = properties
+    const path = Access.indexRangePath('byOwnerRoleAndObject',
+      [sessionOrUserType, sessionOrUser, role, objectType], App.extractRange(properties))
+    console.log("PATH", path)
+    return path
+  }
+})