ElyBy-Mirror/league-oauth2-ely
1
0
Fork 0
mirror of https://github.com/elyby/league-oauth2-ely.git synced 2024-11-30 02:33:17 +05:30
Code Issues Packages Projects Releases Wiki Activity

Sometimes the $data argument of the checkResponse() method has a string type

Browse Source 
If the OAuth server responds with 502 status and non-json content, the parseResponse() method of the AbstractProvider class returns a string instead of an array.
This commit is contained in:
electron93 2018-08-20 14:51:35 +03:00
parent cc34f772ee
commit 7bb61adc8c
2 changed files with 25 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Provider.php
View File

@ -70,8 +70,9 @@ class Provider extends AbstractProvider
protected function checkResponse(ResponseInterface $response, $data) protected function checkResponse(ResponseInterface $response, $data)
{ {
$statusCode = $response->getStatusCode(); $statusCode = $response->getStatusCode();
if ($statusCode !== 200 || isset($data['message'])) { if ($statusCode !== 200) {
throw new IdentityProviderException($data['message'] ?: $response->getReasonPhrase(), $statusCode, $response); $message = isset($data['message']) ? $data['message'] : $response->getReasonPhrase();
throw new IdentityProviderException($message, $statusCode, $response);
} }
} }

22
tests/ProviderTest.php
View File

@ -121,6 +121,28 @@ class ProviderTest extends \PHPUnit_Framework_TestCase
$this->provider->getAccessToken('authorization_code', ['code' => 'mock_authorization_code']); $this->provider->getAccessToken('authorization_code', ['code' => 'mock_authorization_code']);
} }
/**
* @expectedException \Ely\OAuth2\Client\Exception\IdentityProviderException
* @expectedExceptionMessage Bad Gateway
*/
public function testExceptionThrownOnIncorrectContentType()
{
/** @var m\Mock|ResponseInterface $postResponse */
$postResponse = m::mock(ResponseInterface::class);
$postResponse->shouldReceive('getHeader')->andReturn(['content-type' => 'text/html; charset=UTF-8']);
$postResponse->shouldReceive('getBody')->andReturn('html content');
$postResponse->shouldReceive('getStatusCode')->andReturn(502);
$postResponse->shouldReceive('getReasonPhrase')->andReturn('Bad Gateway');
/** @var m\Mock|ClientInterface $client */
$client = m::mock(ClientInterface::class);
$client->shouldReceive('send')
->times(1)
->andReturn($postResponse);
$this->provider->setHttpClient($client);
$this->provider->getAccessToken('authorization_code', ['code' => 'mock_authorization_code']);
}
public function testGetResourceOwner() public function testGetResourceOwner()
{ {
/** @var m\Mock|ResponseInterface $postResponse */ /** @var m\Mock|ResponseInterface $postResponse */