@live-change/access-control-service 0.8.121 → 0.8.123

package/invite.js

@@ -273,7 +273,7 @@ for(const contactType of config.contactTypes) {
     },
     access: (params, { client, context, visibilityTest}) =>
         visibilityTest || access.clientCanInvite(client, params),
-    async execute(params, { client, service, trigger  }, emit) {
+    async execute(params, { client, service, trigger }, emit) {
       const { [contactTypeName]: contact } = params
       const { objectType, object } = params
       const { roles } = params
@@ -315,12 +315,13 @@ for(const contactType of config.contactTypes) {
       ...invitationProperties
     },
     maxRetries: 1,
-    async execute(params, { service, task }, emit) {
+    async execute(params, { service, task, trigger }, emit) {
       const { [contactTypeName]: contact } = params
       const { objectType, object } = params
       const { roles } = params
       const { fromType, from } = params
       const invitationData = { fromType, from, roles }
+      for(const propertyName in invitationProperties) invitationData[propertyName] = params[propertyName]
       return await doInvite(contact, objectType, object, invitationData, emit, trigger)
     }
   }, definition)
@@ -353,19 +354,21 @@ for(const contactType of config.contactTypes) {
         }
       }
     },
-    async execute(params, { service, task }, emit) {
-      const { objectType, object } = params
-      const { roles } = params
-      const { fromType, from } = params
-      const invitationData = { fromType, from, roles }
-      for(const propertyName in invitationProperties) invitationData[propertyName] = params[propertyName]
-      for(const contact of params.contacts) {
+    async execute(params, { service, task, trigger }, emit) {
+      const contactsCount = params.contacts.length
+      for(let i = 0; i < contactsCount; i++) {
+        task.progress(i, contactsCount, 'inviting')
+        const contact = params.contacts[i]
         try {
-          await doInvite(contact[contactTypeName], objectType, object, invitationData, emit, trigger)
+          task.run(inviteOneTask, {
+            ...params,
+            ...contact
+          })
         } catch(e) {
           // ignore errors
         }
       }
+      task.progress(contactsCount, contactsCount, 'done')
     }
   }, definition)
 
@@ -383,6 +386,7 @@ for(const contactType of config.contactTypes) {
       },
       ...invitationProperties,
       contacts: {
+        validation: ['nonEmpty'],
         type: Array,
         of: {
           type: Object,
@@ -393,7 +397,6 @@ for(const contactType of config.contactTypes) {
     access: (params, { client, context, visibilityTest}) =>
       visibilityTest || access.clientCanInvite(client, params),
     async execute(params, { client, service, trigger, command  }, emit) {
-      const { [contactTypeName]: contact } = params
       const { objectType, object } = params
 
       const myRoles = await access.getClientObjectRoles(client, { objectType, object }, true)
@@ -405,11 +408,74 @@ for(const contactType of config.contactTypes) {
 
       const [ fromType, from ] = client.user ? ['user_User', client.user] : ['session_Session', client.session]
 
-      await inviteManyTask.start({
+      return await inviteManyTask.start({
+        ...params,
+        fromType, from,
+        ownerType: objectType,
+        owner: object,
+      }, 'action', command.id )
+    }
+  })
+
+  definition.action({
+    name: 'inviteMany' + pluralize(contactTypeUpperCaseName) + 'FromText',
+    waitForEvents: true,
+    properties: {
+      objectType: {
+        type: String,
+        validation: ['nonEmpty']
+      },
+      object: {
+        type: String,
+        validation: ['nonEmpty']
+      },
+      ...invitationProperties,
+      [pluralize(contactTypeName) + 'Text']: {
+        type: String,
+        validation: ['nonEmpty']
+      }
+    },
+    access: (params, { client, context, visibilityTest}) =>
+      visibilityTest || access.clientCanInvite(client, params),
+    async execute(params, { client, service, trigger, command  }, emit) {
+      const fieldName = pluralize(contactTypeName) + 'Text'
+      const contacts = params[fieldName].split(/[,;\n]/).map(line => {
+        const parts = line.split('\t')
+        return parts[0].trim()
+      }).filter(x => !!x).map(contact => ({ [contactTypeName]: contact }))
+
+      if(contacts.length === 0) throw {
+        properties: { [fieldName]: 'empty' }
+      }
+      for(const contact of contacts) {
+        console.log("C", contact)
+        const error = service.definition.validators[contactTypeName]()(contact[contactTypeName], {
+          source: { properties: { [fieldName]: contact[contactTypeName] } }
+        })
+        if(error) throw {
+          properties: { [fieldName]: error }
+        }
+      }
+
+      const { objectType, object } = params
+
+      const myRoles = await access.getClientObjectRoles(
+        client, { objectType, object }, true
+      )
+      if(!myRoles.includes('admin')) {
+        for(const requestedRole of roles) {
+          if(!myRoles.includes(requestedRole)) throw 'notAuthorized'
+        }
+      }
+
+      const [ fromType, from ] = client.user ? ['user_User', client.user] : ['session_Session', client.session]
+
+      return await inviteManyTask.start({
         ...params,
         fromType, from,
         ownerType: objectType,
         owner: object,
+        contacts
       }, 'action', command.id )
     }
   })

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/access-control-service",
-  "version": "0.8.121",
+  "version": "0.8.123",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,8 +21,8 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.8.121"
+    "@live-change/framework": "^0.8.123"
   },
-  "gitHead": "2fd79c450701fcfe3f69fa92276efd351eb57580",
+  "gitHead": "42148742342a5ac004deb122042ead1d977cb8f8",
   "type": "module"
 }