Merge pull request #36 from LadySolveig/3.x/contect-header-response

Fix: case insesitive Content-Type header check for json response

Author: rdeutz

Tests/ClientTest.php

@@ -9,6 +9,7 @@
 
 use Joomla\Application\WebApplicationInterface;
 use Joomla\Http\Http;
+use Joomla\Http\Response;
 use Joomla\Input\Input;
 use Joomla\OAuth2\Client;
 use Joomla\Registry\Registry;
@@ -34,7 +35,7 @@ class ClientTest extends TestCase
      *
      * @var  Http|MockObject
      */
-    protected $client;
+    protected $http;
 
     /**
      * The input object to use in retrieving GET/POST data.
@@ -348,11 +349,7 @@ public function testRefreshTokenJson()
      */
     public function encodedGrantOauthCallback($url, $data, ?array $headers = null, $timeout = null)
     {
-        $response = new \stdClass();
-
-        $response->code    = 200;
-        $response->headers = ['Content-Type' => 'x-www-form-urlencoded'];
-        $response->body    = 'access_token=accessvalue&refresh_token=refreshvalue&expires_in=3600';
+        $response = new Response('data://text/plain,access_token=accessvalue&refresh_token=refreshvalue&expires_in=3600', 200, ['Content-Type' => 'x-www-form-urlencoded']);
 
         return $response;
     }
@@ -369,11 +366,7 @@ public function encodedGrantOauthCallback($url, $data, ?array $headers = null, $
      */
     public function jsonGrantOauthCallback($url, $data, ?array $headers = null, $timeout = null)
     {
-        $response = new \stdClass();
-
-        $response->code    = 200;
-        $response->headers = ['Content-Type' => 'application/json'];
-        $response->body    = '{"access_token":"accessvalue","refresh_token":"refreshvalue","expires_in":3600}';
+        $response = new Response('data://text/plain,{"access_token":"accessvalue","refresh_token":"refreshvalue","expires_in":3600}', 200, ['Content-Type' => 'application/json']);
 
         return $response;
     }
@@ -390,11 +383,7 @@ public function jsonGrantOauthCallback($url, $data, ?array $headers = null, $tim
      */
     public function queryOauthCallback($url, $data, ?array $headers = null, $timeout = null)
     {
-        $response = new \stdClass();
-
-        $response->code    = 200;
-        $response->headers = ['Content-Type' => 'text/html'];
-        $response->body    = 'Lorem ipsum dolor sit amet.';
+        $response = new Response('data://text/plain,Lorem ipsum dolor sit amet.', 200, ['Content-Type' => 'text/html']);
 
         return $response;
     }
@@ -410,11 +399,7 @@ public function queryOauthCallback($url, $data, ?array $headers = null, $timeout
      */
     public function getOauthCallback($url, ?array $headers = null, $timeout = null)
     {
-        $response = new \stdClass();
-
-        $response->code    = 200;
-        $response->headers = ['Content-Type' => 'text/html'];
-        $response->body    = 'Lorem ipsum dolor sit amet.';
+        $response = new Response('data://text/plain,Lorem ipsum dolor sit amet.', 200, ['Content-Type' => 'text/html']);
 
         return $response;
     }

src/Client.php

@@ -112,7 +112,7 @@ public function authenticate()
                 );
             }
 
-            if (strpos($response->headers['Content-Type'], 'application/json') !== false) {
+            if (in_array('application/json', $response->getHeader('Content-Type'))) {
                 $token = array_merge(json_decode($response->body, true), ['created' => time()]);
             } else {
                 parse_str($response->body, $token);
@@ -380,7 +380,7 @@ public function refreshToken($token = null)
             );
         }
 
-        if (strpos($response->headers['Content-Type'], 'application/json') !== false) {
+        if (in_array('application/json', $response->getHeader('Content-Type'))) {
             $token = array_merge(json_decode($response->body, true), ['created' => time()]);
         } else {
             parse_str($response->body, $token);