From d00730bc8bcced561d600ac31dce6f2ccdb4ffc2 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Fri, 29 Mar 2024 07:43:19 +1100
Subject: [PATCH] Updates for postmark webhook processing

---
 app/Jobs/PostMark/ProcessPostmarkWebhook.php | 26 +++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/app/Jobs/PostMark/ProcessPostmarkWebhook.php b/app/Jobs/PostMark/ProcessPostmarkWebhook.php
index 1664cbafdcc7..61637cdea6ea 100644
--- a/app/Jobs/PostMark/ProcessPostmarkWebhook.php
+++ b/app/Jobs/PostMark/ProcessPostmarkWebhook.php
@@ -359,6 +359,20 @@ class ProcessPostmarkWebhook implements ShouldQueue
 
         $postmark = new PostmarkClient($postmark_secret);
         $messageDetail = $postmark->getOutboundMessageDetails($message_id);
+
+
+        try {
+            $messageDetail = $postmark->getOutboundMessageDetails($message_id);
+        } catch(\Exception $e) {
+
+            $postmark_secret = config('services.postmark-outlook.token');
+            $postmark = new PostmarkClient($postmark_secret);
+            $messageDetail = $postmark->getOutboundMessageDetails($message_id);
+
+        }
+
+
+
         return $messageDetail;
 
     }
@@ -391,7 +405,17 @@ class ProcessPostmarkWebhook implements ShouldQueue
             $postmark_secret = !empty($this->company->settings->postmark_secret) ? $this->company->settings->postmark_secret : config('services.postmark.token');
 
             $postmark = new PostmarkClient($postmark_secret);
-            $messageDetail = $postmark->getOutboundMessageDetails($this->request['MessageID']);
+
+            try {
+                $messageDetail = $postmark->getOutboundMessageDetails($this->request['MessageID']);
+            }
+            catch(\Exception $e){
+
+                $postmark_secret = config('services.postmark-outlook.token');
+                $postmark = new PostmarkClient($postmark_secret);
+                $messageDetail = $postmark->getOutboundMessageDetails($this->request['MessageID']);
+
+            }
 
             $recipients = collect($messageDetail['recipients'])->flatten()->implode(',');
             $subject = $messageDetail->subject ?? '';