From 4d0473c22c25216710b65e70659afcd7f6ea752d Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Sun, 14 Aug 2022 16:50:49 +0100
Subject: [PATCH] Reference email image by cid for self hosted instances
 (#3957)

---
 server/emails/mailer.tsx                      | 10 ++++++++++
 server/emails/templates/components/Header.tsx |  7 ++++++-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/server/emails/mailer.tsx b/server/emails/mailer.tsx
index 25e3fde07..669d00388 100644
--- a/server/emails/mailer.tsx
+++ b/server/emails/mailer.tsx
@@ -5,6 +5,7 @@ import Logger from "@server/logging/Logger";
 import { APM } from "@server/logging/tracing";
 import { baseStyles } from "./templates/components/EmailLayout";
 
+const isCloudHosted = env.DEPLOYMENT === "hosted";
 const useTestEmailService =
   env.ENVIRONMENT === "development" && !env.SMTP_USERNAME;
 
@@ -77,6 +78,15 @@ export class Mailer {
         subject: data.subject,
         html,
         text: data.text,
+        attachments: isCloudHosted
+          ? undefined
+          : [
+              {
+                filename: "header-logo.png",
+                path: process.cwd() + "/public/email/header-logo.png",
+                cid: "header-image",
+              },
+            ],
       });
 
       if (useTestEmailService) {
diff --git a/server/emails/templates/components/Header.tsx b/server/emails/templates/components/Header.tsx
index 6bcda48d0..768aa2b0f 100644
--- a/server/emails/templates/components/Header.tsx
+++ b/server/emails/templates/components/Header.tsx
@@ -4,6 +4,7 @@ import env from "@server/env";
 import EmptySpace from "./EmptySpace";
 
 const url = env.CDN_URL ?? env.URL;
+const isCloudHosted = env.DEPLOYMENT === "hosted";
 
 export default () => {
   return (
@@ -14,7 +15,11 @@ export default () => {
             <EmptySpace height={40} />
             <img
               alt="Outline"
-              src={`${url}/email/header-logo.png`}
+              src={
+                isCloudHosted
+                  ? `${url}/email/header-logo.png`
+                  : "cid:header-image"
+              }
               height="48"
               width="48"
             />