Merge pull request #14 from fx88/master

Bugfix in getScopes() Bug in Query and Cast the Resultobjects to Arrays
lucadegasperi · Oct 16, 2013 · 2e7c1ca · 2e7c1ca
2 parents 4e4f1e0 + d20ff61
commit 2e7c1ca
Showing 1 changed file with 12 additions and 5 deletions.
diff --git a/src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php b/src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php
@@ -138,11 +138,18 @@ public function associateScope($accessTokenId, $scopeId)
 
     public function getScopes($accessToken)
     {
-        return DB::table('oauth_session_token_scopes')
-                ->join('oauth_session_access_tokens', 'oauth_session_token_scopes.session_access_token_id', '=', 'oauth_session_access_tokens.id')
-                ->join('oauth_scopes', 'oauth_session_token_scopes.session_access_token_id', '=', 'oauth_scopes.id')
-                ->where('access_token', $accessToken)
-                ->get();
+        $scope_query = DB::table('oauth_session_token_scopes')
+            ->join('oauth_session_access_tokens', 'oauth_session_token_scopes.session_access_token_id', '=', 'oauth_session_access_tokens.id')
+            ->join('oauth_scopes', 'oauth_session_token_scopes.scope_id', '=', 'oauth_scopes.id')
+            ->where('access_token', $accessToken)
+            ->get();
+
+		foreach($scope_query as $scope)
+		{
+			 $scopes[]['scope'] = $scope->scope;
+		}
+
+        return $scopes;
     }
 
     public function associateAuthCodeScope($authCodeId, $scopeId)