Update Http::macro to handle correlation ID

Author: KroderDev

README.md

@@ -23,8 +23,8 @@ This package provides a robust foundation for building Laravel-based microservic
 - **Configurable Middleware Aliases & Groups:**  
   Easily enable, disable, or rename middleware via configuration, and use convenient groups like `microservice.auth` group for full authentication and authorization in one step.
 
-- **HTTP Client Macros:**  
-  Pre-configured HTTP clients for communicating with your API Gateway or other services.
+- **HTTP Client Macros:**
+  Pre-configured HTTP clients for communicating with your API Gateway or other services. When a request is available, these macros automatically forward the current correlation ID header.
 
 - **Ready-to-publish Configuration:**  
   All settings are customizable via a single config file, making it easy to adapt the package to your environment.

src/Providers/MicroserviceServiceProvider.php

@@ -80,29 +80,49 @@ public function boot(Router $router): void
 
         // HTTP
         Http::macro('apiGateway', function () {
+            // Correlation ID
+            $header = config('microservice.correlation.header');
+            $correlation = app()->bound('request') ? request()->header($header) : null;
+
             return Http::acceptJson()
+                ->withHeaders($correlation ? [$header => $correlation] : [])
                 ->baseUrl(config('services.api_gateway.url'))
                 ->timeout(5)
                 ->retry(2, 100);
         });
 
         Http::macro('apiGatewayDirect', function () {
+            // Correlation ID
+            $header = config('microservice.correlation.header');
+            $correlation = app()->bound('request') ? request()->header($header) : null;
+
             return Http::acceptJson()
+                ->withHeaders($correlation ? [$header => $correlation] : [])
                 ->baseUrl(config('services.api_gateway.url'))
                 ->timeout(5);
         });
 
         Http::macro('apiGatewayWithToken', function (string $token) {
+            // Correlation ID
+            $header = config('microservice.correlation.header');
+            $correlation = app()->bound('request') ? request()->header($header) : null;
+
             return Http::acceptJson()
                 ->withToken($token)
+                ->withHeaders($correlation ? [$header => $correlation] : [])
                 ->baseUrl(config('services.api_gateway.url'))
                 ->timeout(5)
                 ->retry(2, 100);
         });
 
         Http::macro('apiGatewayDirectWithToken', function (string $token) {
+            // Correlation ID
+            $header = config('microservice.correlation.header');
+            $correlation = app()->bound('request') ? request()->header($header) : null;
+
             return Http::acceptJson()
                 ->withToken($token)
+                ->withHeaders($correlation ? [$header => $correlation] : [])
                 ->baseUrl(config('services.api_gateway.url'))
                 ->timeout(5);
         });

tests/Http/HttpMacrosTest.php

@@ -0,0 +1,50 @@
+<?php
+
+namespace Tests\Http;
+
+use Illuminate\Support\Facades\Http;
+use Illuminate\Support\Facades\Route;
+use Orchestra\Testbench\TestCase;
+
+class HttpMacrosTest extends TestCase
+{
+    protected function getPackageProviders($app)
+    {
+        return [\Kroderdev\LaravelMicroserviceCore\Providers\MicroserviceServiceProvider::class];
+    }
+
+    protected function getEnvironmentSetUp($app)
+    {
+        $app['config']->set('services.api_gateway.url', 'http://gateway.test');
+        $app['config']->set('microservice.correlation.header', 'X-Correlation-ID');
+    }
+
+    /** @test */
+    public function macro_passes_correlation_header()
+    {
+        Http::fake();
+
+        Route::get('/macro', function () {
+            Http::apiGateway()->get('/foo');
+            return response()->json(['ok' => true]);
+        });
+
+        $this->withHeaders(['X-Correlation-ID' => 'corr-123'])->get('/macro')->assertOk();
+
+        Http::assertSent(function ($request) {
+            return $request->hasHeader('X-Correlation-ID', 'corr-123');
+        });
+    }
+
+    /** @test */
+    public function macro_without_request_has_no_header()
+    {
+        Http::fake();
+
+        Http::apiGateway()->get('/foo');
+
+        Http::assertSent(function ($request) {
+            return !$request->hasHeader('X-Correlation-ID');
+        });
+    }
+}