From be9ee9324c6dc869c6afc41dce7c1c228e1b0fc9 Mon Sep 17 00:00:00 2001
From: Ben Hardill <ben@flowforge.com>
Date: Mon, 15 Jul 2024 13:44:20 +0100
Subject: [PATCH] add fromArn

---
 docs/install/configuration.md | 5 +++--
 forge/postoffice/index.js     | 3 ++-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/install/configuration.md b/docs/install/configuration.md
index bc39c47d8f..8c47d65b57 100644
--- a/docs/install/configuration.md
+++ b/docs/install/configuration.md
@@ -139,8 +139,9 @@ This assumes that the instance is running with a Service Account that has a AWS
 
 Option        | Description
 --------------|------------
-`email.ses.region` | The AWS region to connect to
-`email.ses.sourceArn` | The AWS ARN of a Identity to send email as
+`email.ses.region` | The AWS region to connect to. Default `unset`
+`email.ses.sourceArn` | The AWS ARN of a SES Identity to send email as. Default: `unset`
+`email.ses.fromArn` | The AWS ARN of a SES Identity to set as the from field. Default to value of `email.ses.sourceArn`
 
 
 ## Telemetry configuration
diff --git a/forge/postoffice/index.js b/forge/postoffice/index.js
index 550552ddd9..744c7ede9d 100644
--- a/forge/postoffice/index.js
+++ b/forge/postoffice/index.js
@@ -83,7 +83,8 @@ module.exports = fp(async function (app, _opts) {
 
                 if (sesConfig.sourceArn) {
                     mailDefaults.ses = {
-                        sourceArn: sesConfig.sourceArn
+                        SourceArn: sesConfig.sourceArn,
+                        FromArn: sesConfig.FromArn ? sesConfig.FromArn: sesConfig.sourceArn
                     }
                 }