Merge pull request #143 from seegno/bugfix/authorize-user-bearer

Fix handling of user authorize response
seegno · Dec 14, 2016 · 6fb30eb · 6fb30eb
2 parents 2626bf3 + 234279f
commit 6fb30eb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/lib/Uphold/UpholdClient.php b/lib/Uphold/UpholdClient.php
@@ -302,7 +302,10 @@ public function authorizeUser($code)
             array_merge($this->getDefaultHeaders(), $headers)
         );
 
-        return $this->getUser($response->getContent());
+        $content = $response->getContent();
+        $bearerToken = isset($content['access_token']) ? $content['access_token'] : null;
+
+        return $this->getUser($bearerToken);
     }
 
     /**

diff --git a/test/Uphold/Tests/Unit/UpholdClientTest.php b/test/Uphold/Tests/Unit/UpholdClientTest.php
@@ -409,7 +409,7 @@ public function shouldReturnAuthorizedUserWhenResponseReturnsBearerToken()
             'grant_type' => 'authorization_code',
         ));
 
-        $response = $this->getResponseMock('xyzzy');
+        $response = $this->getResponseMock(array('access_token' => 'xyzzy'));
 
         $httpClient = $this->getHttpClientMock();