Merge branch 'develop' of github.com:thephpleague/oauth2-server into develop

This commit is contained in:
Alex Bilbie 2014-11-07 00:46:09 +00:00
commit f01cf7ef2f
2 changed files with 3 additions and 1 deletions

View File

@ -13,7 +13,7 @@ class ScopeStorage extends Adapter implements ScopeInterface
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function get($scope, $grantType = null) public function get($scope, $grantType = null, $clientId = null)
{ {
$result = Capsule::table('oauth_scopes') $result = Capsule::table('oauth_scopes')
->where('id', $scope) ->where('id', $scope)

View File

@ -215,6 +215,8 @@ class AuthCodeGrant extends AbstractGrant
} }
$session = $code->getSession(); $session = $code->getSession();
$session->associateClient($client);
$authCodeScopes = $code->getScopes(); $authCodeScopes = $code->getScopes();
// Generate the access token // Generate the access token