@live-change/email-service 0.8.9 → 0.8.11

package/index.js

@@ -7,9 +7,6 @@ import './send.js'
 import './auth.js'
 
 import validator from './emailValidator.js'
-
-definition.processor(function(service, app) {
-  service.validators.email = validator
-})
+definition.validator('email', validator)
 
 export default definition

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@live-change/email-service",
-  "version": "0.8.9",
+  "version": "0.8.11",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -21,7 +21,7 @@
     "url": "https://www.viamage.com/"
   },
   "dependencies": {
-    "@live-change/framework": "^0.8.9",
+    "@live-change/framework": "^0.8.11",
     "got": "^11.8.3",
     "html-to-text": "8.1.0",
     "inline-css": "4.0.2",
@@ -29,6 +29,6 @@
     "juice": "9.1.0",
     "nodemailer": "^6.7.2"
   },
-  "gitHead": "362dd55bd2773195e4cefd84080c10bd9fbaaf45",
+  "gitHead": "c69f8c0c5b1f9c8b62d74bd44e97dccbdc789c5a",
   "type": "module"
 }

package/render.js

@@ -1,16 +1,43 @@
 import got from 'got'
-import inlineCss from 'inline-css'
 import juice from 'juice'
 import { JSDOM } from 'jsdom'
 import { convert as htmlToText } from 'html-to-text'
 import path from 'path'
 import { URL } from 'url'
 
+import crypto from 'crypto'
+import { ObservableValue } from '@live-change/dao'
+
 import definition from './definition.js'
 const config = definition.config
 
 const publicDir = config.publicDir || 'front/public/'
 
+const authenticationKey = new ObservableValue(crypto.randomBytes(24).toString('hex'))
+definition.view({
+  internal: true,
+  global: true,
+  remote: true,
+  name: 'emailRendererAuthenticationKey',
+  properties: { },
+  returns: { type: String },
+  async get() {
+    return authenticationKey.getValue()
+  },
+  observable() {
+    return authenticationKey
+  }
+})
+
+definition.authenticator({
+  async prepareCredentials(credentials) {
+    console.log("EMAIL AUTHENTICATOR", credentials, authenticationKey.getValue())
+    if(credentials.sessionKey === authenticationKey.getValue()) {
+      credentials.roles.push('admin')
+      credentials.internal = true
+    }
+  }
+})
 function processElement(element, images) {
   for(let i = 0; i < element.attributes.length; i++) {
     const attribute = element.attributes[i]
@@ -50,11 +77,11 @@ async function renderEmail(data) {
 
   const encodedData = encodeURIComponent(JSON.stringify(data))
   const url = `${baseUrl}/_email/${data.action}/${data.contact}/${encodedData}`
+    +`?sessionKey=${await authenticationKey.getValue()}`
   console.log("RENDER EMAIL", data, "URL", url)
   const response = await got(url)
   let body = response.body
   console.log("BASE URL", baseUrl)
-  //body = await inlineCss(body, { url })
   const juiceOptions = {
     webResources: {
       scripts: false,
@@ -70,7 +97,7 @@ async function renderEmail(data) {
       else resolve(html)
     })
   })
-  console.log("HTML", body)
+  //console.log("HTML", body)
   const dom = new JSDOM(body)
   const headers = JSON.parse(dom.window.document.querySelector('[data-headers]').textContent)
   const messageElements = dom.window.document.querySelectorAll("[data-html],[data-text]")