Merge pull request #5 from stevenmaguire/improve-error-response-support

Add improved error response support and tests

Author: stevenmaguire

CHANGELOG.md

@@ -1,6 +1,40 @@
 # Changelog
 All Notable changes to `oauth2-bitbucket` will be documented in this file
 
+## 0.1.2 - 2016-02-06
+
+### Added
+- Improved support for error response handling.
+
+### Deprecated
+- Nothing
+
+### Fixed
+- Nothing
+
+### Removed
+- Nothing
+
+### Security
+- Nothing
+
+## 0.1.1 - 2015-08-20
+
+### Added
+- Changelog
+
+### Deprecated
+- Nothing
+
+### Fixed
+- Nothing
+
+### Removed
+- Nothing
+
+### Security
+- Nothing
+
 ## 0.1.0 - 2015-08-20
 
 ### Added

composer.json

@@ -19,7 +19,7 @@
     ],
     "require": {
         "php": ">=5.5.0",
-        "league/oauth2-client": "~1.0"
+        "league/oauth2-client": "~1.2"
     },
     "require-dev": {
         "phpunit/phpunit": "~4.0",

src/Provider/Bitbucket.php

@@ -3,12 +3,14 @@
 use League\OAuth2\Client\Provider\AbstractProvider;
 use League\OAuth2\Client\Provider\Exception\IdentityProviderException;
 use League\OAuth2\Client\Token\AccessToken;
+use League\OAuth2\Client\Tool\ArrayAccessorTrait;
 use League\OAuth2\Client\Tool\BearerAuthorizationTrait;
 use Psr\Http\Message\ResponseInterface;
 
 class Bitbucket extends AbstractProvider
 {
-    use BearerAuthorizationTrait;
+    use ArrayAccessorTrait,
+        BearerAuthorizationTrait;
 
     /**
      * Get authorization url to begin OAuth flow
@@ -65,9 +67,16 @@ protected function getDefaultScopes()
      */
     protected function checkResponse(ResponseInterface $response, $data)
     {
-        if (isset($data['error'])) {
-            throw new IdentityProviderException($data['error_description'], $response->getStatusCode(), $response);
-        }
+        $errors = [
+            'error_description',
+            'error.message',
+        ];
+
+        array_map(function ($error) use ($response, $data) {
+            if ($message = $this->getValueByKey($data, $error)) {
+                throw new IdentityProviderException($message, $response->getStatusCode(), $response);
+            }
+        }, $errors);
     }
 
     /**

test/src/Provider/BitbucketTest.php

@@ -117,28 +117,42 @@ public function testUserData()
         $this->assertEquals($location, $user->toArray()['location']);
     }
 
-    /**
-     *
-     * @expectedException \League\OAuth2\Client\Provider\Exception\IdentityProviderException
-     */
     public function testUserDataFails()
     {
-        $postResponse = m::mock('Psr\Http\Message\ResponseInterface');
-        $postResponse->shouldReceive('getBody')->andReturn('{"access_token": "mock_access_token","scopes": "account","expires_in": 3600,"refresh_token": "mock_refresh_token","token_type": "bearer"}');
-        $postResponse->shouldReceive('getHeader')->andReturn(['content-type' => 'json']);
-
-        $userResponse = m::mock('Psr\Http\Message\ResponseInterface');
-        $userResponse->shouldReceive('getBody')->andReturn('{"error":"mock_error","error_description": "mock_error_description"}');
-        $userResponse->shouldReceive('getHeader')->andReturn(['content-type' => 'json']);
-        $userResponse->shouldReceive('getStatusCode')->andReturn(500);
-
-        $client = m::mock('GuzzleHttp\ClientInterface');
-        $client->shouldReceive('send')
-            ->times(2)
-            ->andReturn($postResponse, $userResponse);
-        $this->provider->setHttpClient($client);
-
-        $token = $this->provider->getAccessToken('authorization_code', ['code' => 'mock_authorization_code']);
-        $user = $this->provider->getResourceOwner($token);
+        $errorPayloads = [
+            '{"error":"mock_error","error_description": "mock_error_description"}',
+            '{"error":{"message":"mock_error"},"error_description": "mock_error_description"}',
+            '{"foo":"bar"}'
+        ];
+
+        $testPayload = function ($payload) {
+            $postResponse = m::mock('Psr\Http\Message\ResponseInterface');
+            $postResponse->shouldReceive('getBody')->andReturn('{"access_token": "mock_access_token","scopes": "account","expires_in": 3600,"refresh_token": "mock_refresh_token","token_type": "bearer"}');
+            $postResponse->shouldReceive('getHeader')->andReturn(['content-type' => 'json']);
+
+            $userResponse = m::mock('Psr\Http\Message\ResponseInterface');
+            $userResponse->shouldReceive('getBody')->andReturn($payload);
+            $userResponse->shouldReceive('getHeader')->andReturn(['content-type' => 'json']);
+            $userResponse->shouldReceive('getStatusCode')->andReturn(500);
+
+            $client = m::mock('GuzzleHttp\ClientInterface');
+            $client->shouldReceive('send')
+                ->times(2)
+                ->andReturn($postResponse, $userResponse);
+            $this->provider->setHttpClient($client);
+
+            $token = $this->provider->getAccessToken('authorization_code', ['code' => 'mock_authorization_code']);
+
+            try {
+                $user = $this->provider->getResourceOwner($token);
+                return false;
+            } catch (\Exception $e) {
+                $this->assertInstanceOf('\League\OAuth2\Client\Provider\Exception\IdentityProviderException', $e);
+            }
+
+            return $payload;
+        };
+
+        $this->assertCount(2, array_filter(array_map($testPayload, $errorPayloads)));
     }
 }