joshtronic/pickles
1
0
Fork 0
Code Issues 8 Pull requests Projects Releases Packages Wiki Activity Actions

Tweaked schema some more.

Browse source
This commit is contained in:
Josh Sherman 2014-10-15 07:56:25 -04:00
parent 08284b0f35
commit 9e2e4f75f3
2 changed files with 19 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/OAuth2/AccessTokenStorage.php
View file

@ -11,10 +11,10 @@ class AccessTokenStorage extends StorageAdapter implements AccessTokenInterface
{ {
public function get($token) public function get($token)
{ {
$sql = 'SELECT oauth_session_access_tokens.*' $sql = 'SELECT oauth_access_tokens.*'
. ' FROM oauth_session_access_tokens' . ' FROM oauth_access_tokens'
. ' WHERE access_token = ?' . ' WHERE access_token = ?'
. ' AND access_token_expires >= ?;'; . ' AND expires_at >= ?;';
$results = $this->db->fetch($sql, [$token, time()]); $results = $this->db->fetch($sql, [$token, time()]);
@ -22,7 +22,7 @@ class AccessTokenStorage extends StorageAdapter implements AccessTokenInterface
{ {
return (new AccessTokenEntity($this->server)) return (new AccessTokenEntity($this->server))
->setId($results[0]['access_token']) ->setId($results[0]['access_token'])
->setExpireTime($results[0]['access_token_expires']); ->setExpireTime($results[0]['expires_at']);
} }
return null; return null;
@ -31,10 +31,10 @@ class AccessTokenStorage extends StorageAdapter implements AccessTokenInterface
public function getScopes(AbstractTokenEntity $token) public function getScopes(AbstractTokenEntity $token)
{ {
$sql = 'SELECT oauth_scopes.id, oauth_scopes.description' $sql = 'SELECT oauth_scopes.id, oauth_scopes.description'
. ' FROM oauth_session_token_scopes' . ' FROM oauth_access_token_scopes'
. ' INNER JOIN oauth_scopes' . ' INNER JOIN oauth_scopes'
. ' ON oauth_session_token_scopes.scope_id = oauth_scopes.id' . ' ON oauth_access_token_scopes.scope_id = oauth_scopes.id'
. ' WHERE oauth_session_token_scopes.session_access_token_id = ?;'; . ' WHERE oauth_access_token_scopes.access_token_id = ?;';
$results = $this->db->fetch($sql, [$token->getId()]); $results = $this->db->fetch($sql, [$token->getId()]);
$response = []; $response = [];
@ -55,8 +55,8 @@ class AccessTokenStorage extends StorageAdapter implements AccessTokenInterface
public function create($token, $expiration, $session_id) public function create($token, $expiration, $session_id)
{ {
$sql = 'INSERT INTO oauth_session_access_tokens' $sql = 'INSERT INTO oauth_access_tokens'
. ' (access_token, session_id, access_token_expires)' . ' (access_token, session_id, expires_at)'
. ' VALUES' . ' VALUES'
. ' (?, ?, ?);'; . ' (?, ?, ?);';
@ -65,7 +65,7 @@ class AccessTokenStorage extends StorageAdapter implements AccessTokenInterface
public function associateScope(AbstractTokenEntity $token, ScopeEntity $scope) public function associateScope(AbstractTokenEntity $token, ScopeEntity $scope)
{ {
$sql = 'INSERT INTO oauth_session_token_scopes' $sql = 'INSERT INTO oauth_access_token_scopes'
. ' (access_token, scope)' . ' (access_token, scope)'
. ' VALUES' . ' VALUES'
. ' (?, ?);'; . ' (?, ?);';
@ -75,7 +75,7 @@ class AccessTokenStorage extends StorageAdapter implements AccessTokenInterface
public function delete(AbstractTokenEntity $token) public function delete(AbstractTokenEntity $token)
{ {
$sql = 'DELETE FROM oauth_session_token_scopes' $sql = 'DELETE FROM oauth_access_token_scopes'
. ' WHERE access_token = ?;'; . ' WHERE access_token = ?;';
$this->db->execute($sql, [$token->getId()]); $this->db->execute($sql, [$token->getId()]);

16
src/OAuth2/SessionStorage.php
View file

@ -17,9 +17,9 @@ class SessionStorage extends StorageAdapter implements SessionInterface
. ' oauth_sessions.owner_id, oauth_sessions.client_id,' . ' oauth_sessions.owner_id, oauth_sessions.client_id,'
. ' oauth_sessions.client_redirect_uri' . ' oauth_sessions.client_redirect_uri'
. ' FROM oauth_sessions' . ' FROM oauth_sessions'
. ' INNER JOIN oauth_session_access_tokens' . ' INNER JOIN oauth_access_tokens'
. ' ON oauth_session_access_tokens.session_id = oauth_sessions.id' . ' ON oauth_access_tokens.session_id = oauth_sessions.id'
. ' WHERE oauth_session_access_tokens.access_token = ?;'; . ' WHERE oauth_access_tokens.access_token = ?;';
$results = $this->db->fetch($sql, [$access_token->getId()]); $results = $this->db->fetch($sql, [$access_token->getId()]);
@ -63,10 +63,10 @@ class SessionStorage extends StorageAdapter implements SessionInterface
{ {
$sql = 'SELECT oauth_sessions.*' $sql = 'SELECT oauth_sessions.*'
. ' FROM oauth_sessions' . ' FROM oauth_sessions'
. ' INNER JOIN oauth_session_token_scopes' . ' INNER JOIN oauth_access_token_scopes'
. ' ON oauth_sessions.id = oauth_session_token_scopes.session_access_token_id' . ' ON oauth_sessions.id = oauth_access_token_scopes.access_token_id'
. ' INNER JOIN oauth_scopes' . ' INNER JOIN oauth_scopes'
. ' ON oauth_scopes.id = oauth_session_token_scopes.scope_id' . ' ON oauth_scopes.id = oauth_access_token_scopes.scope_id'
. ' WHERE oauth_sessions.id = ?;'; . ' WHERE oauth_sessions.id = ?;';
$results = $this->db->fetch($sql, [$session->getId()]); $results = $this->db->fetch($sql, [$session->getId()]);
@ -95,8 +95,8 @@ class SessionStorage extends StorageAdapter implements SessionInterface
public function associateScope(SessionEntity $session, ScopeEntity $scope) public function associateScope(SessionEntity $session, ScopeEntity $scope)
{ {
$sql = 'INSERT INTO oauth_session_token_scopes' $sql = 'INSERT INTO oauth_access_token_scopes'
. ' (session_access_token_id, scope_id)' . ' (access_token_id, scope_id)'
. ' VALUES' . ' VALUES'
. ' (?, ?);'; . ' (?, ?);';