@live-change/access-control-service 0.2.28 → 0.2.31

package/invite.js

@@ -3,14 +3,27 @@ const app = App.app()
 const definition = require('./definition.js')
 const config = definition.config
 
-const { AccessInvitation, invitationProperties } = require('./model.js')
+const { AccessInvitation, invitationProperties, Access } = require('./model.js')
 const access = require('./access.js')(definition)
 
+const contactProperties = {
+  contactType: {
+    type: String,
+    validation: ['nonEmpty']
+  },
+  contact: {
+    type: String,
+    validation: ['nonEmpty']
+  }
+}
+
+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]),
+      id: App.encodeIdentifier([ 'user_User', user, objectType, object ]),
       contactOrUserType: 'user_User', contactOrUser: user,
       objectType, object,
       roles, message
@@ -22,7 +35,7 @@ definition.event({
   name: 'contactInvited',
   async execute({ contactType, contact, objectType, object, roles, message }) {
     await AccessInvitation.create({
-      id: App.encodeIdentifier([contactType, contact, objectType, object]),
+      id: App.encodeIdentifier([ contactType, contact, objectType, object ]),
       contactOrUserType: contactType, contactOrUser: contact,
       objectType, object,
       roles, message
@@ -30,6 +43,63 @@ definition.event({
   }
 })
 
+definition.event({
+  name: 'userInvitationAccepted',
+  async execute({ user, objectType, object, roles }) {
+    await AccessInvitation.delete(
+        App.encodeIdentifier([ 'user_User', user, objectType, object ])
+    )
+    await Access.create({
+      id: App.encodeIdentifier([ 'user_User', user, objectType, object ]),
+      sessionOrUserType: 'user_User',
+      sessionOrUser: user,
+      objectType,
+      object,
+      roles
+    })
+  }
+})
+
+definition.trigger({
+  name: 'inviteWithMessageAuthenticated',
+  waitForEvents: true,
+  properties: {
+    ...contactProperties,
+    session: {
+      type: Session,
+      validation: ['nonEmpty']
+    },
+    actionProperties: {
+      type: Object
+    }
+  },
+  async execute({ contactType, contact, session, objectType, object }, { service }, emit) {
+    const contactTypeUpperCase = contactType[0].toUpperCase() + contactType.slice(1)
+    /// Load invitation
+    const invitation = App.encodeIdentifier([ contactType + '_' + contactTypeUpperCase, contact, objectType, object ])
+    console.log("INVITATION", invitation)
+    const invitationData = await AccessInvitation.get(invitation)
+    if(!invitationData) throw 'not_found'
+    const { roles } = invitation
+    /// Create account and sign-in:
+    const user = app.generateUid()
+    await service.trigger({
+      type: 'connect' + contactTypeUpperCase,
+      [contactType]: contact,
+      user
+    })
+    await service.trigger({
+      type: 'signUpAndSignIn',
+      user, session
+    })
+    emit({
+      type: 'userInvitationAccepted',
+      user, objectType, object, roles
+    })
+    return user
+  }
+})
+
 for(const contactType of config.contactTypes) {
 
   const contactTypeUpperCaseName = contactType[0].toUpperCase() + contactType.slice(1)
@@ -82,7 +152,23 @@ for(const contactType of config.contactTypes) {
           ...invitationData
         })
       } else {
-        /// TODO: Send message to contact
+        // 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
+        }
+        await service.trigger({
+          type: 'authenticateWithMessage',
+          contactType,
+          contact,
+          messageData,
+          action: 'inviteWithMessage',
+          actionProperties: { objectType, object },
+          targetPage: { name: 'access:invitationAccepted', objectType, object }
+        })
         emit({
           type: 'contactInvited',
           contactType: contactTypeName + '_' + contactTypeUName,

package/model.js

@@ -72,6 +72,9 @@ const AccessRequest = definition.model({
     message: {
       type: String,
       validation: []
+    },
+    lastUpdate: {
+      type: Date
     }
   },
   indexes: {
@@ -100,7 +103,10 @@ const AccessInvitation = definition.model({
         visibilityTest || access.clientHasAdminAccess(client, params)
   },
   properties: {
-    ...invitationProperties
+    ...invitationProperties,
+    lastUpdate: {
+      type: Date
+    }
   },
   indexes: {
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/access-control-service",
-  "version": "0.2.28",
+  "version": "0.2.31",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,7 +21,7 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "0.6.0"
+    "@live-change/framework": "0.6.4"
   },
-  "gitHead": "34309fef58572e1a8794b52438430dd421c57d65"
+  "gitHead": "be1924699748fe7abcddabf207f9290e734bac6b"
 }