@live-change/access-control-service 0.2.33 → 0.2.34

package/access.js

@@ -28,6 +28,11 @@ module.exports = (definition) => {
     return true
   }
 
-  return { clientHasAnyAccess, clientHasAdminAccess, clientCanInvite, clientCanRequest, clientHasAccessRole }
+  return {
+    clientHasAnyAccess, clientHasAdminAccess,
+    clientCanInvite,
+    clientCanRequest,
+    clientHasAccessRole
+  }
 
 }

package/invite.js

@@ -21,25 +21,33 @@ const Session = definition.foreignModel('session', 'Session')
 
 definition.event({
   name: 'userInvited',
-  async execute({ user, objectType, object, roles, message }) {
-    await AccessInvitation.create({
-      id: App.encodeIdentifier([ 'user_User', user, objectType, object ]),
-      contactOrUserType: 'user_User', contactOrUser: user,
-      objectType, object,
-      roles, message
-    })
+  async execute(params) {
+    const { user, objectType, object, fromType, from } = params
+    const contactOrUserType = 'user_User'
+    const contactOrUser = user
+    const data = {
+      id: App.encodeIdentifier([ contactOrUserType, contactOrUser, objectType, object ]),
+      contactOrUserType, contactOrUser,
+      objectType, object, fromType, from
+    }
+    for(const propertyName in invitationProperties) data[propertyName] = params[propertyName]
+    await AccessInvitation.create(data)
   }
 })
 
 definition.event({
   name: 'contactInvited',
-  async execute({ contactType, contact, objectType, object, roles, message }) {
-    await AccessInvitation.create({
-      id: App.encodeIdentifier([ contactType, contact, objectType, object ]),
-      contactOrUserType: contactType, contactOrUser: contact,
-      objectType, object,
-      roles, message
-    })
+  async execute(params) {
+    const { contactType, contact, objectType, object, fromType, from } = params
+    const contactOrUserType = contactType
+    const contactOrUser = contact
+    const data = {
+      id: App.encodeIdentifier([ contactOrUserType, contactOrUser, objectType, object ]),
+      contactOrUserType, contactOrUser,
+      objectType, object, fromType, from
+    }
+    for(const propertyName in invitationProperties) data[propertyName] = params[propertyName]
+    await AccessInvitation.create(data)
   }
 })
 
@@ -88,14 +96,16 @@ definition.trigger({
     }
   },
   async execute({ from, to, objectType, object }, { service }, emit) {
+    const invitation = App.encodeIdentifier([from.contactOrUserType, from.contactOrUser, objectType, object])
+    const invitationData = await AccessInvitation.get(invitation)
     if(to.contactOrUserType == 'user_User') {
       await service.trigger({
+        ...invitationData,
         type: 'notify',
         sessionOrUserType: 'user_User',
         sessionOrUser: to.contactOrUser,
         notificationType: 'accessControl_Invitation',
-        objectType,
-        object
+        id: undefined
       })
     }
   }
@@ -141,6 +151,34 @@ definition.trigger({
   }
 })
 
+definition.action({
+  name: 'acceptInvitation',
+  waitForEvents: true,
+  properties: {
+    objectType: {
+      type: String,
+      validation: ['nonEmpty']
+    },
+    object: {
+      type: String,
+      validation: ['nonEmpty']
+    }
+  },
+  async execute({ objectType, object }, {client, service}, emit) {
+    if(!client.user) throw 'not_authorized'
+    const user = client.user
+    const invitation = App.encodeIdentifier(['user_User', user, objectType, object])
+    const invitationData = await AccessInvitation.get(invitation)
+    console.log("INVITATION", invitation, invitationData)
+    if(!invitationData) throw 'not_found'
+    const { roles } = invitationData
+    emit({
+      type: 'userInvitationAccepted',
+      user, objectType, object, roles
+    })
+  }
+})
+
 for(const contactType of config.contactTypes) {
 
   const contactTypeUpperCaseName = contactType[0].toUpperCase() + contactType.slice(1)
@@ -175,9 +213,10 @@ for(const contactType of config.contactTypes) {
     access: (params, { client, context, visibilityTest }) =>
         visibilityTest || access.clientCanInvite(client, params),
     async execute(params, { client, service }, emit) {
+      const [ fromType, from ] = client.user ? ['user_User', client.user] : ['session_Session', client.session]
       const { [contactTypeName]: contact } = params
       const { objectType, object } = params
-      const invitationData = { }
+      const invitationData = { fromType, from }
       for(const propertyName in invitationProperties) invitationData[propertyName] = params[propertyName]
 
       const contactData = (await service.trigger({
@@ -192,22 +231,20 @@ for(const contactType of config.contactTypes) {
           sessionOrUser: user,
           notificationType: 'accessControl_Invitation',
           objectType,
-          object
+          object,
+          ...invitationData, id: undefined
         })
         emit({
           type: 'userInvited',
           user,
           objectType, object,
-          ...invitationData
+          ...invitationData, id: undefined
         })
       } else {
         // Authenticate with message because we will create account later
         const messageData = {
-          fromType: client.user ? 'user_User' : 'session_Session',
-          from: client.user ?? client.session,
           objectType, object,
-          roles: params.roles,
-          message: params.message
+          ...invitationData, id: undefined
         }
         await service.trigger({
           type: 'authenticateWithMessage',
@@ -223,7 +260,7 @@ for(const contactType of config.contactTypes) {
           contactType: contactTypeName + '_' + contactTypeUName,
           contact,
           objectType, object,
-          ...invitationData
+          ...invitationData, id: undefined
         })
       }
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/access-control-service",
-  "version": "0.2.33",
+  "version": "0.2.34",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -23,5 +23,5 @@
   "dependencies": {
     "@live-change/framework": "0.6.5"
   },
-  "gitHead": "8918e5113c031c3d9766df32283de7fb6421e0be"
+  "gitHead": "45f52d6c7586d0eaa51b3205c6635a33e32eef6b"
 }