Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Send scope when requesting access tokens #1030

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# OAuth 2.0 Client Changelog

## x.x.x

* Send scopes with access token request [#1029](https://github.com/thephpleague/oauth2-client/issues/1029)

## 2.7.0

_Released: 2023-04-16_
Expand Down
1 change: 1 addition & 0 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"sort-packages": true
},
"require": {
"ext-json": "*",
"php": "^5.6 || ^7.0 || ^8.0",
"guzzlehttp/guzzle": "^6.0 || ^7.0",
"paragonie/random_compat": "^1 || ^2 || ^9.99"
Expand Down
11 changes: 10 additions & 1 deletion src/Provider/AbstractProvider.php
Original file line number Diff line number Diff line change
Expand Up @@ -620,6 +620,15 @@ public function getAccessToken($grant, array $options = [])
{
$grant = $this->verifyGrant($grant);

if (empty($options['scope'])) {
$options['scope'] = $this->getDefaultScopes();
}

if (is_array($options['scope'])) {
$separator = $this->getScopeSeparator();
$options['scope'] = implode($separator, $options['scope']);
}

$params = [
'client_id' => $this->clientId,
'client_secret' => $this->clientSecret,
Expand Down Expand Up @@ -757,7 +766,7 @@ protected function parseJson($content)
*/
protected function getContentType(ResponseInterface $response)
{
return join(';', (array) $response->getHeader('content-type'));
return implode(';', $response->getHeader('content-type'));
}

/**
Expand Down
2 changes: 1 addition & 1 deletion test/src/Grant/GrantTestCase.php
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public function testGetAccessToken($grant, array $params = [])
->shouldReceive('getHeader')
->once()
->with('content-type')
->andReturn('application/json');
->andReturn(['application/json']);

/** @var ClientInterface & MockInterface $client */
$client = Mockery::spy(ClientInterface::class)->makePartial();
Expand Down
3 changes: 2 additions & 1 deletion test/src/Grant/PasswordTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ protected function getParamExpectation()
return !empty($body['grant_type'])
&& $body['grant_type'] === 'password'
&& !empty($body['username'])
&& !empty($body['password']);
&& !empty($body['password'])
&& !empty($body['scope']);
};
}

Expand Down
22 changes: 11 additions & 11 deletions test/src/Provider/AbstractProviderTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public function testInvalidGrantString()
public function testInvalidGrantObject()
{
$this->expectException(InvalidGrantException::class);
$grant = new \StdClass();
$grant = new \stdClass();
$this->getMockProvider()->getAccessToken($grant, ['invalid_parameter' => 'none']);
}

Expand Down Expand Up @@ -213,7 +213,7 @@ public function testGetUserProperties($name = null, $email = null, $id = null)
->shouldReceive('getHeader')
->once()
->with('content-type')
->andReturn('application/json');
->andReturn(['application/json']);


$client = Mockery::spy(ClientInterface::class, [
Expand Down Expand Up @@ -262,7 +262,7 @@ public function testGetUserPropertiesThrowsExceptionWhenNonJsonResponseIsReceive
$response
->shouldReceive('getHeader')
->with('content-type')
->andReturn('text/html');
->andReturn(['text/html']);

$client = Mockery::mock(ClientInterface::class, [
'send' => $response,
Expand Down Expand Up @@ -378,7 +378,7 @@ public function testPkceMethod($pkceMethod, $pkceCode, $expectedChallenge)
->shouldReceive('getHeader')
->once()
->with('content-type')
->andReturn('application/json');
->andReturn(['application/json']);

$client = Mockery::spy(ClientInterface::class, [
'send' => $response,
Expand Down Expand Up @@ -474,7 +474,7 @@ public function testErrorResponsesCanBeCustomizedAtTheProvider()
->shouldReceive('getHeader')
->once()
->with('content-type')
->andReturn('application/json');
->andReturn(['application/json']);

$client = Mockery::spy(ClientInterface::class, [
'send' => $response,
Expand Down Expand Up @@ -532,7 +532,7 @@ public function testClientErrorTriggersProviderException()
$response
->shouldReceive('getHeader')
->with('content-type')
->andReturn('application/json');
->andReturn(['application/json']);

$client = Mockery::mock(ClientInterface::class);
$client
Expand Down Expand Up @@ -579,7 +579,7 @@ public function testAuthenticatedRequestAndResponse()
$response
->shouldReceive('getHeader')
->with('content-type')
->andReturn('application/json');
->andReturn(['application/json']);

$client = Mockery::mock(ClientInterface::class);
$client
Expand Down Expand Up @@ -628,7 +628,7 @@ public function testGetAccessToken($method)
->once()
->with(
['client_id' => 'mock_client_id', 'client_secret' => 'mock_secret', 'redirect_uri' => 'none'],
['code' => 'mock_authorization_code']
['code' => 'mock_authorization_code', 'scope' => 'test']
)
->andReturn([]);

Expand All @@ -647,7 +647,7 @@ public function testGetAccessToken($method)
->shouldReceive('getHeader')
->once()
->with('content-type')
->andReturn('application/json');
->andReturn(['application/json']);

$client = Mockery::spy(ClientInterface::class, [
'send' => $response,
Expand Down Expand Up @@ -686,7 +686,7 @@ public function testGetAccessTokenWithNonJsonResponse()
$response
->shouldReceive('getHeader')
->with('content-type')
->andReturn('text/plain');
->andReturn(['text/plain']);

$client = Mockery::mock(ClientInterface::class, [
'send' => $response,
Expand Down Expand Up @@ -745,7 +745,7 @@ public function testParseResponse($body, $type, $parsed, $statusCode = 200)
$response
->shouldReceive('getHeader')
->with('content-type')
->andReturn($type);
->andReturn([$type]);

$method = $this->getMethod(AbstractProvider::class, 'parseResponse');
$result = $method->invoke($this->getMockProvider(), $response);
Expand Down