Skip to content

Commit b77ebc1

Browse files
committed
Fix for #33 and other fluent query quirks
1 parent 1723839 commit b77ebc1

File tree

3 files changed

+18
-2
lines changed

3 files changed

+18
-2
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
/vendor
22
composer.phar
33
composer.lock
4-
.DS_Store
4+
.DS_Store
5+
oauth2-server-laravel.*

src/LucaDegasperi/OAuth2Server/Repositories/FluentClient.php

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,15 +13,29 @@ public function getClient($clientId, $clientSecret = null, $redirectUri = null,
1313

1414
if (! is_null($redirectUri) && is_null($clientSecret)) {
1515
$query = DB::table('oauth_clients')
16+
->select(
17+
'oauth_clients.id as id',
18+
'oauth_clients.secret as secret',
19+
'oauth_client_endpoints.redirect_uri as redirect_uri',
20+
'oauth_clients.name as name')
1621
->join('oauth_client_endpoints', 'oauth_clients.id', '=', 'oauth_client_endpoints.client_id')
1722
->where('oauth_clients.id', $clientId)
1823
->where('oauth_client_endpoints.redirect_uri', $redirectUri);
1924
} elseif (! is_null($clientSecret) && is_null($redirectUri)) {
2025
$query = DB::table('oauth_clients')
26+
->select(
27+
'oauth_clients.id as id',
28+
'oauth_clients.secret as secret',
29+
'oauth_clients.name as name')
2130
->where('oauth_clients.id', $clientId)
2231
->where('oauth_clients.secret', $clientSecret);
2332
} elseif (! is_null($clientSecret) && ! is_null($redirectUri)) {
2433
$query = DB::table('oauth_clients')
34+
->select(
35+
'oauth_clients.id as id',
36+
'oauth_clients.secret as secret',
37+
'oauth_client_endpoints.redirect_uri as redirect_uri',
38+
'oauth_clients.name as name')
2539
->join('oauth_client_endpoints', 'oauth_clients.id', '=', 'oauth_client_endpoints.client_id')
2640
->where('oauth_clients.id', $clientId)
2741
->where('oauth_clients.secret', $clientSecret)

src/LucaDegasperi/OAuth2Server/Repositories/FluentSession.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ public function validateAuthCode($clientId, $redirectUri, $authCode)
9898
public function validateAccessToken($accessToken)
9999
{
100100
$result = DB::table('oauth_session_access_tokens')
101+
->select('oauth_sessions.*')
101102
->join('oauth_sessions', 'oauth_session_access_tokens.session_id', '=', 'oauth_sessions.id')
102103
->where('access_token', $accessToken)
103104
->where('access_token_expires', '>=', time())
@@ -195,7 +196,7 @@ public function deleteExpired()
195196
{
196197
$time = time();
197198
$expiredSessions = DB::table('oauth_sessions')
198-
->select(array('oauth_sessions.id as session_id'))
199+
->select('oauth_sessions.id as session_id')
199200
->join('oauth_session_access_tokens', 'oauth_session_access_tokens.session_id', '=', 'oauth_sessions.id')
200201
->leftJoin('oauth_session_refresh_tokens', 'oauth_session_refresh_tokens.session_access_token_id', '=', 'oauth_session_access_tokens.id')
201202
->where('oauth_session_access_tokens.access_token_expires', '<', $time)

0 commit comments

Comments
 (0)