Skip to content

Commit ae60f25

Browse files
committed
Fixed unsave casts in getScopes() and getAuthCodeScopes() & Add additional vars to Array in getScopes()
1 parent 2e7c1ca commit ae60f25

File tree

1 file changed

+17
-9
lines changed

1 file changed

+17
-9
lines changed

src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -138,15 +138,19 @@ public function associateScope($accessTokenId, $scopeId)
138138

139139
public function getScopes($accessToken)
140140
{
141-
$scope_query = DB::table('oauth_session_token_scopes')
141+
$scopeResults = DB::table('oauth_session_token_scopes')
142+
->select('oauth_scopes.*')
142143
->join('oauth_session_access_tokens', 'oauth_session_token_scopes.session_access_token_id', '=', 'oauth_session_access_tokens.id')
143144
->join('oauth_scopes', 'oauth_session_token_scopes.scope_id', '=', 'oauth_scopes.id')
144145
->where('access_token', $accessToken)
145146
->get();
146147

147-
foreach($scope_query as $scope)
148+
$scopes = array();
149+
150+
foreach($scopeResults as $key=>$scope)
148151
{
149-
$scopes[]['scope'] = $scope->scope;
152+
$scopes[$key] = get_object_vars($scope);
153+
150154
}
151155

152156
return $scopes;
@@ -164,16 +168,20 @@ public function associateAuthCodeScope($authCodeId, $scopeId)
164168

165169
public function getAuthCodeScopes($oauthSessionAuthCodeId)
166170
{
167-
$result = DB::table('oauth_session_authcode_scopes')
171+
$scopesResults = DB::table('oauth_session_authcode_scopes')
168172
->where('oauth_session_authcode_id', '=', $oauthSessionAuthCodeId)
169173
->get();
170174

171-
$toArray = array();
172-
foreach ($result as $obj) {
173-
$toArray[] = (array)$obj;
174-
}
175+
$scopes = array();
176+
177+
foreach($scopesResults as $key=>$scope)
178+
{
179+
$scopes[$key] = get_object_vars($scope);
180+
181+
}
182+
183+
return $scopes;
175184

176-
return $toArray;
177185
}
178186

179187
public function removeRefreshToken($refreshToken)

0 commit comments

Comments
 (0)