mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[feature/oauth] Changes due to code review

Browse Source 
PHPBB3-11673
This commit is contained in:
Joseph Warner
2013-08-24 22:00:16 -04:00
parent 310caec5d9
commit a8ffbce99f
10 changed files with 62 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
phpBB/phpbb/auth/provider/oauth/token_storage.php
View File

@@ -83,7 +83,8 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
*/
public function retrieveAccessToken()
{
if( $this->cachedToken instanceOf TokenInterface ) {
if ($this->cachedToken instanceOf TokenInterface)
{
return $this->cachedToken;
}
@@ -92,7 +93,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
'provider' => $this->service_name,
);
if ($this->user->data['user_id'] == ANONYMOUS)
if ($this->user->data['user_id'] === ANONYMOUS)
{
$data['session_id'] = $this->user->data['session_id'];
}
@@ -124,7 +125,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
*/
public function hasAccessToken()
{
if( $this->cachedToken ) {
if ($this->cachedToken) {
return true;
}
@@ -133,7 +134,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
'provider' => $this->service_name,
);
if ($this->user->data['user_id'] == ANONYMOUS)
if ($this->user->data['user_id'] === ANONYMOUS)
{
$data['session_id'] = $this->user->data['session_id'];
}
@@ -149,12 +150,12 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
$this->cachedToken = null;
$sql = 'DELETE FROM ' . $this->auth_provider_oauth_table . '
WHERE user_id = ' . $this->user->data['user_id'] . '
AND provider = \'' . $this->db->sql_escape($this->service_name) . '\'';
WHERE user_id = ' . $this->user->data['user_id'] . "
AND provider = '" . $this->db->sql_escape($this->service_name) . "'";
if ($this->user->data['user_id'] == ANONYMOUS)
if ($this->user->data['user_id'] === ANONYMOUS)
{
$sql .= ' AND session_id = \'' . $this->user->data['session_id'] . '\'';
$sql .= " AND session_id = '" . $this->user->data['session_id'] . "'";
}
$this->db->sql_query($sql);
@@ -176,8 +177,8 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
SET ' . $this->db->sql_build_array('UPDATE', array(
'user_id' => (int) $user_id
)) . '
WHERE user_id = ' . $this->user->data['user_id'] . '
AND session_id = \'' . $this->user->data['session_id'] . '\'';
WHERE user_id = ' . $this->user->data['user_id'] . "
AND session_id = '" . $this->user->data['session_id'] . "'";
$this->db->sql_query($sql);
}
@@ -188,7 +189,8 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
*/
public function has_access_token_by_session()
{
if( $this->cachedToken ) {
if ($this->cachedToken)
{
return true;
}
@@ -208,19 +210,12 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
*/
protected function _has_acess_token($data)
{
$row = $this->get_access_token_row($data);
if (!$row)
{
return false;
}
return true;
return (bool) $this->get_access_token_row($data);
}
public function retrieve_access_token_by_session()
{
if( $this->cachedToken instanceOf TokenInterface ) {
if ($this->cachedToken instanceOf TokenInterface) {
return $this->cachedToken;
}