Merge pull request #136 from Sammyjo20/feature/v2-specific-headers-for-body-traits

Feature | V2 Added headers to body traits

Author: Sammyjo20

src/Traits/Body/HasFormBody.php

@@ -4,6 +4,7 @@
 
 namespace Saloon\Traits\Body;
 
+use Saloon\Contracts\PendingRequest;
 use Saloon\Repositories\Body\FormBodyRepository;
 
 trait HasFormBody
@@ -17,6 +18,17 @@ trait HasFormBody
      */
     protected FormBodyRepository $body;
 
+    /**
+     * Boot the HasFormBody trait
+     *
+     * @param \Saloon\Contracts\PendingRequest $pendingRequest
+     * @return void
+     */
+    public function bootHasFormBody(PendingRequest $pendingRequest): void
+    {
+        $pendingRequest->headers()->add('Content-Type', 'application/x-www-form-urlencoded');
+    }
+
     /**
      * Retrieve the data repository
      *

tests/Feature/Body/HasBodyTest.php

@@ -18,8 +18,11 @@
     $connector = new TestConnector;
     $request = new HasBodyRequest;
 
+    $request->headers()->add('Content-Type', 'application/custom');
+
     $connector->sender()->addMiddleware(function (callable $handler) use ($request) {
         return function (RequestInterface $guzzleRequest, array $options) use ($request) {
+            expect($guzzleRequest->getHeader('Content-Type'))->toEqual(['application/custom']);
             expect((string)$guzzleRequest->getBody())->toEqual((string)$request->body());
 
             return new FulfilledPromise(MockResponse::make()->getPsrResponse());

tests/Feature/Body/HasFormBodyTest.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use Saloon\Http\PendingRequest;
 use Saloon\Http\Faking\MockResponse;
 use Psr\Http\Message\RequestInterface;
 use GuzzleHttp\Promise\FulfilledPromise;
@@ -21,8 +22,13 @@
     $connector = new TestConnector;
     $request = new HasFormBodyRequest;
 
+    $request->middleware()->onRequest(static function (PendingRequest $pendingRequest) {
+        expect($pendingRequest->headers()->get('Content-Type'))->toEqual('application/x-www-form-urlencoded');
+    });
+
     $connector->sender()->addMiddleware(function (callable $handler) use ($request) {
         return function (RequestInterface $guzzleRequest, array $options) use ($request) {
+            expect($guzzleRequest->getHeader('Content-Type'))->toEqual(['application/x-www-form-urlencoded']);
             expect((string)$guzzleRequest->getBody())->toEqual((string)$request->body());
 
             return new FulfilledPromise(MockResponse::make()->getPsrResponse());

tests/Feature/Body/HasJsonBodyTest.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use Saloon\Http\PendingRequest;
 use Saloon\Http\Faking\MockResponse;
 use Psr\Http\Message\RequestInterface;
 use GuzzleHttp\Promise\FulfilledPromise;
@@ -32,8 +33,13 @@
     $connector = new TestConnector;
     $request = new HasJsonBodyRequest;
 
+    $request->middleware()->onRequest(static function (PendingRequest $pendingRequest) {
+        expect($pendingRequest->headers()->get('Content-Type'))->toEqual('application/json');
+    });
+
     $connector->sender()->addMiddleware(function (callable $handler) use ($request) {
         return function (RequestInterface $guzzleRequest, array $options) use ($request) {
+            expect($guzzleRequest->getHeader('Content-Type'))->toEqual(['application/json']);
             expect((string)$guzzleRequest->getBody())->toEqual((string)$request->body());
 
             return new FulfilledPromise(MockResponse::make()->getPsrResponse());

tests/Feature/Body/HasMultipartBodyTest.php

@@ -23,6 +23,7 @@
 
     $connector->sender()->addMiddleware(function (callable $handler) use ($request) {
         return function (RequestInterface $guzzleRequest, array $options) use ($request) {
+            expect($guzzleRequest->getHeader('Content-Type')[0])->toContain('multipart/form-data; boundary=');
             expect((string)$guzzleRequest->getBody())->toContain(
                 'X-Saloon: Yee-haw!',
                 'Content-Disposition: form-data; name="nickname"; filename="user.txt"',

tests/Feature/Body/HasXmlBodyTest.php

@@ -2,6 +2,7 @@
 
 declare(strict_types=1);
 
+use Saloon\Http\PendingRequest;
 use Saloon\Http\Faking\MockResponse;
 use Psr\Http\Message\RequestInterface;
 use GuzzleHttp\Promise\FulfilledPromise;
@@ -26,8 +27,13 @@
     $connector = new TestConnector;
     $request = new HasXmlBodyRequest;
 
+    $request->middleware()->onRequest(static function (PendingRequest $pendingRequest) {
+        expect($pendingRequest->headers()->get('Content-Type'))->toEqual('application/xml');
+    });
+
     $connector->sender()->addMiddleware(function (callable $handler) use ($request) {
         return function (RequestInterface $guzzleRequest, array $options) use ($request) {
+            expect($guzzleRequest->getHeader('Content-Type'))->toEqual(['application/xml']);
             expect((string)$guzzleRequest->getBody())->toEqual((string)$request->body());
 
             return new FulfilledPromise(MockResponse::make()->getPsrResponse());

tests/Feature/Oauth2/AuthCodeFlowConnectorTest.php

@@ -152,6 +152,7 @@
     expect($pendingRequest->headers()->all())->toEqual([
         'Accept' => 'application/json',
         'Authorization' => 'Bearer access',
+        'Content-Type' => 'application/x-www-form-urlencoded',
     ]);
 });