Fixes #6 invalid endpoint issue (#7)

CallumEddisford · Chris Smith · commit 5aad471fc9f7 · 2019-10-28T16:58:04.000Z
* Fixes #6 invalid endpoint issue * Corrected exception handling. Uses Content-Type header vs Accept * Fixed how Personalization object is built * Fixed sniff violation * Fixes recipients personalisation formatting * Fixed how the ApiClient forms the requests * Fixed test failures
diff --git a/README.md b/README.md
@@ -48,12 +48,12 @@ composer require xedi/sendgrid
     use Xedi\SendGrid\SendGrid;
 
     SendGrid::setClient(
-        SendGrid::getApiClient($api_key);
+        SendGrid::getApiClient($api_key)
     );
 
     ($mailable = SendGrid::prepareMail())
         ->setSender('you@email.com', 'Joe Blogs')
-        ->setSubject('Checkout XEDI\'s SendGrid libray!')
+        ->setSubject('Checkout XEDI\'s SendGrid library!')
         ->addTextContent('Hey,\n\rI found this great SendGrid library!')
         ->addHtmlContent('<body>Hey,<br/>I found this great SendGrid library!</body>')
         ->addRecipient('john.smith@email.com', 'John Smith');
diff --git a/lib/Clients/ApiClient.php b/lib/Clients/ApiClient.php
@@ -41,7 +41,7 @@ public function __construct(string $api_key, array $options = [])
         $this->client = new GuzzleClient(
             array_merge(
                 [
-                    'base_uri' => 'https://api.sendgrid.com/v3',
+                    'base_uri' => 'https://api.sendgrid.com',
                     'headers' => [
                         'Authorization' => "Bearer $api_key",
                         'Content-Type' => 'application/json'
@@ -139,16 +139,14 @@ protected function makeRequest(
             $response = $this->client->request(
                 $method,
                 $uri,
-                array_merge(
-                    [
-                        'headers' => $headers
-                    ],
-                    $data
-                )
+                [
+                    'headers' => $headers,
+                    'json' => $data
+                ]
             );
 
             return new HttpResponse(
-                (string) $response->getBody(),
+                (string)$response->getBody(),
                 $response->getStatusCode(),
                 $response->getHeaders()
             );
diff --git a/lib/Clients/Concerns/HandlesExceptions.php b/lib/Clients/Concerns/HandlesExceptions.php
@@ -70,7 +70,7 @@ private function handleBadRequestException(ClientException $exception)
     {
         $response = $exception->getResponse();
 
-        if (! in_array('application/json', $response->getHeader('Accept'))) {
+        if (! in_array('application/json', $response->getHeader('Content-Type'))) {
             return new UndecodedClientException($exception);
         }
 
diff --git a/lib/Mail/Concerns/HasRecipients.php b/lib/Mail/Concerns/HasRecipients.php
@@ -107,15 +107,17 @@ public function validateRecipients()
      */
     public function buildRecipients(): array
     {
-         return [
+        return [
             'personalizations' => [
-                'to' => array_map(
-                    function ($recipient) {
-                        return $recipient->toArray();
-                    },
-                    $this->recipients
-                )
+                [
+                    "to" => array_map(
+                        function ($recipient) {
+                            return $recipient->toArray();
+                        },
+                        $this->recipients
+                    )
+                ]
             ]
-         ];
+        ];
     }
 }
diff --git a/lib/Mail/Mail.php b/lib/Mail/Mail.php
@@ -55,6 +55,6 @@ public function send(Client $client): Response
             $this->buildSubject()
         );
 
-        return $client->post('mail/send', $data);
+        return $client->post('v3/mail/send', $data);
     }
 }
diff --git a/tests/Integration/SendEmailTest.php b/tests/Integration/SendEmailTest.php
@@ -146,7 +146,7 @@ private function getMockErrorResponse(array $errors)
         return new Response(
             400,
             [
-                'Accept' => 'application/json',
+                'Content-Type' => 'application/json',
             ],
             json_encode(
                 [
diff --git a/tests/Unit/Clients/ApiClient/MakeRequestTest.php b/tests/Unit/Clients/ApiClient/MakeRequestTest.php
@@ -43,7 +43,7 @@ public function catchesConnectionExceptions()
         ($mock_guzzle_client = Mockery::mock(GuzzleClient::class))
             ->shouldReceive('request')
             ->once()
-            ->with('GET', 'an/endpoint', [ 'headers' => [] ])
+            ->with('GET', 'an/endpoint', [ 'headers' => [], 'json' => [] ])
             ->andThrows($mock_exception);
 
         $api_client = (new ReflectionClass(ApiClient::class))
@@ -75,7 +75,7 @@ public function catchesThrowableExceptions()
         ($mock_guzzle_client = Mockery::mock(GuzzleClient::class))
             ->shouldReceive('request')
             ->once()
-            ->with('GET', 'an/endpoint', [ 'headers' => [] ])
+            ->with('GET', 'an/endpoint', [ 'headers' => [], 'json' => [] ])
             ->andThrows($mock_exception);
 
         $api_client = (new ReflectionClass(ApiClient::class))
diff --git a/tests/Unit/Clients/Concerns/HandlesExceptions/HandleBadRequestExceptionTest.php b/tests/Unit/Clients/Concerns/HandlesExceptions/HandleBadRequestExceptionTest.php
@@ -27,7 +27,7 @@ public function unableToDecodeException()
         ($mock_response = Mockery::mock(ResponseInterface::class))
             ->shouldReceive('getHeader')
             ->once()
-            ->with('Accept')
+            ->with('Content-Type')
             ->andReturn(['text/plain']);
 
         ($mock_exception = Mockery::mock(ClientException::class))
@@ -49,7 +49,7 @@ public function failedToDecodeException()
         ($mock_response = Mockery::mock(ResponseInterface::class))
             ->shouldReceive('getHeader')
             ->once()
-            ->with('Accept')
+            ->with('Content-Type')
             ->andReturn(['application/json']);
 
         $mock_response->shouldReceive('getBody')
@@ -75,7 +75,7 @@ public function handlesUnknownException()
         ($mock_response = Mockery::mock(ResponseInterface::class))
             ->shouldReceive('getHeader')
             ->once()
-            ->with('Accept')
+            ->with('Content-Type')
             ->andReturn(['application/json']);
 
         $mock_response->shouldReceive('getBody')
@@ -102,7 +102,7 @@ public function handlesSendGridError($error, $exception_class)
         ($mock_response = Mockery::mock(ResponseInterface::class))
             ->shouldReceive('getHeader')
             ->once()
-            ->with('Accept')
+            ->with('Content-Type')
             ->andReturn(['application/json']);
 
         $mock_response->shouldReceive('getBody')
@@ -158,7 +158,7 @@ public function handlesMultipleDomainErrors()
         ($mock_response = Mockery::mock(ResponseInterface::class))
             ->shouldReceive('getHeader')
             ->once()
-            ->with('Accept')
+            ->with('Content-Type')
             ->andReturn(['application/json']);
 
         $errors = array_map(

Original file line number	Diff line number	Diff line change
`@@ -70,7 +70,7 @@ private function handleBadRequestException(ClientException $exception)`
`70`	`70`	`{`
`71`	`71`	`$response = $exception->getResponse();`
`72`	`72`
`73`		`- if (! in_array('application/json', $response->getHeader('Accept'))) {`
	`73`	`+ if (! in_array('application/json', $response->getHeader('Content-Type'))) {`
`74`	`74`	`return new UndecodedClientException($exception);`
`75`	`75`	`}`
`76`	`76`
Original file line number	Diff line number	Diff line change
`@@ -55,6 +55,6 @@ public function send(Client $client): Response`
`55`	`55`	`$this->buildSubject()`
`56`	`56`	`);`
`57`	`57`
`58`		`- return $client->post('mail/send', $data);`
	`58`	`+ return $client->post('v3/mail/send', $data);`
`59`	`59`	`}`
`60`	`60`	`}`
Original file line number	Diff line number	Diff line change
`@@ -146,7 +146,7 @@ private function getMockErrorResponse(array $errors)`
`146`	`146`	`return new Response(`
`147`	`147`	`400,`
`148`	`148`	`[`
`149`		`- 'Accept' => 'application/json',`
	`149`	`+ 'Content-Type' => 'application/json',`
`150`	`150`	`],`
`151`	`151`	`json_encode(`
`152`	`152`	`[`