ElyBy-Mirror/oauth2-server
1
0
Fork 0
mirror of https://github.com/elyby/oauth2-server.git synced 2024-11-15 01:36:02 +05:30
Code Issues Packages Projects Releases Wiki Activity

Anal space fixes

Browse Source
This commit is contained in:
Alex Bilbie 2013-06-02 14:59:05 +01:00
parent 0999bf4de3
commit f78e05cb08
2 changed files with 21 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/League/OAuth2/Server/Storage/Fluent/Client.php
View File

@ -11,22 +11,22 @@ class Client implements ClientInterface {
{
if ( ! is_null($redirectUri) && is_null($clientSecret)) {
$result = DB::table('oauth_clients')
->join('oauth_client_endpoints', 'oauth_clients.id', '=', 'oauth_client_endpoints.client_id')
->where('oauth_clients.id', $clientId)
->where('oauth_client_endpoints.redirect_uri', $redirectUri)
->first();
->join('oauth_client_endpoints', 'oauth_clients.id', '=', 'oauth_client_endpoints.client_id')
->where('oauth_clients.id', $clientId)
->where('oauth_client_endpoints.redirect_uri', $redirectUri)
->first();
} elseif ( ! is_null($clientSecret) && is_null($redirectUri)) {
$result = DB::table('oauth_clients')
->where('id', $clientId)
->where('secret', $clientSecret)
->first();
->where('id', $clientId)
->where('secret', $clientSecret)
->first();
} elseif ( ! is_null($clientSecret) && ! is_null($redirectUri)) {
$result = DB::table('oauth_clients')
->join('oauth_client_endpoints', 'oauth_clients.id', '=', 'oauth_client_endpoints.client_id')
->where('oauth_clients.id', $clientId)
->where('oauth_clients.secret', $clientSecret)
->where('oauth_client_endpoints.redirect_uri', $redirectUri)
->first();
->join('oauth_client_endpoints', 'oauth_clients.id', '=', 'oauth_client_endpoints.client_id')
->where('oauth_clients.id', $clientId)
->where('oauth_clients.secret', $clientSecret)
->where('oauth_client_endpoints.redirect_uri', $redirectUri)
->first();
}
if (is_null($result)) {

19
src/League/OAuth2/Server/Storage/Fluent/Scope.php
View File

@ -8,21 +8,20 @@ use \League\OAuth2\Server\Storage\ScopeInterface;
class Scope implements ScopeInterface {
public function getScope($scope, $clientId = null, $grantType = null)
{
$result = DB::table('oauth_scopes')
->where('key', $scope)
->first();
{
$result = DB::table('oauth_scopes')
->where('key', $scope)
->first();
if (is_null($result)) {
return false;
}
return array(
'id' => $result->id,
'scope' => $result->key,
'name' => $result->name,
'description' => $result->description
'id' => $result->id,
'scope' => $result->key,
'name' => $result->name,
'description' => $result->description
);
}
}
}