Anal spacing fixes and removed PHP5.4+ specific array syntax

This commit is contained in:
Alex Bilbie 2013-06-02 14:58:52 +01:00
parent 4c4155fdac
commit e442253e26

View File

@ -5,14 +5,14 @@ namespace League\OAuth2\Server\Storage\Fluent;
use \Illuminate\Support\Facades\DB as DB; use \Illuminate\Support\Facades\DB as DB;
use \League\OAuth2\Server\Storage\SessionInterface; use \League\OAuth2\Server\Storage\SessionInterface;
class Session implements SessionInterface class Session implements SessionInterface {
{
public function createSession($clientId, $ownerType, $ownerId) public function createSession($clientId, $ownerType, $ownerId)
{ {
return DB::table('oauth_sessions')->insertGetId(array( return DB::table('oauth_sessions')->insertGetId(array(
'client_id' => $clientId, 'client_id' => $clientId,
'owner_type' => $ownerType, 'owner_type' => $ownerType,
'owner_id' => $ownerId 'owner_id' => $ownerId
)); ));
} }
@ -28,37 +28,36 @@ class Session implements SessionInterface
public function associateRedirectUri($sessionId, $redirectUri) public function associateRedirectUri($sessionId, $redirectUri)
{ {
DB::table('oauth_session_redirects')->insert(array( DB::table('oauth_session_redirects')->insert(array(
'session_id' => $sessionId, 'session_id' => $sessionId,
'redirect_uri' => $redirectUri, 'redirect_uri' => $redirectUri,
)); ));
} }
public function associateAccessToken($sessionId, $accessToken, $expireTime) public function associateAccessToken($sessionId, $accessToken, $expireTime)
{ {
return DB::table('oauth_session_access_tokens')->insertGetId(array( return DB::table('oauth_session_access_tokens')->insertGetId(array(
'session_id' => $sessionId, 'session_id' => $sessionId,
'access_token' => $accessToken, 'access_token' => $accessToken,
'access_token_expires' => $expireTime, 'access_token_expires' => $expireTime,
)); ));
} }
public function associateRefreshToken($accessTokenId, $refreshToken, $expireTime, $clientId) public function associateRefreshToken($accessTokenId, $refreshToken, $expireTime, $clientId)
{ {
DB::table('oauth_session_refresh_tokens')->insert(array( DB::table('oauth_session_refresh_tokens')->insert(array(
'session_access_token_id' => $accessTokenId, 'session_access_token_id' => $accessTokenId,
'refresh_token' => $refreshToken, 'refresh_token' => $refreshToken,
'refresh_token_expires' => $expireTime, 'refresh_token_expires' => $expireTime,
'client_id' => $clientId, 'client_id' => $clientId,
)); ));
} }
public function associateAuthCode($sessionId, $authCode, $expireTime, $scopeIds = null) public function associateAuthCode($sessionId, $authCode, $expireTime)
{ {
DB::table('oauth_session_authcodes')->insert(array( DB::table('oauth_session_authcodes')->insert(array(
'session_id' => $sessionId, 'session_id' => $sessionId,
'auth_code' => $authCode, 'auth_code' => $authCode,
'auth_code_expires' => $expireTime, 'auth_code_expires' => $expireTime
'scope_ids' => $scopeIds,
)); ));
} }
@ -72,14 +71,14 @@ class Session implements SessionInterface
public function validateAuthCode($clientId, $redirectUri, $authCode) public function validateAuthCode($clientId, $redirectUri, $authCode)
{ {
$result = DB::table('oauth_sessions') $result = DB::table('oauth_sessions')
->select('oauth_sessions.id, oauth_session_authcodes.scope_ids') ->select(array('oauth_sessions.id as session_id', 'oauth_session_authcodes.id as authcode_id'))
->join('oauth_session_authcodes', 'oauth_sessions.id', '=', 'oauth_session_authcodes.session_id') ->join('oauth_session_authcodes', 'oauth_sessions.id', '=', 'oauth_session_authcodes.session_id')
->join('oauth_session_redirects', 'oauth_sessions.id', '=', 'oauth_session_redirects.session_id') ->join('oauth_session_redirects', 'oauth_sessions.id', '=', 'oauth_session_redirects.session_id')
->where('oauth_sessions.client_id', $clientId) ->where('oauth_sessions.client_id', $clientId)
->where('oauth_session_authcodes.auth_code', $authCode) ->where('oauth_session_authcodes.auth_code', $authCode)
->where('oauth_session_authcodes.auth_code_expires', '>=', time()) ->where('oauth_session_authcodes.auth_code_expires', '>=', time())
->where('oauth_session_redirects.redirect_uri', $redirectUri) ->where('oauth_session_redirects.redirect_uri', $redirectUri)
->first(); ->first();
return (is_null($result)) ? false : (array) $result; return (is_null($result)) ? false : (array) $result;
} }
@ -87,10 +86,10 @@ class Session implements SessionInterface
public function validateAccessToken($accessToken) public function validateAccessToken($accessToken)
{ {
$result = DB::table('oauth_session_access_tokens') $result = DB::table('oauth_session_access_tokens')
->join('oauth_sessions', 'oauth_session_access_tokens.session_id', '=', 'oauth_sessions.id') ->join('oauth_sessions', 'oauth_session_access_tokens.session_id', '=', 'oauth_sessions.id')
->where('access_token', $accessToken) ->where('access_token', $accessToken)
->where('access_token_expires', '>=', time()) ->where('access_token_expires', '>=', time())
->first(); ->first();
return (is_null($result)) ? false : (array) $result; return (is_null($result)) ? false : (array) $result;
} }
@ -98,10 +97,10 @@ class Session implements SessionInterface
public function validateRefreshToken($refreshToken, $clientId) public function validateRefreshToken($refreshToken, $clientId)
{ {
$result = DB::table('oauth_session_refresh_tokens') $result = DB::table('oauth_session_refresh_tokens')
->where('refresh_token', $refreshToken) ->where('refresh_token', $refreshToken)
->where('client_id', $clientId) ->where('client_id', $clientId)
->where('refresh_token_expires', '>=', time()) ->where('refresh_token_expires', '>=', time())
->first(); ->first();
return (is_null($result)) ? false : $result->session_access_token_id; return (is_null($result)) ? false : $result->session_access_token_id;
} }
@ -109,8 +108,8 @@ class Session implements SessionInterface
public function getAccessToken($accessTokenId) public function getAccessToken($accessTokenId)
{ {
$result = DB::table('oauth_session_access_tokens') $result = DB::table('oauth_session_access_tokens')
->where('id', $accessTokenId) ->where('id', $accessTokenId)
->first(); ->first();
return (is_null($result)) ? false : (array) $result; return (is_null($result)) ? false : (array) $result;
} }
@ -118,17 +117,17 @@ class Session implements SessionInterface
public function associateScope($accessTokenId, $scopeId) public function associateScope($accessTokenId, $scopeId)
{ {
DB::table('oauth_session_token_scopes')->insert(array( DB::table('oauth_session_token_scopes')->insert(array(
'session_access_token_id' => $accessTokenId, 'session_access_token_id' => $accessTokenId,
'scope_id' => $scopeId, 'scope_id' => $scopeId,
)); ));
} }
public function getScopes($accessToken) public function getScopes($accessToken)
{ {
return DB::table('oauth_session_token_scopes') 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_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') ->join('oauth_scopes', 'oauth_session_token_scopes.session_access_token_id', '=', 'oauth_scopes.id')
->where('access_token', $accessToken) ->where('access_token', $accessToken)
->get(); ->get();
} }
} }