@live-change/message-authentication-service 0.2.4 → 0.2.9

package/index.js

@@ -41,11 +41,18 @@ const targetProperties = {
   }
 }
 
+const messageProperties = {
+  messageData: {
+    type: Object
+  }
+}
+
 const Authentication = definition.model({
   name: 'Authentication',
   properties: {
     ...contactProperties,
     ...targetProperties,
+    ...messageProperties,
     state: {
       type: "String",
       validation: ['nonEmpty'],
@@ -69,11 +76,12 @@ definition.view({
 
 definition.event({
   name: 'authenticationCreated',
-  execute({ authentication, contactType, contact, action, actionProperties, targetPage }) {
+  execute({ authentication, contactType, contact, action, actionProperties, targetPage, messageData }) {
     return Authentication.create({
       id: authentication,
       contactType, contact,
       action, actionProperties, targetPage,
+      messageData,
       state: 'created'
      })
   }
@@ -91,9 +99,11 @@ definition.trigger({
   waitForEvents: true,
   properties: {
     ...contactProperties,
-    ...targetProperties
+    ...targetProperties,
+    ...messageProperties
   },
-  async execute({ contactType, contact, action, actionProperties, targetPage }, { client, service }, emit) {
+  async execute({ contactType, contact, action, actionProperties, targetPage, messageData },
+      { client, service }, emit) {
     const authentication = app.generateUid()
     const secrets = await service.trigger({
       type: 'authenticationSecret',
@@ -107,7 +117,8 @@ definition.trigger({
         action,
         contactType,
         contact,
-        secrets
+        secrets,
+        ...messageData
       }
     })
     emit({
@@ -117,9 +128,11 @@ definition.trigger({
       contact,
       action,
       actionProperties,
-      targetPage
+      targetPage,
+      messageData
     })
     return {
+      type: 'sent',
       authentication,
       secrets: secrets.map(({ secret, ...notSecret }) => notSecret)
     }
@@ -137,15 +150,19 @@ definition.action({
     secret: {
       type: String,
       validation: ['nonEmpty']
+    },
+    authentication: {
+      type: Authentication
     }
   },
-  async execute({ secretType, secret }, { client, service }, emit) {
+  async execute({ secretType, secret, authentication = undefined }, { client, service }, emit) {
     const secretTypeUpperCase = secretType[0].toUpperCase() + secretType.slice(1)
     const checkResults = await service.trigger({
       type: 'check' + secretTypeUpperCase + 'Secret',
-      secret
+      secret,
+      authentication
     })
-    const authentication = checkResults[0]
+    authentication = checkResults[0]
     const authenticationData = await Authentication.get(authentication)
     if(authenticationData.state == 'used') throw 'authenticationUsed'
     const actionName = authenticationData.action
@@ -160,7 +177,10 @@ definition.action({
       type: 'authenticationUsed',
       authentication
     })
-    return actionResults[0]
+    return {
+      result: actionResults[0],
+      targetPage: authenticationData.targetPage
+    }
   }
 })
 
@@ -189,7 +209,8 @@ definition.action({
         action,
         contactType,
         contact,
-        secrets
+        secrets,
+        ...authentication.messageData
       }
     })
     return {
@@ -210,7 +231,7 @@ definition.trigger({
     const user = app.generateUid()
     await service.trigger({
       type: 'connect' + contactTypeUpperCase,
-      [contactType]: contact,
+      [contactTypeName]: contact,
       user
     })
     await service.trigger({
@@ -227,74 +248,149 @@ definition.trigger({
   properties: {
     ...contactProperties
   },
-  async execute({ contactType, contact }, { client, service }, emit) {
+  async execute({ contactType, contact, session }, { client, service }, emit) {
     const contactTypeUpperCase = contactType[0].toUpperCase() + contactType.slice(1)
     const user = await service.trigger({
       type: 'signIn' + contactTypeUpperCase,
       [contactType]: contact,
+      session
+    })
+    return user
+  }
+})
+
+definition.trigger({
+  name: 'connectWithMessageAuthenticated',
+  waitForEvents: true,
+  properties: {
+    ...contactProperties
+  },
+  async execute({ contactType, contact, user }, { client, service }, emit) {
+    const contactTypeUpperCase = contactType[0].toUpperCase() + contactType.slice(1)
+    await service.trigger({
+      type: 'connect' + contactTypeUpperCase,
+      [contactType]: contact,
+      user
     })
     return user
   }
 })
 
 for(const contactType of config.contactTypes) {
-  const contactTypeUpperCaseName = contactType[0].toUpperCase() + contactType.slice(1)
 
   const contactConfig = (typeof contactType == "string") ? { name: contactType } : contactType
-
   const contactTypeName = contactConfig.name
   const contactTypeUName = contactTypeName[0].toUpperCase() + contactTypeName.slice(1)
 
   const contactTypeProperties = {
-    [contactType]: {
+    [contactTypeName]: {
       type: String,
       validation: ['nonEmpty', contactTypeName]
     }
   }
 
-  if(contactConfig.signUp || config.signUp || contactConfig.signIn || config.signIn) {
+  if(contactConfig.signUp || config.signUp) {
     definition.action({
-      name: 'signIn' + contactTypeUpperCaseName,
+      name: 'signUp' + contactTypeUName,
       waitForEvents: true,
       properties: {
         ...contactTypeProperties
       },
       async execute({ [contactTypeName]: contact }, { client, service }, emit) {
-
+        await service.trigger({
+          type: 'checkNew' + contactTypeUName,
+          [contactTypeName]: contact,
+        })
+        return service.triggerService(definition.name, {
+          type: 'authenticateWithMessage',
+          contactType,
+          contact,
+          action: 'signUpWithMessage',
+          targetPage: config.signUpTargetPage || { name: 'user:signUpFinished' }
+        })
       }
     })
   }
 
-  if(contactConfig.connect || config.connect ) {
+  if(contactConfig.signUp || config.signUp || contactConfig.signIn || config.signIn) {
     definition.action({
-      name: 'connect',
+      name: 'signIn' + contactTypeUName,
+      waitForEvents: true,
       properties: {
         ...contactTypeProperties
       },
       async execute({ [contactTypeName]: contact }, { client, service }, emit) {
-
+        const contactData = await service.trigger({
+          type: 'get' + contactTypeUName,
+          [contactTypeName]: contact,
+        })
+        const messageData = {
+          user: contactData.user
+        }
+        return service.triggerService(definition.name, {
+          type: 'authenticateWithMessage',
+          contactType,
+          contact,
+          messageData,
+          action: 'signInWithMessage',
+          targetPage: config.signInTargetPage || { name: 'user:signInFinished' }
+        })
       }
     })
   }
 
-  if(contactConfig.signUp || config.signUp) {
+  if(contactConfig.connect || config.connect ) {
     definition.action({
-      name: 'signUp' + contactTypeUpperCaseName,
-      waitForEvents: true,
+      name: 'connect' + contactTypeUName,
       properties: {
         ...contactTypeProperties
       },
+      access: (params, { client }) => {
+        return !!client.user
+      },
       async execute({ [contactTypeName]: contact }, { client, service }, emit) {
         await service.trigger({
           type: 'checkNew' + contactTypeUName,
-          [contactType]: contact,
+          [contactTypeName]: contact,
         })
         return service.triggerService(definition.name, {
           type: 'authenticateWithMessage',
           contactType,
           contact,
-          action: 'signUpWithMessage',
-          targetPage: config.signUpTargetPage || { name: 'user:signUpFinished' }
+          action: 'connectWithMessage',
+          actionProperties: {
+            user: client.user
+          },
+          messageData: {
+            user: client.user
+          },
+          targetPage: config.signUpTargetPage || { name: 'user:connectFinished' }
+        })
+      }
+    })
+
+    definition.action({
+      name: 'disconnect' + contactTypeUName,
+      properties: {
+        ...contactTypeProperties
+      },
+      access: (params, { client }) => {
+        return !!client.user
+      },
+      async execute({ [contactTypeName]: contact }, { client, service }, emit) {
+        const contacts = (await service.trigger({
+          type: 'getConnectedContacts',
+          user: client.user
+        })).flat()
+        console.log("CONTACTS", contacts, contactTypeName, contact)
+        const contactData = contacts.find(c => c.type == contactTypeName && c.contact == contact)
+        if(!contactData) throw 'notFound'
+        if(contacts.length == 1) throw 'lastOne'
+        console.log("DISCONNECT", contact)
+        return await service.trigger({
+          type: 'disconnect' + contactTypeUName,
+          [contactTypeName]: contact,
+          user: client.user
         })
       }
     })
@@ -302,13 +398,37 @@ for(const contactType of config.contactTypes) {
 
   if(contactConfig.signUp || config.signUp) {
     definition.action({
-      name: 'signInOrSignUp' + contactTypeUpperCaseName,
+      name: 'signInOrSignUp' + contactTypeUName,
       waitForEvents: true,
       properties: {
         ...contactTypeProperties
       },
-      async execute({ [contactType]: contact }, { client, service }, emit) {
-
+      async execute({ [contactTypeName]: contact }, { client, service }, emit) {
+        const contactData = await service.trigger({
+          type: 'get' + contactTypeUName + 'OrNull',
+          [contactTypeName]: contact,
+        })
+        if(contactData) {
+          const messageData = {
+            user: contactData.user
+          }
+          return service.triggerService(definition.name, {
+            type: 'authenticateWithMessage',
+            contactType,
+            contact,
+            messageData,
+            action: 'signInWithMessage',
+            targetPage: config.signInTargetPage || { name: 'user:signInFinished' }
+          })
+        } else {
+          return service.triggerService(definition.name, {
+            type: 'authenticateWithMessage',
+            contactType,
+            contact,
+            action: 'signUpWithMessage',
+            targetPage: config.signUpTargetPage || { name: 'user:signUpFinished' }
+          })
+        }
       }
     })
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/message-authentication-service",
-  "version": "0.2.4",
+  "version": "0.2.9",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -24,5 +24,5 @@
     "@live-change/framework": "^0.5.7",
     "nodemailer": "^6.7.2"
   },
-  "gitHead": "9b7bd2322b9d6285600d3cf6ed89473eafa530c2"
+  "gitHead": "5362172c498a5d131b945c4a2f4644565a5c9a3c"
 }