@live-change/access-control-service 0.2.27 → 0.2.30

package/LICENSE.md

@@ -0,0 +1,11 @@
+Copyright 2019-2022 Michał Łaszczewski
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+
+2. Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+
+3. Neither the name of the copyright holder nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

package/access.js

@@ -24,6 +24,10 @@ module.exports = (definition) => {
     return true
   }
 
-  return { clientHasAnyAccess, clientHasAdminAccess, clientCanInvite, clientCanRequest }
+  function clientHasAccessRole(client, { objectType, object }, role) {
+    return true
+  }
+
+  return { clientHasAnyAccess, clientHasAdminAccess, clientCanInvite, clientCanRequest, clientHasAccessRole }
 
 }

package/index.js

@@ -4,5 +4,6 @@ const definition = require('./definition.js')
 
 require('./model.js')
 require('./invite.js')
+require('./request.js')
 
 module.exports = definition

package/invite.js

@@ -1,10 +1,105 @@
-const app = require("@live-change/framework").app()
+const App = require("@live-change/framework")
+const app = App.app()
 const definition = require('./definition.js')
 const config = definition.config
 
-const { Invite, 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 ]),
+      contactOrUserType: 'user_User', contactOrUser: user,
+      objectType, object,
+      roles, message
+    })
+  }
+})
+
+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
+    })
+  }
+})
+
+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)
@@ -57,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

@@ -4,6 +4,15 @@ const definition = require('./definition.js')
 const config = definition.config
 const access = require('./access.js')(definition)
 
+const rolesArrayType = {
+  type: Array,
+  of: {
+    type: String,
+    validation: ['nonEmpty']
+  },
+  validation: ['elementsNonEmpty']
+}
+
 const Access = definition.model({
   name: 'Access',
   sessionOrUserProperty: {
@@ -17,14 +26,7 @@ const Access = definition.model({
         visibilityTest || access.clientHasAdminAccess(client, params)
   },
   properties: {
-    roles: {
-      type: Array,
-      of: {
-        type: String,
-        validation: ['nonEmpty']
-      },
-      validation: ['elementsNonEmpty']
-    },
+    roles: rolesArrayType,
     lastUpdate: {
       type: Date
     }
@@ -41,30 +43,9 @@ const PublicAccess = definition.model({
         visibilityTest || access.clientHasAdminAccess(client, params)
   },
   properties: {
-    userRoles: {
-      type: Array,
-      of: {
-        type: String,
-        validation: ['nonEmpty']
-      },
-      validation: ['elementsNonEmpty']
-    },
-    sessionRoles: {
-      type: Array,
-      of: {
-        type: String,
-        validation: ['nonEmpty']
-      },
-      validation: ['elementsNonEmpty']
-    },
-    availableRoles: {
-      type: Array,
-      of: {
-        type: String,
-        validation: ['nonEmpty']
-      },
-      validation: ['elementsNonEmpty']
-    },
+    userRoles: rolesArrayType,
+    sessionRoles: rolesArrayType,
+    availableRoles: rolesArrayType,
     lastUpdate: {
       type: Date
     }
@@ -87,17 +68,13 @@ const AccessRequest = definition.model({
         visibilityTest || access.clientHasAdminAccess(client, params)
   },
   properties: {
-    roles: {
-      type: Array,
-      of: {
-        type: String,
-        validation: ['nonEmpty']
-      },
-      validation: ['elementsNonEmpty']
-    },
+    roles: rolesArrayType,
     message: {
       type: String,
       validation: []
+    },
+    lastUpdate: {
+      type: Date
     }
   },
   indexes: {
@@ -105,14 +82,7 @@ const AccessRequest = definition.model({
 })
 
 const invitationProperties = {
-  roles: {
-    type: Array,
-    of: {
-      type: String,
-      validation: ['nonEmpty']
-    },
-    validation: ['elementsNonEmpty']
-  },
+  roles: rolesArrayType,
   message: {
     type: String,
     validation: []
@@ -133,35 +103,14 @@ const AccessInvitation = definition.model({
         visibilityTest || access.clientHasAdminAccess(client, params)
   },
   properties: {
-    ...invitationProperties
+    ...invitationProperties,
+    lastUpdate: {
+      type: Date
+    }
   },
   indexes: {
 
   }
 })
 
-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
-    })
-  }
-})
-
-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
-    })
-  }
-})
-
-module.exports = { Access, PublicAccess, AccessRequest, AccessInvitation, invitationProperties }
+module.exports = { Access, PublicAccess, AccessRequest, AccessInvitation, invitationProperties, rolesArrayType }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/access-control-service",
-  "version": "0.2.27",
+  "version": "0.2.30",
   "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": "9a82ff0e7a7003d5b4e34ef9aef1ad4d7d8605dd"
+  "gitHead": "0a3acfcbb3a720c3e2f20bb3c9dc80a0a1aaceaa"
 }

package/request.js

@@ -0,0 +1,54 @@
+const App = require("@live-change/framework")
+const app = App.app()
+const definition = require('./definition.js')
+const config = definition.config
+
+const { Access, AccessRequest, rolesArrayType } = require('./model.js')
+const access = require('./access.js')(definition)
+
+definition.event({
+  name: 'accessRequestAccepted',
+  async execute({ sessionOrUserType, sessionOrUser, objectType, object, roles }) {
+    const id = App.encodeIdentifier([sessionOrUserType, sessionOrUser, objectType, object])
+    await Access.create({
+      id,
+      sessionOrUserType, sessionOrUser, objectType, object, roles
+    })
+    await AccessRequest.delete(id)
+  }
+})
+
+definition.action({
+  name: 'acceptAccessRequest',
+  waitForEvents: true,
+  properties: {
+    objectType: {
+      type: String,
+      validation: ['nonEmpty']
+    },
+    object: {
+      type: String,
+      validation: ['nonEmpty']
+    },
+    sessionOrUserType: {
+      type: String,
+      validation: ['nonEmpty']
+    },
+    sessionOrUser: {
+      type: String,
+      validation: ['nonEmpty']
+    },
+    roles: rolesArrayType
+  },
+  access: (params, { client, context, visibilityTest }) =>
+      visibilityTest || access.clientCanInvite(client, params),
+  async execute({ objectType, object, sessionOrUserType, sessionOrUser, roles }, { client, service }, emit) {
+    const request = App.encodeIdentifier([ sessionOrUserType, sessionOrUser, objectType, object ])
+    const requestData = await AccessRequest.get(request)
+    if(!requestData) throw 'not_found'
+    emit({
+      type: 'accessRequestAccepted',
+      objectType, object, sessionOrUserType, sessionOrUser, roles
+    })
+  }
+})