Merge pull request #30 from BsWiM/lucadegasperi/master

Luca Degasperi · Luca Degasperi · commit 1723839fae76 · 2013-12-09T02:59:40.000-08:00
Fixed issue when limit_scopes_to_grants was set to true the $result-&gt;id would get overridden by oauth_grants.id
diff --git a/src/LucaDegasperi/OAuth2Server/Repositories/FluentScope.php b/src/LucaDegasperi/OAuth2Server/Repositories/FluentScope.php
@@ -10,6 +10,7 @@ class FluentScope implements ScopeInterface
     public function getScope($scope, $clientId = null, $grantType = null)
     {
          $query = DB::table('oauth_scopes')
+                    ->select('oauth_scopes.id as id', 'oauth_scopes.scope as scope', 'oauth_scopes.name as name', 'oauth_scopes.description as description')
                     ->where('oauth_scopes.scope', $scope);
 
         if (Config::get('lucadegasperi/oauth2-server-laravel::oauth2.limit_clients_to_scopes') === true and ! is_null($clientId)) {

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@ class FluentScope implements ScopeInterface`
`10`	`10`	`public function getScope($scope, $clientId = null, $grantType = null)`
`11`	`11`	`{`
`12`	`12`	`$query = DB::table('oauth_scopes')`
	`13`	`+ ->select('oauth_scopes.id as id', 'oauth_scopes.scope as scope', 'oauth_scopes.name as name', 'oauth_scopes.description as description')`
`13`	`14`	`->where('oauth_scopes.scope', $scope);`
`14`	`15`
`15`	`16`	`if (Config::get('lucadegasperi/oauth2-server-laravel::oauth2.limit_clients_to_scopes') === true and ! is_null($clientId)) {`