WIP

Author: bilfeldt

src/Middleware/CorrelationIdMiddleware.php

@@ -16,10 +16,20 @@ class CorrelationIdMiddleware
      */
     public function handle(Request $request, Closure $next)
     {
+        $correlationId = $this->getCorrelationId($request);
+
+        $request->headers->set('Correlation-ID', $correlationId, true);
+
         $response = $next($request);
 
-        $response->headers->set('Correlation-ID', $request->getUniqueId(), true); // This is available on all Response types whereas $request->header() is only available in \Illuminate\Http\Response
+        $response->headers->set('Correlation-ID', $correlationId, true); // This is available on all Response types whereas $response->header() is only available in \Illuminate\Http\Response
 
         return $response;
     }
+
+    private function getCorrelationId(Request $request): string
+    {
+        return $request->getUniqueId();
+    }
+
 }

src/Middleware/LogRequestMiddleware.php

@@ -30,7 +30,7 @@ public function handle(Request $request, Closure $next, string ...$drivers)
         $response = $next($request);
 
         if ($header = config('request-logger.header')) {
-            $response->headers->set($header, $requestId, true); // This is available on all Response types whereas $request->header() is only available in \Illuminate\Http\Response
+            $response->headers->set($header, $requestId, true); // This is available on all Response types whereas $response->header() is only available in \Illuminate\Http\Response
         }
 
         return $response;

tests/Unit/CorrelationIdMiddlewareTest.php

@@ -9,17 +9,28 @@
 
 class CorrelationIdMiddlewareTest extends TestCase
 {
-    public function test_adds_response_header(): void
+    public function test_adds_request_header(): void
     {
-        $this->assertEquals('Correlation-ID', config('request-logger.header'));
+        $request = new Request();
+
+        (new CorrelationIdMiddleware())->handle($request, function ($request) {
+
+            $this->assertTrue($request->headers->has('Correlation-ID'));
+            $this->assertEquals($request, $request->header('Correlation-ID'));
+
+            return new Response();
+        });
+    }
 
+    public function test_adds_response_header(): void
+    {
         $request = new Request();
 
-        $response1 = (new CorrelationIdMiddleware())->handle($request, function ($request) {
+        $response = (new CorrelationIdMiddleware())->handle($request, function ($request) {
             return new Response();
         });
 
-        $this->assertTrue($response1->headers->has('Correlation-ID'));
-        $this->assertEquals($request->getUniqueId(), $response1->headers->get('Correlation-ID'));
+        $this->assertTrue($response->headers->has('Correlation-ID'));
+        $this->assertEquals($response, $request->header('Correlation-ID'));
     }
 }