@teleporthq/teleport-plugin-next-workflows 0.44.9 → 0.44.11

package/src/nodes/email/email-sendgrid.ts

@@ -1,69 +1,84 @@
 import { EmailSender } from '@teleporthq/teleport-shared'
 import { NodeHandlerGenerator, handlerToString } from '../types'
 import { assertHandlerHasNoModuleRefs } from '../analytics/commerce-tracking'
+import { EMAIL_RECIPIENTS_HELPER_SOURCE, EmailDeliveriesPlan } from './email-recipients'
 
 // Ambient, not imported: a serialized handler has no module scope, so
-// generateHandler appends the helper's source (EmailSender, teleport-shared).
+// generateHandler appends the helpers' source (EmailSender from teleport-shared,
+// the recipients helper beside this file).
 declare function __emailSender(sender: EmailSender.EmailSenderInput): EmailSender.EmailSenderParts
+declare function __emailRecipients(to: unknown): unknown[]
+declare function __emailDeliveries(plan: EmailDeliveriesPlan): Promise<unknown>
 
 async function email_sendgrid(config: any, context: Record<string, unknown>) {
   const apiKey = config.apiKey
   const from = config.from
   const fromName = config.fromName
-  const to = config.to
   const subject = config.subject
   const body = config.body
   const replyTo = config.replyTo
   const cc = config.cc
   const bcc = config.bcc
+  const recipients = __emailRecipients(config.to)
 
-  try {
-    const __nodeRequire =
-      typeof __non_webpack_require__ !== 'undefined' ? __non_webpack_require__ : require
-    const MailService = __nodeRequire('@sendgrid/mail').MailService
-    const sgMail = new MailService()
-    sgMail.setApiKey(apiKey)
+  async function sendTo(to: unknown) {
+    try {
+      const __nodeRequire =
+        typeof __non_webpack_require__ !== 'undefined' ? __non_webpack_require__ : require
+      const MailService = __nodeRequire('@sendgrid/mail').MailService
+      const sgMail = new MailService()
+      sgMail.setApiKey(apiKey)
 
-    // SendGrid reads a "Name <email>" string's name verbatim, quotes included,
-    // so a named sender goes as its two parts.
-    const sender = __emailSender({ from, name: fromName })
-    const msg: Record<string, any> = {
-      to: Array.isArray(to) ? to : [to],
-      from: sender.name ? { email: sender.email, name: sender.name } : sender.email,
-      subject,
-      html: body,
-    }
+      // SendGrid reads a "Name <email>" string's name verbatim, quotes included,
+      // so a named sender goes as its two parts.
+      const sender = __emailSender({ from, name: fromName })
+      const msg: Record<string, any> = {
+        to: [to],
+        from: sender.name ? { email: sender.email, name: sender.name } : sender.email,
+        subject,
+        html: body,
+      }
 
-    if (replyTo) {
-      msg.replyTo = replyTo
-    }
-    if (cc) {
-      msg.cc = Array.isArray(cc) ? cc : [cc]
-    }
-    if (bcc) {
-      msg.bcc = Array.isArray(bcc) ? bcc : [bcc]
-    }
+      if (replyTo) {
+        msg.replyTo = replyTo
+      }
+      if (cc) {
+        msg.cc = Array.isArray(cc) ? cc : [cc]
+      }
+      if (bcc) {
+        msg.bcc = Array.isArray(bcc) ? bcc : [bcc]
+      }
 
-    const response = await sgMail.send(msg)
-    const statusCode = response && response[0] && response[0].statusCode
-    const messageId =
-      (response && response[0] && response[0].headers && response[0].headers['x-message-id']) || ''
+      const response = await sgMail.send(msg)
+      const statusCode = response && response[0] && response[0].statusCode
+      const messageId =
+        (response && response[0] && response[0].headers && response[0].headers['x-message-id']) ||
+        ''
 
-    return { messageId, success: statusCode === 202 || statusCode === 200 }
-  } catch (err: unknown) {
-    const error = err as any
-    let message = 'Failed to send email'
-    if (error.response && error.response.body && error.response.body.errors) {
-      message = error.response.body.errors
-        .map(function (e: any) {
-          return e.message
-        })
-        .join(', ')
-    } else if (error.message) {
-      message = error.message
+      return { messageId, success: statusCode === 202 || statusCode === 200 }
+    } catch (err: unknown) {
+      const error = err as any
+      let message = 'Failed to send email'
+      if (error.response && error.response.body && error.response.body.errors) {
+        message = error.response.body.errors
+          .map(function (e: any) {
+            return e.message
+          })
+          .join(', ')
+      } else if (error.message) {
+        message = error.message
+      }
+      return { messageId: '', success: false, error: message }
     }
-    return { messageId: '', success: false, error: message }
   }
+
+  if (recipients.length === 0) {
+    return { messageId: '', success: false, error: 'No recipient' }
+  }
+  if (recipients.length === 1) {
+    return sendTo(recipients[0])
+  }
+  return __emailDeliveries({ recipients, send: sendTo, idKey: 'messageId' })
 }
 export const emailSendgrid: NodeHandlerGenerator = {
   nodeType: 'email-sendgrid',
@@ -73,7 +88,11 @@ export const emailSendgrid: NodeHandlerGenerator = {
   },
   generateHandler(): string {
     return assertHandlerHasNoModuleRefs(
-      handlerToString(email_sendgrid) + '\n' + EmailSender.generateEmailSenderHelperCode(),
+      handlerToString(email_sendgrid) +
+        '\n' +
+        EmailSender.generateEmailSenderHelperCode() +
+        '\n' +
+        EMAIL_RECIPIENTS_HELPER_SOURCE,
       'email-sendgrid'
     )
   },

package/src/nodes/general/general-custom-js.ts

@@ -367,7 +367,8 @@ async function general_custom_js(config: any, context: Record<string, unknown>)
       '"PDF_SERVICE_URL":1,' +
       '"PDF_SERVICE_API_KEY":1,' +
       '"TELEPORT_CRON_SECRET":1,' +
-      '"TELEPORT_CRON_SECRET_PREVIOUS":1' +
+      '"TELEPORT_CRON_SECRET_PREVIOUS":1,' +
+      '"TELEPORT_WALL_SECRET":1' +
       '};\n' +
       // The merchant's payment credentials (see PROTECTED_ENV_NAME_PATTERN in
       // security-scanner.ts), whatever number a second save gave them.

package/src/security-scanner.ts

@@ -29,6 +29,7 @@ export const PROTECTED_ENV_NAMES = [
   'PDF_SERVICE_API_KEY',
   'TELEPORT_CRON_SECRET',
   'TELEPORT_CRON_SECRET_PREVIOUS',
+  'TELEPORT_WALL_SECRET',
 ] as const
 
 /**

package/src/sent-email-log/sent-email-log-code.ts

@@ -348,6 +348,19 @@ function __entryFromNode(nodeType, config, result, error) {
   };
 }
 
+// A node that reached several recipients one provider call each reports a
+// delivery per recipient; the ledger then says who got the email and who was
+// refused, one row per address. Any other result is one row for the node run.
+function __entriesFromNode(nodeType, config, result) {
+  var deliveries = result && Array.isArray(result.deliveries) ? result.deliveries : [];
+  if (deliveries.length === 0) return [__entryFromNode(nodeType, config, result, null)];
+  return deliveries.map(function (delivery) {
+    var entry = __entryFromNode(nodeType, config, delivery, null);
+    entry.to = delivery.to;
+    return entry;
+  });
+}
+
 /**
  * Wraps a server node handler so every send is recorded. The record is
  * registered on the workflow context's fire-and-forget queue — the same one
@@ -368,7 +381,10 @@ function wrapEmailNodeHandler(nodeType, handler) {
       __register(context, recordSentEmail(__entryFromNode(nodeType, config, null, err)));
       throw err;
     }
-    __register(context, recordSentEmail(__entryFromNode(nodeType, config, result, null)));
+    var entries = __entriesFromNode(nodeType, config, result);
+    for (var i = 0; i < entries.length; i++) {
+      __register(context, recordSentEmail(entries[i]));
+    }
     return result;
   };
 }