From 8fe8aad6a77bbec7a26c87f8bad9593852e8d464 Mon Sep 17 00:00:00 2001
From: pemontto <939704+pemontto@users.noreply.github.com>
Date: Fri, 19 May 2023 13:31:02 +0100
Subject: [PATCH] feat(Send Email Node): Add content-id for email attachments
 (#3632)

---
 packages/nodes-base/nodes/EmailSend/v2/send.operation.ts | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
index 330aa7c7b..0c2dda97e 100644
--- a/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
+++ b/packages/nodes-base/nodes/EmailSend/v2/send.operation.ts
@@ -3,7 +3,9 @@ import type {
 	IExecuteFunctions,
 	INodeExecutionData,
 	INodeProperties,
+	JsonObject,
 } from 'n8n-workflow';
+import { NodeApiError } from 'n8n-workflow';
 
 import { createTransport } from 'nodemailer';
 import type SMTPTransport from 'nodemailer/lib/smtp-transport';
@@ -100,7 +102,7 @@ const properties: INodeProperties[] = [
 				type: 'string',
 				default: '',
 				description:
-					'Name of the binary properties that contain data to add to email as attachment. Multiple ones can be comma-separated.',
+					'Name of the binary properties that contain data to add to email as attachment. Multiple ones can be comma-separated. Reference embedded images or other content within the body of an email message, e.g. &lt;img src="cid:image_1"&gt;',
 			},
 			{
 				displayName: 'CC Email',
@@ -227,6 +229,7 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 					attachments.push({
 						filename: binaryData.fileName || 'unknown',
 						content: await this.helpers.getBinaryDataBuffer(itemIndex, propertyName),
+						cid: propertyName,
 					});
 				}
 
@@ -255,7 +258,8 @@ export async function execute(this: IExecuteFunctions): Promise<INodeExecutionDa
 				});
 				continue;
 			}
-			throw error;
+			delete error.cert;
+			throw new NodeApiError(this.getNode(), error as JsonObject);
 		}
 	}