Allow more than one Reply-To contact in order to be compliant with the Mail RFC

email-amazon-ses/src/main/java/io/micronaut/email/ses/SesEmailComposer.java

@@ -96,8 +96,9 @@ private SendEmailRequest sendEmailRequest(@NonNull Email email) {
                 .destination(destinationBuilder(email).build())
                 .source(email.getFrom().getEmail())
                 .message(message(email));
-        if (email.getReplyTo() != null) {
-            requestBuilder = requestBuilder.replyToAddresses(email.getReplyTo().getEmail());
+        if (CollectionUtils.isNotEmpty(email.getReplyToCollection())) {
+            requestBuilder = requestBuilder.replyToAddresses(
+                email.getReplyToCollection().stream().map(Contact::getEmail).toList());
         }
         return requestBuilder.build();
     }

email-amazon-ses/src/test/groovy/io/micronaut/email/ses/SesEmailComposerSpec.groovy

@@ -15,9 +15,9 @@ class SesEmailComposerSpec extends Specification {
 
     void "from, to and subject are put to the mime message"() {
         given:
-        def from = "sender@example.com"
-        def to = "receiver@example.com"
-        def subject = "Apple Music"
+        String from = "sender@example.com"
+        String to = "receiver@example.com"
+        String subject = "Apple Music"
 
         Email email = Email.builder()
                 .from(from)
@@ -26,7 +26,7 @@ class SesEmailComposerSpec extends Specification {
                 .body("Lore ipsum body")
                 .build()
         when:
-        def request = sesEmailComposer.compose(email) as SendEmailRequest
+        SendEmailRequest request = sesEmailComposer.compose(email)
 
         then:
         from == request.source()
@@ -38,10 +38,10 @@ class SesEmailComposerSpec extends Specification {
 
     void "from, to, cc and subject are put to the mime message"() {
         given:
-        def from = "sender@example.com"
-        def to = "receiver@example.com"
-        def cc = "receiver.cc@example.com"
-        def subject = "Apple Music"
+        String from = "sender@example.com"
+        String to = "receiver@example.com"
+        String cc = "receiver.cc@example.com"
+        String subject = "Apple Music"
 
         Email email = Email.builder()
                 .from(from)
@@ -51,7 +51,7 @@ class SesEmailComposerSpec extends Specification {
                 .body("Lore ipsum body")
                 .build()
         when:
-        def request = sesEmailComposer.compose(email) as SendEmailRequest
+        SendEmailRequest request = sesEmailComposer.compose(email)
 
         then:
         from == request.source()
@@ -63,10 +63,10 @@ class SesEmailComposerSpec extends Specification {
 
     void "from, to, bcc and subject are put to the mime message"() {
         given:
-        def from = "sender@example.com"
-        def to = "receiver@example.com"
-        def bcc = "receiver.bcc@example.com"
-        def subject = "Apple Music"
+        String from = "sender@example.com"
+        String to = "receiver@example.com"
+        String bcc = "receiver.bcc@example.com"
+        String subject = "Apple Music"
 
         Email email = Email.builder()
                 .from(from)
@@ -76,7 +76,7 @@ class SesEmailComposerSpec extends Specification {
                 .body("Lore ipsum body")
                 .build()
         when:
-        def request = sesEmailComposer.compose(email) as SendEmailRequest
+        SendEmailRequest request = sesEmailComposer.compose(email)
 
         then:
         from == request.source()
@@ -88,10 +88,10 @@ class SesEmailComposerSpec extends Specification {
 
     void "from, to, reply to and subject are put to the mime message"() {
         given:
-        def from = "sender@example.com"
-        def to = "receiver@example.com"
-        def replyTo = "sender.reply.to@example.com"
-        def subject = "Apple Music"
+        String from = "sender@example.com"
+        String to = "receiver@example.com"
+        String replyTo = "sender.reply.to@example.com"
+        String subject = "Apple Music"
 
         Email email = Email.builder()
                 .from(from)
@@ -101,7 +101,7 @@ class SesEmailComposerSpec extends Specification {
                 .body("Lore ipsum body")
                 .build()
         when:
-        def request = sesEmailComposer.compose(email) as SendEmailRequest
+        SendEmailRequest request = sesEmailComposer.compose(email)
 
         then:
         from == request.source()
@@ -110,4 +110,31 @@ class SesEmailComposerSpec extends Specification {
         subject == request.message().subject().data()
         !request.destination().ccAddresses()
     }
+
+    void "from, to, multiple reply to and subject are put to the mime message"() {
+        given:
+        String from = "sender@example.com"
+        String to = "receiver@example.com"
+        String replyTo1 = "sender.reply.to.one@example.com"
+        String replyTo2 = "sender.reply.to.two@example.com"
+        String subject = "Apple Music"
+
+        Email email = Email.builder()
+                .from(from)
+                .to(to)
+                .replyTo(replyTo1)
+                .replyTo(replyTo2)
+                .subject(subject)
+                .body("Lore ipsum body")
+                .build()
+        when:
+        SendEmailRequest request = sesEmailComposer.compose(email)
+
+        then:
+        from == request.source()
+        [to] == request.destination().toAddresses().toList()
+        [replyTo1, replyTo2] == request.replyToAddresses()
+        subject == request.message().subject().data()
+        !request.destination().ccAddresses()
+    }
 }

email-javamail-composer/src/main/java/io/micronaut/email/javamail/composer/DefaultMessageComposer.java

@@ -45,7 +45,6 @@
 import java.util.EnumMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Stream;
 
 /**
  * {@link io.micronaut.context.annotation.DefaultImplementation} of {@link MessageComposer}.
@@ -84,8 +83,8 @@ public Message compose(@NonNull Email email,
         if (CollectionUtils.isNotEmpty(email.getBcc())) {
             message.setRecipients(Message.RecipientType.BCC, contactAddresses(email.getBcc()));
         }
-        if (null != email.getReplyTo()) {
-            message.setReplyTo(contactAddresses(Stream.of(email.getReplyTo()).toList()));
+        if (CollectionUtils.isNotEmpty(email.getReplyToCollection())) {
+            message.setReplyTo(contactAddresses(email.getReplyToCollection()));
         }
 
         MimeMultipart multipart = new MimeMultipart();

email-javamail-composer/src/test/groovy/io/micronaut/email/javamail/composer/DefaultMessageComposerSpec.groovy

@@ -14,9 +14,9 @@ class DefaultMessageComposerSpec extends Specification {
 
     void "from, to and subject are put to the mime message"() {
         given:
-        def from = "sender@example.com"
-        def to = "receiver@example.com"
-        def subject = "Apple Music"
+        String from = "sender@example.com"
+        String to = "receiver@example.com"
+        String subject = "Apple Music"
 
         Email email = Email.builder()
                 .from(from)
@@ -25,7 +25,7 @@ class DefaultMessageComposerSpec extends Specification {
                 .body("Lore ipsum body")
                 .build()
         when:
-        def message = defaultMessageComposer.compose(email, null)
+        Message message = defaultMessageComposer.compose(email, null)
 
         then:
         [from] == message.from.toList().collect {it.address }
@@ -37,10 +37,10 @@ class DefaultMessageComposerSpec extends Specification {
 
     void "from, to, cc and subject are put to the mime message"() {
         given:
-        def from = "sender@example.com"
-        def to = "receiver@example.com"
-        def cc = "receiver.cc@example.com"
-        def subject = "Apple Music"
+        String from = "sender@example.com"
+        String to = "receiver@example.com"
+        String cc = "receiver.cc@example.com"
+        String subject = "Apple Music"
 
         Email email = Email.builder()
                 .from(from)
@@ -50,7 +50,7 @@ class DefaultMessageComposerSpec extends Specification {
                 .body("Lore ipsum body")
                 .build()
         when:
-        def message = defaultMessageComposer.compose(email, null)
+        Message message = defaultMessageComposer.compose(email, null)
 
         then:
         [from] == message.from.toList().collect {it.address }
@@ -62,10 +62,10 @@ class DefaultMessageComposerSpec extends Specification {
 
     void "from, to, bcc and subject are put to the mime message"() {
         given:
-        def from = "sender@example.com"
-        def to = "receiver@example.com"
-        def bcc = "receiver.bcc@example.com"
-        def subject = "Apple Music"
+        String from = "sender@example.com"
+        String to = "receiver@example.com"
+        String bcc = "receiver.bcc@example.com"
+        String subject = "Apple Music"
 
         Email email = Email.builder()
                 .from(from)
@@ -75,7 +75,7 @@ class DefaultMessageComposerSpec extends Specification {
                 .body("Lore ipsum body")
                 .build()
         when:
-        def message = defaultMessageComposer.compose(email, null)
+        Message message = defaultMessageComposer.compose(email, null)
 
         then:
         [from] == message.from.toList().collect {it.address }
@@ -87,10 +87,10 @@ class DefaultMessageComposerSpec extends Specification {
 
     void "from, to, reply to and subject are put to the mime message"() {
         given:
-        def from = "sender@example.com"
-        def to = "receiver@example.com"
-        def replyTo = "sender.reply.to@example.com"
-        def subject = "Apple Music"
+        String from = "sender@example.com"
+        String to = "receiver@example.com"
+        String replyTo = "sender.reply.to@example.com"
+        String subject = "Apple Music"
 
         Email email = Email.builder()
                 .from(from)
@@ -100,7 +100,7 @@ class DefaultMessageComposerSpec extends Specification {
                 .body("Lore ipsum body")
                 .build()
         when:
-        def message = defaultMessageComposer.compose(email, null)
+        Message message = defaultMessageComposer.compose(email, null)
 
         then:
         [from] == message.from.toList().collect {it.address }
@@ -109,4 +109,31 @@ class DefaultMessageComposerSpec extends Specification {
         subject == message.getSubject()
         !message.getRecipients(Message.RecipientType.CC)
     }
+
+    void "from, to, multiple reply to and subject are put to the mime message"() {
+        given:
+        String from = "sender@example.com"
+        String to = "receiver@example.com"
+        String replyTo1 = "sender.reply.to.one@example.com"
+        String replyTo2 = "sender.reply.to.two@example.com"
+        String subject = "Apple Music"
+
+        Email email = Email.builder()
+                .from(from)
+                .to(to)
+                .replyTo(replyTo1)
+                .replyTo(replyTo2)
+                .subject(subject)
+                .body("Lore ipsum body")
+                .build()
+        when:
+        Message message = defaultMessageComposer.compose(email, null)
+
+        then:
+        [from] == message.from.toList().collect {it.address }
+        [to] == message.getRecipients(Message.RecipientType.TO).toList().collect{it.address}
+        [replyTo1, replyTo2] == message.replyTo.toList().collect {it.address }
+        subject == message.getSubject()
+        !message.getRecipients(Message.RecipientType.CC)
+    }
 }

email-mailjet/build.gradle.kts

@@ -10,4 +10,5 @@ dependencies {
     implementation(mnValidation.micronaut.validation)
     testImplementation(projects.testSuiteUtils)
     testImplementation(mn.micronaut.http)
+    testImplementation(mnSerde.micronaut.serde.jackson)
 }

email-mailjet/src/main/java/io/micronaut/email/mailjet/MailjetEmailComposer.java

@@ -29,6 +29,8 @@
 import jakarta.inject.Singleton;
 import org.json.JSONArray;
 import org.json.JSONObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import jakarta.validation.Valid;
 import jakarta.validation.constraints.NotNull;
@@ -42,11 +44,20 @@
  */
 @Singleton
 public class MailjetEmailComposer implements EmailComposer<MailjetRequest> {
+
+    private static final Logger LOG = LoggerFactory.getLogger(MailjetEmailComposer.class);
+
     @Override
     @NonNull
     public MailjetRequest compose(@NonNull @NotNull @Valid Email email) throws EmailException {
         JSONObject message = new JSONObject();
         message.put(Emailv31.Message.FROM, createJsonObject(email.getFrom()));
+        if (CollectionUtils.isNotEmpty(email.getReplyToCollection())) {
+            if (email.getReplyToCollection().size() > 1 && LOG.isWarnEnabled()) {
+                LOG.warn("Mailjet does not support multiple 'replyTo' addresses (Email has {} replyTo addresses)", email.getReplyToCollection().size());
+            }
+            message.put(Emailv31.Message.REPLYTO, createJsonObject(CollectionUtils.last(email.getReplyToCollection())));
+        }
         to(email).ifPresent(jsonArray -> message.put(Emailv31.Message.TO, jsonArray));
         message.put(Emailv31.Message.SUBJECT, email.getSubject());
         Body body = email.getBody();

email-mailjet/src/test/groovy/io/micronaut/email/mailjet/MailjetEmailComposerSpec.groovy

@@ -0,0 +1,47 @@
+package io.micronaut.email.mailjet
+
+import com.mailjet.client.MailjetRequest
+import io.micronaut.email.Email
+import io.micronaut.json.JsonMapper
+import io.micronaut.test.extensions.spock.annotation.MicronautTest
+import jakarta.inject.Inject
+import spock.lang.Specification
+
+@MicronautTest(startApplication = false)
+class MailjetEmailComposerSpec extends Specification {
+
+    @Inject
+    MailjetEmailComposer mailjetEmailComposer
+
+    @Inject
+    JsonMapper jsonMapper
+
+    void "from, to, only the last reply to and subject are put to the request"() {
+        given:
+        String from = "sender@example.com"
+        String to = "receiver@example.com"
+        String replyTo1 = "sender.reply.to.one@example.com"
+        String replyTo2 = "sender.reply.to.two@example.com"
+        String subject = "Apple Music"
+        String body = "Lore ipsum body"
+
+        Email email = Email.builder()
+                .from(from)
+                .to(to)
+                .replyTo(replyTo1)
+                .replyTo(replyTo2)
+                .subject(subject)
+                .body(body)
+                .build()
+        when:
+        MailjetRequest request = mailjetEmailComposer.compose(email)
+        Map map = jsonMapper.readValue(request.body, Map)
+
+        then:
+        map["Messages"][0]["ReplyTo"]["Email"] == replyTo2
+        map["Messages"][0]["TextPart"] == body
+        map["Messages"][0]["From"]["Email"] == from
+        map["Messages"][0]["To"][0]["Email"] == to
+        map["Messages"][0]["Subject"] == subject
+    }
+}