@toa.io/extensions.mail 1.0.0-alpha.146 → 1.0.0-alpha.149

package/components/mail.agent/manifest.toa.yaml

@@ -5,21 +5,23 @@ operations:
   send:
     input:
       properties:
+        from: { type: string }
         to: { type: string }
         subject: { type: string }
         text: { type: string }
-        template: { type: string }
-        data: { type: object, default: { } }
-      required: [to]
-      oneOf:
-        - required: [subject, text]
-        - required: [template]
+      required: [from, to, subject, text]
 
 configuration:
   schema:
     properties:
-      provider: { type: string, enum: [Console, Resend] }
-      from: { type: string, format: email }
-      templates: { type: string, format: uri }
-      options: { type: object } # provider-specific options
-    required: [provider, from]
+      provider:
+        type: string
+        enum: [Console, Resend]
+      domains:
+        description: Allowed sender domains
+        type: array
+        items: { type: string }
+      options:
+        description: Provider specific options
+        type: object
+    required: [provider, domains]

package/components/mail.agent/operations/providers/Resend.js

@@ -1,4 +1,4 @@
-const { assert } = require('node:assert')
+const assert = require('node:assert')
 const { Resend: Client } = require('resend')
 
 class Resend {

package/components/mail.agent/operations/send.js

@@ -1,14 +1,10 @@
 const assert = require('node:assert')
+const { Err } = require('error-value')
 const providers = require('./providers')
-const { load: parse } = require('cheerio')
 
 class Effect {
-  /**
-   * Base url for rendering
-   */
-  base
-  from
   provider
+  config
   logs
 
   mount (context) {
@@ -17,27 +13,18 @@ class Effect {
     const Provider = providers[context.configuration.provider]
 
     this.provider = new Provider(context)
-    this.from = context.configuration.from
-    this.base = context.configuration.templates
+    this.config = context.configuration
     this.logs = context.logs
   }
 
-  async execute ({ to, subject, text, template, data }) {
-    if (to.endsWith('.null')) {
-      this.logs.debug('Mail skipped', { to, template })
+  async execute (message) {
+    if (this.invalidSender(message.from))
+      return ERR_INVALID_SENDER
 
-      return
-    }
-
-    const properties = template === undefined ? { text } : await this.html(template, data)
-
-    if (subject !== undefined)
-      properties.subject = subject
+    if (message.to.endsWith('.null')) {
+      this.logs.debug('Mail skipped', { to: message.to })
 
-    const message = {
-      ...properties,
-      to,
-      from: this.from
+      return
     }
 
     this.logs.debug('Sending mail', message)
@@ -45,39 +32,17 @@ class Effect {
     await this.provider.send(message)
   }
 
-  async html (template, data) {
-    const { title, html } = await this.render(template, data)
-
-    /** @type {toa.extensions.mail.Message} */
-    return { subject: title, html }
-  }
-
-  async render (template, data) {
-    assert.ok(this.base !== undefined, 'Base url for rendering is not set, cannot send HTML mail')
-
-    const url = new URL(`./${template}/`, this.base).href
-
-    this.logs.debug('Requesting render', { url, data })
-
-    const response = await fetch(url, {
-      method: 'POST',
-      headers: {
-        'content-type': 'application/json'
-      },
-      body: JSON.stringify(data)
-    })
+  invalidSender (from) {
+    const domain = from.split('@')[1]
+    const invalid = !this.config.domains.includes(domain)
 
-    const type = response.headers.get('content-type')
+    if (invalid)
+      this.logs.debug('Sender domain not allowed', { domain })
 
-    assert.ok(response.status >= 200 && response.status < 300, `Failed to render ${response.status}`)
-    assert.ok(type === 'text/html', `Rendering reply must be text/html, ${type} received`)
-
-    const html = await response.text()
-    const $ = parse(html)
-    const title = $('title').text()
-
-    return { title, html }
+    return invalid
   }
 }
 
+const ERR_INVALID_SENDER = new Err('INVALID_SENDER')
+
 exports.Effect = Effect

package/features/mail.feature

@@ -1,49 +1,50 @@
 Feature: Sending an email
 
-  Scenario: Sending an email
+  Scenario: Sending text email
     Given the `mail.agent` configuration:
       """yaml
-      templates: http://localhost:8088/emails/
       provider: Console
-      from: noreply@nobody.null
+      domains: [nobody.null]
       """
     And the service is running
     And the spam is running
-    And rendering is sending:
-      """html
-      <head>
-        <title>Hello!</title>
-      </head>
-      <body>
-        <p>This is a beautiful email</p>
-      </body>
-      """
     When `spam.send` is called:
       """yaml
+      from: alice@nobody.null
       to: no@one
-      template: hello
-      """
-    When `spam.send` is called:
-      """yaml
-      to: some@one
-      template: bye
-      data:
-        name: Some One
+      subject: Test
+      text: hello!
       """
-    Then go check the email or logs
-
-  Scenario: Sending text email
-    Given the `mail.agent` configuration:
+    And `spam.send` is called:
       """yaml
-      provider: Console
-      from: noreply@nobody.null
+      from: bob@nobody.null
+      to: no@one
+      subject: Test
+      text: hello!
       """
-    And the service is running
-    And the spam is running
-    When `spam.send` is called:
+    And `spam.send` is called:
       """yaml
+      from: charlie@somebody.null
       to: no@one
       subject: Test
-      text: hello!
+      text: This won't work, domain is not allowed
       """
     Then go check the email or logs
+
+#  Scenario: Sending text email via Resend
+#    Given the `mail.agent` configuration:
+#      """yaml
+#      provider: Resend
+#      domains: [resend.dev]
+#      options:
+#        key: << PUT KEY HERE >>
+#      """
+#    And the service is running
+#    And the spam is running
+#    When `spam.send` is called:
+#      """yaml
+#      from: onboarding@resend.dev
+#      to: tema.gurtovoy@gmail.com
+#      subject: Sent via Resend
+#      text: Ok.
+#      """

package/features/steps/components/spam/manifest.toa.yaml

@@ -3,16 +3,11 @@ name: spam
 operations:
   send:
     input:
-      type: object
       properties:
+        from: { type: string }
         to: { type: string }
         subject: { type: string }
         text: { type: string }
-        template: { type: string }
-        data: { type: object }
-      required: [to]
-      oneOf:
-        - required: [subject, text]
-        - required: [template]
+      required: [from, to, subject, text]
 
 mail: ~

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@toa.io/extensions.mail",
-  "version": "1.0.0-alpha.146",
+  "version": "1.0.0-alpha.149",
   "description": "Toa Mail",
   "author": "temich <tema.gurtovoy@gmail.com>",
   "homepage": "https://github.com/toa-io/toa#readme",
@@ -26,8 +26,8 @@
     "@toa.io/core": "1.0.0-alpha.136",
     "@toa.io/generic": "1.0.0-alpha.93",
     "@toa.io/schemas": "1.0.0-alpha.143",
-    "cheerio": "1.0.0",
+    "error-value": "0.4.4",
     "resend": "4.1.2"
   },
-  "gitHead": "4e201b67db78998cbdca33c5abf7bf3493b85ff0"
+  "gitHead": "add1742266b0203944346a95ca6e9564b9725276"
 }