From 74f4e9b2d8e61e5f4fad0d2d15ad3a13c8b3fbe4 Mon Sep 17 00:00:00 2001
From: Niclas Thobaben <niclas.thobaben@nclazz.de>
Date: Fri, 25 Feb 2022 15:51:43 +0100
Subject: [PATCH 1/2] Added 'Send via..' footer in mail #20

---
 .../mailrelay/adapter/mail/MailMessageForwarder.java | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/src/main/java/de/nclazz/service/mailrelay/adapter/mail/MailMessageForwarder.java b/src/main/java/de/nclazz/service/mailrelay/adapter/mail/MailMessageForwarder.java
index 2ac902b..2b7fee9 100644
--- a/src/main/java/de/nclazz/service/mailrelay/adapter/mail/MailMessageForwarder.java
+++ b/src/main/java/de/nclazz/service/mailrelay/adapter/mail/MailMessageForwarder.java
@@ -34,9 +34,19 @@ public class MailMessageForwarder implements MessageForwarder {
         mimeMessageHelper.setReplyTo(from);
         mimeMessageHelper.setTo(receivers.toArray(new String[0]));
         mimeMessageHelper.setSubject(subject);
-        mimeMessageHelper.setText(content);
+        mimeMessageHelper.setText(formatMail(content));
 
         this.javaMailSender.send(mimeMessage);
     }
 
+    private String formatMail(String content) {
+        StringBuilder sb = new StringBuilder(content);
+
+        sb.append("\n\n")
+                .append("-----------------------------------\n")
+                .append("Send via nclazz mail relay");
+
+        return sb.toString();
+    }
+
 }

From dd23dfca8ede62a0fc7b8573ac49e79c904782e1 Mon Sep 17 00:00:00 2001
From: Niclas Thobaben <niclas.thobaben@nclazz.de>
Date: Fri, 25 Feb 2022 15:55:38 +0100
Subject: [PATCH 2/2] Enable usage of relative urls by prepending referer on
 relative paths

---
 .../mailrelay/adapter/web/MessageFormController.java  | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/java/de/nclazz/service/mailrelay/adapter/web/MessageFormController.java b/src/main/java/de/nclazz/service/mailrelay/adapter/web/MessageFormController.java
index 5c0eee1..b7db2e1 100644
--- a/src/main/java/de/nclazz/service/mailrelay/adapter/web/MessageFormController.java
+++ b/src/main/java/de/nclazz/service/mailrelay/adapter/web/MessageFormController.java
@@ -47,7 +47,7 @@ public class MessageFormController {
             redirect = form.getOnSuccess();
         }
 
-        return "redirect:" + redirect;
+        return "redirect:" + addRefererToRelativeUrl(referer, redirect);
     }
 
     private String formatErrorRedirect(String referer, MessageForm form, BindingResult bindingResult) {
@@ -58,7 +58,14 @@ public class MessageFormController {
                 .collect(Collectors.joining("&"));
         String origin = form.getOnError() != null ? form.getOnError() : referer;
 
-        return origin + "?" + queryParams;
+        return addRefererToRelativeUrl(referer, origin) + "?" + queryParams;
+    }
+
+    private String addRefererToRelativeUrl(String referer, String url) {
+        if(!url.startsWith("/")) {
+            return url;
+        }
+        return referer + url;
     }
 
     private static String mapValidationErrorToQueryParam(ValidationError error) {