Merge pull request #15 from fx88/patch-1

Fixed unsave casts in getScopes() and getAuthCodeScopes() & Add addition...
lucadegasperi · Oct 16, 2013 · d24192c · d24192c
2 parents 2e7c1ca + ae60f25
commit d24192c
Showing 1 changed file with 17 additions and 9 deletions.
diff --git a/src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php b/src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php
@@ -138,15 +138,19 @@ public function associateScope($accessTokenId, $scopeId)
 
     public function getScopes($accessToken)
     {
-        $scope_query = DB::table('oauth_session_token_scopes')
+        $scopeResults = DB::table('oauth_session_token_scopes')
+	    	->select('oauth_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 = array();
+
+		foreach($scopeResults as $key=>$scope)
 		{
-			 $scopes[]['scope'] = $scope->scope;
+			$scopes[$key] = get_object_vars($scope);
+
 		}
 
         return $scopes;
@@ -164,16 +168,20 @@ public function associateAuthCodeScope($authCodeId, $scopeId)
 
     public function getAuthCodeScopes($oauthSessionAuthCodeId)
     {
-        $result = DB::table('oauth_session_authcode_scopes')
+        $scopesResults = DB::table('oauth_session_authcode_scopes')
                 ->where('oauth_session_authcode_id', '=', $oauthSessionAuthCodeId)
                 ->get();
 
-        $toArray = array();
-        foreach ($result as $obj) {
-            $toArray[] = (array)$obj;
-        }
+        $scopes = array();
+
+        foreach($scopesResults as $key=>$scope)
+        {
+			$scopes[$key] = get_object_vars($scope);
+
+		}
+
+        return $scopes;
 
-        return $toArray;
     }
 
     public function removeRefreshToken($refreshToken)