Merge pull request #51 from PawelSuwinski/grantType_getRawData

method getRawData() of grant types not interface compliant and can lead to TypeError
kamermans · Jun 12, 2023 · 1d3034c · 1d3034c
2 parents 115bb70 + f2d8e4b
commit 1d3034c
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 4 deletions.
diff --git a/src/GrantType/AuthorizationCode.php b/src/GrantType/AuthorizationCode.php
@@ -66,8 +66,9 @@ public function getRawData(SignerInterface $clientCredentialsSigner, $refreshTok
         );
 
         $response = $this->client->send($request);
+        $rawData = json_decode($response->getBody(), true);
 
-        return json_decode($response->getBody(), true);
+        return is_array($rawData) ? $rawData : [];
     }
 
     /**

diff --git a/src/GrantType/ClientCredentials.php b/src/GrantType/ClientCredentials.php
@@ -68,8 +68,9 @@ public function getRawData(SignerInterface $clientCredentialsSigner, $refreshTok
         );
 
         $response = $this->client->send($request);
+        $rawData = json_decode($response->getBody(), true);
 
-        return json_decode($response->getBody(), true);
+        return is_array($rawData) ? $rawData : [];
     }
 
     /**

diff --git a/src/GrantType/PasswordCredentials.php b/src/GrantType/PasswordCredentials.php
@@ -66,8 +66,9 @@ public function getRawData(SignerInterface $clientCredentialsSigner, $refreshTok
         );
 
         $response = $this->client->send($request);
+        $rawData = json_decode($response->getBody(), true);
 
-        return json_decode($response->getBody(), true);
+        return is_array($rawData) ? $rawData : [];
     }
 
     /**

diff --git a/src/GrantType/RefreshToken.php b/src/GrantType/RefreshToken.php
@@ -65,8 +65,9 @@ public function getRawData(SignerInterface $clientCredentialsSigner, $refreshTok
         );
 
         $response = $this->client->send($request);
+        $rawData = json_decode($response->getBody(), true);
 
-        return json_decode($response->getBody(), true);
+        return is_array($rawData) ? $rawData : [];
     }
 
     /**