diff --git a/src/Two/AbstractProvider.php b/src/Two/AbstractProvider.php index 77862ca4..2fe1b743 100644 --- a/src/Two/AbstractProvider.php +++ b/src/Two/AbstractProvider.php @@ -3,7 +3,6 @@ namespace Laravel\Socialite\Two; use GuzzleHttp\Client; -use GuzzleHttp\ClientInterface; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; use Illuminate\Support\Arr; @@ -258,11 +257,9 @@ protected function hasInvalidState() */ public function getAccessTokenResponse($code) { - $postKey = (version_compare(ClientInterface::VERSION, '6') === 1) ? 'form_params' : 'body'; - $response = $this->getHttpClient()->post($this->getTokenUrl(), [ 'headers' => ['Accept' => 'application/json'], - $postKey => $this->getTokenFields($code), + 'form_params' => $this->getTokenFields($code), ]); return json_decode($response->getBody(), true); diff --git a/src/Two/BitbucketProvider.php b/src/Two/BitbucketProvider.php index d2c37af1..435ba014 100644 --- a/src/Two/BitbucketProvider.php +++ b/src/Two/BitbucketProvider.php @@ -3,7 +3,6 @@ namespace Laravel\Socialite\Two; use Exception; -use GuzzleHttp\ClientInterface; use Illuminate\Support\Arr; class BitbucketProvider extends AbstractProvider implements ProviderInterface @@ -103,12 +102,10 @@ protected function mapUserToObject(array $user) */ public function getAccessToken($code) { - $postKey = (version_compare(ClientInterface::VERSION, '6') === 1) ? 'form_params' : 'body'; - $response = $this->getHttpClient()->post($this->getTokenUrl(), [ 'auth' => [$this->clientId, $this->clientSecret], 'headers' => ['Accept' => 'application/json'], - $postKey => $this->getTokenFields($code), + 'form_params' => $this->getTokenFields($code), ]); return json_decode($response->getBody(), true)['access_token']; diff --git a/src/Two/FacebookProvider.php b/src/Two/FacebookProvider.php index 4f407876..6e65b2e5 100644 --- a/src/Two/FacebookProvider.php +++ b/src/Two/FacebookProvider.php @@ -2,7 +2,6 @@ namespace Laravel\Socialite\Two; -use GuzzleHttp\ClientInterface; use Illuminate\Support\Arr; class FacebookProvider extends AbstractProvider implements ProviderInterface @@ -70,10 +69,8 @@ protected function getTokenUrl() */ public function getAccessTokenResponse($code) { - $postKey = (version_compare(ClientInterface::VERSION, '6') === 1) ? 'form_params' : 'body'; - $response = $this->getHttpClient()->post($this->getTokenUrl(), [ - $postKey => $this->getTokenFields($code), + 'form_params' => $this->getTokenFields($code), ]); $data = json_decode($response->getBody(), true); diff --git a/tests/OAuthTwoTest.php b/tests/OAuthTwoTest.php index 89aa448c..119d9e20 100644 --- a/tests/OAuthTwoTest.php +++ b/tests/OAuthTwoTest.php @@ -2,7 +2,6 @@ namespace Laravel\Socialite\Tests; -use GuzzleHttp\ClientInterface; use Illuminate\Contracts\Session\Session; use Illuminate\Http\RedirectResponse; use Illuminate\Http\Request; @@ -45,9 +44,8 @@ public function testUserReturnsAUserInstanceForTheAuthenticatedRequest() $session->shouldReceive('pull')->once()->with('state')->andReturn(str_repeat('A', 40)); $provider = new OAuthTwoTestProviderStub($request, 'client_id', 'client_secret', 'redirect_uri'); $provider->http = m::mock(stdClass::class); - $postKey = (version_compare(ClientInterface::VERSION, '6') === 1) ? 'form_params' : 'body'; $provider->http->shouldReceive('post')->once()->with('http://token.url', [ - 'headers' => ['Accept' => 'application/json'], $postKey => ['client_id' => 'client_id', 'client_secret' => 'client_secret', 'code' => 'code', 'redirect_uri' => 'redirect_uri'], + 'headers' => ['Accept' => 'application/json'], 'form_params' => ['client_id' => 'client_id', 'client_secret' => 'client_secret', 'code' => 'code', 'redirect_uri' => 'redirect_uri'], ])->andReturn($response = m::mock(stdClass::class)); $response->shouldReceive('getBody')->once()->andReturn('{ "access_token" : "access_token", "refresh_token" : "refresh_token", "expires_in" : 3600 }'); $user = $provider->user(); @@ -66,9 +64,8 @@ public function testUserReturnsAUserInstanceForTheAuthenticatedFacebookRequest() $session->shouldReceive('pull')->once()->with('state')->andReturn(str_repeat('A', 40)); $provider = new FacebookTestProviderStub($request, 'client_id', 'client_secret', 'redirect_uri'); $provider->http = m::mock(stdClass::class); - $postKey = (version_compare(ClientInterface::VERSION, '6') === 1) ? 'form_params' : 'body'; $provider->http->shouldReceive('post')->once()->with('https://graph.facebook.com/v3.3/oauth/access_token', [ - $postKey => ['client_id' => 'client_id', 'client_secret' => 'client_secret', 'code' => 'code', 'redirect_uri' => 'redirect_uri'], + 'form_params' => ['client_id' => 'client_id', 'client_secret' => 'client_secret', 'code' => 'code', 'redirect_uri' => 'redirect_uri'], ])->andReturn($response = m::mock(stdClass::class)); $response->shouldReceive('getBody')->once()->andReturn(json_encode(['access_token' => 'access_token', 'expires' => 5183085])); $user = $provider->user();