@live-change/access-control-service 0.8.82 → 0.8.84

package/access.js

@@ -108,13 +108,7 @@ export default (definition) => {
     return roles
   }
 
-  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.trace("CHECK ROLES!")
-    return await callback(roles, client, { objectType, object })
-  }
+
 
   /// QUERIES:
 
@@ -309,19 +303,15 @@ export default (definition) => {
     }]
   }
 
-/*
-  function accessLimitedGet(client, objects, requiredRoles, path) {
-    const roles = getClientObjectsRoles(client, objects)
-    for(const requiredRole of requiredRoles) {
-
-    }
-  }
-
-  function accessLimitedObservable(client, objects, path) {
-    if(path[0] !== 'database') throw new Error("non database path "+ JSON.stringify(path))
-    const isObject = path[1] === 'queryObject' || path[1] === ''
+  async function checkRoles(client, { objectType, object, objects }, callback, ignorePublic) {
+    const allObjects = ((objectType && object) ? [{ objectType, object }] : []).concat(objects || [])
+    //const roles = await getClientObjectsRoles(client, allObjects, ignorePublic)
+    const access = await app.dao.get(accessPath(client, allObjects))
+    const roles = access.roles
+    //console.log('checkRoles', allObjects, roles)
+    //console.trace("CHECK ROLES!")
+    return await callback(roles, client, { objectType, object })
   }
-*/
 
   return {
     testRoles,

package/invite.js

@@ -136,7 +136,9 @@ definition.trigger({
     console.error("INVITE WITH MESSAGE AUTHENTICATED", { contactType, contact, session, objectType, object })
     const contactTypeUpperCase = contactType[0].toUpperCase() + contactType.slice(1)
     /// Load invitation
-    const invitation = App.encodeIdentifier([ contactType + '_' + contactTypeUpperCase, contact, objectType, object ])
+    const invitation = App.encodeIdentifier([
+      contactType + '_' + contactTypeUpperCase, contact, objectType, object
+    ])
     console.log("INVITATION", invitation)
     const invitationData = await AccessInvitation.get(invitation)
     if(!invitationData) throw 'not_found'

package/model.js

@@ -116,7 +116,10 @@ const AccessInvitation = definition.model({
     }
   },
   indexes: {
-
+    byOwnerRoleAndObject: {
+      property: ['contactOrUserType', 'contactOrUser', 'roles', 'objectType', 'object'],
+      multi: true
+    }
   }
 })
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/access-control-service",
-  "version": "0.8.82",
+  "version": "0.8.84",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.8.82"
+    "@live-change/framework": "^0.8.84"
   },
-  "gitHead": "72f303118f6bb5e324c5d77473b456fc10f7ed04",
+  "gitHead": "53f9ddc7529c28f12cb77c4a2758b553461e46b6",
   "type": "module"
 }

package/view.js

@@ -5,7 +5,7 @@ const app = App.app()
 import accessModule from './access.js'
 const access = accessModule(definition)
 
-import { Access } from './model.js'
+import { Access, AccessInvitation } from './model.js'
 
 definition.view({
   name: "myAccessTo",
@@ -121,3 +121,51 @@ definition.view({
       [sessionOrUserType, sessionOrUser, role, objectType], App.extractRange(properties))
   }
 })
+
+definition.view({
+  name: 'myAccessInvitationsByObjectType',
+  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 AccessInvitation.rangePath([sessionOrUserType, sessionOrUser, objectType], App.extractRange(properties))
+  }
+})
+
+definition.view({
+  name: 'myAccessInvitationsByObjectTypeAndRole',
+  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
+    return AccessInvitation.indexRangePath('byOwnerRoleAndObject',
+      [sessionOrUserType, sessionOrUser, role, objectType], App.extractRange(properties))
+  }
+})