[Notification] fix postmark from

getparthenon · Jun 19, 2024 · a6df198 · a6df198
1 parent 583633c
commit a6df198
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Parthenon/Notification/Sender/PostmarkEmailSender.php b/src/Parthenon/Notification/Sender/PostmarkEmailSender.php
@@ -22,6 +22,7 @@
 namespace Parthenon\Notification\Sender;
 
 use Parthenon\Common\LoggerAwareTrait;
+use Parthenon\Notification\Configuration;
 use Parthenon\Notification\EmailInterface;
 use Parthenon\Notification\EmailSenderInterface;
 use Parthenon\Notification\Exception\UnableToSendMessageException;
@@ -32,7 +33,7 @@ final class PostmarkEmailSender implements EmailSenderInterface
 {
     use LoggerAwareTrait;
 
-    public function __construct(private PostmarkClient $postmarkClient)
+    public function __construct(private PostmarkClient $postmarkClient, private Configuration $configuration)
     {
     }
 
@@ -42,10 +43,11 @@ public function send(EmailInterface $message)
         foreach ($message->getAttachments() as $attachment) {
             $attachments[] = PostmarkAttachment::fromRawData($attachment->getContent(), $attachment->getName());
         }
+        $from = $message->getFromAddress() ?? $this->configuration->getFromAddress();
 
         $email = [
             'To' => $message->getToAddress(),
-            'From' => $message->getFromAddress(),
+            'From' => $from,
             'Subject' => $message->getSubject(),
             'Attachments' => $attachments,
         ];

diff --git a/src/Parthenon/Resources/config/services/notification.xml b/src/Parthenon/Resources/config/services/notification.xml
@@ -77,6 +77,7 @@
 
         <service id="parthenon.notification.third_party.postmark_client" class="Postmark\PostmarkClient">
             <argument>%parthenon_notification_email_postmark_apikey%</argument>
+            <argument type="service" id="Parthenon\Notification\Configuration" />
         </service>
         <service id="Parthenon\Notification\Sender\PostmarkEmailSender" class="Parthenon\Notification\Sender\PostmarkEmailSender">
             <argument type="service" id="parthenon.notification.third_party.postmark_client" />