Merge pull request rails#52734 from jorge-d/fix/postmark_inbound_original_recipient

Implement postmark conversion of OriginalRecipient to X-Original-To

Author: rafaelfranca

actionmailbox/app/controllers/action_mailbox/ingresses/postmark/inbound_emails_controller.rb

@@ -49,7 +49,7 @@ class Ingresses::Postmark::InboundEmailsController < ActionMailbox::BaseControll
     param_encoding :create, "RawEmail", Encoding::ASCII_8BIT
 
     def create
-      ActionMailbox::InboundEmail.create_and_extract_message_id! params.require("RawEmail")
+      ActionMailbox::InboundEmail.create_and_extract_message_id! mail
     rescue ActionController::ParameterMissing => error
       logger.error <<~MESSAGE
         #{error.message}
@@ -59,5 +59,12 @@ def create
       MESSAGE
       head :unprocessable_entity
     end
+
+    private
+      def mail
+        params.require("RawEmail").tap do |raw_email|
+          raw_email.prepend("X-Original-To: ", params.require("OriginalRecipient"), "\n") if params.key?("OriginalRecipient")
+        end
+      end
   end
 end

actionmailbox/test/controllers/ingresses/postmark/inbound_emails_controller_test.rb

@@ -31,6 +31,22 @@ class ActionMailbox::Ingresses::Postmark::InboundEmailsControllerTest < ActionDi
     assert_equal "[email protected]", inbound_email.message_id
   end
 
+  test "add X-Original-To to email from Postmark" do
+    assert_difference -> { ActionMailbox::InboundEmail.count }, +1 do
+      post rails_postmark_inbound_emails_url,
+        headers: { authorization: credentials }, params: {
+          RawEmail: file_fixture("../files/welcome.eml").read,
+          OriginalRecipient: "[email protected]",
+        }
+    end
+
+    assert_response :no_content
+
+    inbound_email = ActionMailbox::InboundEmail.last
+    mail = Mail.from_source(inbound_email.raw_email.download)
+    assert_equal "[email protected]", mail.header["X-Original-To"].decoded
+  end
+
   test "rejecting when RawEmail param is missing" do
     assert_no_difference -> { ActionMailbox::InboundEmail.count } do
       post rails_postmark_inbound_emails_url,