always handle SendingSaloonRequest, even if the HTTP Client global request middleware was added manually

Author: onlime

README.md

@@ -185,7 +185,7 @@ So, my recommendation: If you need global logging without any extra configuratio
 
   - No obfuscation of query params, e.g. on a POST request to an OAuth2 token endpoint.
 
-  - Obfuscation currently only works in variant 1 or 3 (global logging).
+  - Obfuscation currently only works in variant 1 or 3 (global logging), and only on requests, not yet on response data.
 
 
 ## Testing

src/EventHelper.php

@@ -13,18 +13,20 @@
 
 class EventHelper
 {
-    public static function shouldBeLogged($event): bool
+    public static function shouldBeLogged(object $event): bool
     {
+        // Do not log Saloon requests if Saloon is configured to use Laravel's HTTP Client (HttpSender) unless the
+        // Saloon request is mocked (has a MockClient). Like this, we prevent duplicate logging of Saloon requests,
+        // as we're also listening to Laravel's HTTP Client events RequestSending and ResponseReceived.
         if ($event instanceof SendingSaloonRequest || $event instanceof SentSaloonRequest) {
             $saloonUsesHttpSender = config('saloon.default_sender') === HttpSender::class;
-
             return $event->pendingRequest->hasMockClient() || ! $saloonUsesHttpSender;
         }
 
         return true;
     }
 
-    public static function getPsrRequest($event): RequestInterface
+    public static function getPsrRequest(object $event): RequestInterface
     {
         return match (true) {
             $event instanceof RequestSending || $event instanceof ResponseReceived => $event->request->toPsrRequest(),
@@ -33,7 +35,7 @@ public static function getPsrRequest($event): RequestInterface
         };
     }
 
-    public static function getPsrResponse($event): ResponseInterface
+    public static function getPsrResponse(object $event): ResponseInterface
     {
         return match (true) {
             $event instanceof ResponseReceived => $event->response->toPsrResponse(),

src/Listeners/LogRequestSending.php

@@ -13,13 +13,16 @@
 class LogRequestSending
 {
     /**
-     * Handle the event if the middleware was not added manually.
+     * Handle the event if the HTTP Client global request middleware was not added manually
+     * with HttpClientLogger::addRequestMiddleware(). Always handle it for Saloon requests.
      */
     public function handle(RequestSending|SendingSaloonRequest $event): void
     {
-        if (! HttpClientLogger::requestMiddlewareWasAdded()) {
-            $this->handleEvent($event);
+        if ($event instanceof RequestSending && HttpClientLogger::requestMiddlewareWasAdded()) {
+            return;
         }
+
+        $this->handleEvent($event);
     }
 
     /**

src/Listeners/LogResponseReceived.php

@@ -12,10 +12,8 @@ class LogResponseReceived
 {
     /**
      * Handle the event.
-     *
-     * @return void
      */
-    public function handle(ResponseReceived|SentSaloonRequest $event)
+    public function handle(ResponseReceived|SentSaloonRequest $event): void
     {
         if (! EventHelper::shouldBeLogged($event)) {
             return;
@@ -24,7 +22,7 @@ public function handle(ResponseReceived|SentSaloonRequest $event)
         $formatter = new MessageFormatter(config('http-client-global-logger.format.response'));
         Log::channel(config('http-client-global-logger.channel'))->info($formatter->format(
             EventHelper::getPsrRequest($event),
-            EventHelper::getPsrResponse($event)
+            EventHelper::getPsrResponse($event),
         ));
     }
 }