Merge pull request #246 from hanneskaeufler/hk-fix-xing-token-parsing

xing responds with json encoded errors
daviddesberg · Sep 14, 2015 · 10d450e · 10d450e
2 parents 26fdd6b + 7d58320
commit 10d450e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/src/OAuth/OAuth1/Service/Xing.php b/src/OAuth/OAuth1/Service/Xing.php
@@ -73,11 +73,12 @@ protected function parseRequestTokenResponse($responseBody)
     protected function parseAccessTokenResponse($responseBody)
     {
         parse_str($responseBody, $data);
+        $errors = json_decode($responseBody);
 
         if (null === $data || !is_array($data)) {
             throw new TokenResponseException('Unable to parse response.');
-        } elseif (isset($data['error'])) {
-            throw new TokenResponseException('Error in retrieving token: "' . $data['error'] . '"');
+        } elseif ($errors) {
+            throw new TokenResponseException('Error in retrieving token: "' . $errors->error_name . '"');
         }
 
         $token = new StdOAuth1Token();

diff --git a/tests/Unit/OAuth1/Service/XingTest.php b/tests/Unit/OAuth1/Service/XingTest.php
@@ -197,7 +197,7 @@ public function testParseAccessTokenResponseThrowsExceptionOnError()
         $this->client
             ->expects($this->once())
             ->method('retrieveResponse')
-            ->will($this->returnValue('error=bar'));
+            ->will($this->returnValue('{"message":"Invalid OAuth signature","error_name":"INVALID_OAUTH_SIGNATURE"}'));
 
         $token = $this->getMock('\\OAuth\\OAuth1\\Token\\TokenInterface');