@live-change/email-service 0.1.0 → 0.2.1

package/auth.js

@@ -14,11 +14,49 @@ const Email = definition.model({
   }
 })
 
+definition.event({
+  name: 'emailConnected',
+  properties: {
+    email: {
+      type: String,
+      validation: ['nonEmpty', 'email']
+    },
+    user: {
+      type: User,
+      validation: ['nonEmpty']
+    }
+  },
+  async execute({ user, email }) {
+    await Email.create({
+      id: email,
+      user, email
+    })
+  }
+})
+
+definition.event({
+  name: "emailDisconnected",
+  properties: {
+    email: {
+      type: String,
+      validation: ['nonEmpty', 'email']
+    },
+    user: {
+      type: User,
+      validation: ['nonEmpty']
+    }
+  },
+  async execute({ user, email }) {
+    await Email.delete(email)
+  }
+})
+
 definition.trigger({
   name: "checkNewEmail",
   properties: {
     email: {
-      type: String
+      type: String,
+      validation: ['nonEmpty', 'email']
     }
   },
   async execute({ email }, context, emit) {
@@ -29,13 +67,66 @@ definition.trigger({
 })
 
 definition.trigger({
-  name: "createEmail",
+  name: "connectEmail",
+  properties: {
+    email: {
+      type: String,
+      validation: ['nonEmpty', 'email']
+    },
+    user: {
+      type: User,
+      validation: ['nonEmpty']
+    }
+  },
+  async execute({ user, email }, { client, service }, emit) {
+    const emailData = await Email.get(email)
+    if(emailData) throw 'taken'
+    emit({
+      type: 'emailConnected',
+      user, email
+    })
+    return true
+  }
+})
+
+definition.trigger({
+  name: "disconnectEmail",
+  properties: {
+    email: {
+      type: String,
+      validation: ['nonEmpty', 'email']
+    },
+    user: {
+      type: User,
+      validation: ['nonEmpty']
+    }
+  },
+  async execute({ user, email }, { client, service }, emit) {
+    const emailData = await Email.get(email)
+    if(!emailData) throw 'notFound'
+    emit({
+      type: 'emailDisconnected',
+      user, email
+    })
+    return true
+  }
+})
+
+definition.trigger({
+  name: "signInEmail",
   properties: {
     email: {
       type: String
     }
   },
-  async execute(props, context, emit) {
+  async execute({ email }, { client, service }, emit) {
+    const emailData = await Email.get(email)
+    if(!emailData) throw 'emailNotFound'
+    const { user } = emailData
+    return service.trigger({
+      type: 'signIn',
+      user, session
+    })
   }
 })
 

package/index.js

@@ -9,39 +9,4 @@ definition.processor(function(service, app) {
   service.validators.email = require('./emailValidator.js')
 })
 
-definition.action({
-  name: "sendContactFormMail",
-  properties: {
-    from: { type: String, validation: ['nonEmpty'] },
-    name: { type: String, validation: ['nonEmpty']},
-    subject: { type: String, validation: ['nonEmpty'] },
-    text: { type: String, validation: ['nonEmpty'] },
-    html: { type: String },
-  },
-  async execute({ from, name, subject, text, html }, { client, service }, emit) {
-    if(!html) {
-      const encodedStr = text.replace(/[\u00A0-\u9999<>\&]/gim, function(i) {
-        return '&#'+i.charCodeAt(0)+';'
-      })
-      const multiline = encodedStr.replace(/\n/gi, /*'↵*/'<br>')
-      const withLinks = multiline.replace(
-          /(?![^<]*>|[^<>]*<\/)((https?:)\/\/[a-z0-9&#%=.\/?_,-]+)/gi, '<a href="$1" target="_blank">$1</a>')
-      html = withLinks
-    }
-
-    await service.trigger({
-      type:"sendEmailMessage",
-      email: {
-        from: `${name} <${process.env.CONTACT_FORM_FROM_EMAIL}>`,
-        to: `${ process.env.CONTACT_FORM_TARGET_NAME} <${process.env.CONTACT_FORM_TARGET_EMAIL}>`,
-        subject: subject,
-        text,
-        html,
-        replyTo: `${name} <${from}>`
-      }
-    })
-  }
-})
-
-
 module.exports = definition

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/email-service",
-  "version": "0.1.0",
+  "version": "0.2.1",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -8,13 +8,13 @@
   },
   "repository": {
     "type": "git",
-    "url": "git+https://github.com/live-change/email-service.git"
+    "url": "git+https://github.com/live-change/live-change-services.git"
   },
   "license": "MIT",
   "bugs": {
-    "url": "https://github.com/live-change/email-service/issues"
+    "url": "https://github.com/live-change/live-change-services/issues"
   },
-  "homepage": "https://github.com/live-change/email-service",
+  "homepage": "https://github.com/live-change/live-change-services",
   "author": {
     "email": "michal@laszczewski.pl",
     "name": "Michał Łaszczewski",
@@ -22,10 +22,11 @@
   },
   "dependencies": {
     "@live-change/framework": "^0.5.7",
-    "nodemailer": "^6.7.2",
     "got": "^11.8.3",
-    "jsdom": "^18.1.1",
+    "html-to-text": "8.1.0",
     "inline-css": "3.0.0",
-    "html-to-text": "8.1.0"
-  }
+    "jsdom": "^18.1.1",
+    "nodemailer": "^6.7.2"
+  },
+  "gitHead": "e7b365e7bcc4512d9922d9fbe5eb21ed1b418c63"
 }

package/render.js

@@ -8,8 +8,6 @@ const { URL } = require('url')
 const definition = require('./definition.js')
 const config = definition.config
 
-const baseUrl = `http://${config.ssrHost||process.env.SSR_HOST||'localhost'}`+
-  `:${config.ssrHost||process.env.SSR_PORT||'8001'}`
 const publicDir = config.publicDir || 'front/public/'
 
 function processElement(element, images) {
@@ -46,6 +44,9 @@ function processElement(element, images) {
 }
 
 async function renderEmail(data) {
+  const baseUrl = `http://${config.ssrHost||process.env.SSR_HOST||'localhost'}`+
+  `:${config.ssrPort||process.env.SSR_PORT||'8001'}`
+
   const encodedData = encodeURIComponent(JSON.stringify(data))
   const url = `${baseUrl}/_email/${data.action}/${data.contact}/${encodedData}`
   console.log("RENDER EMAIL", data, "URL", url)