makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/oauth] Consolidate repeated query into one function

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-07-30 14:08:13 -04:00
parent e53ebb1b68
commit bf9d4e0cdf
1 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
phpBB/phpbb/auth/provider/oauth/token_storage.php
View file

@ -141,14 +141,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
$data['session_id'] = $this->user->data['session_id'];
}
$row = $this->_has_acess_token($data);
if (!$row)
{
return false;
}
return true;
return $this->_has_acess_token($data);
}
/**
@ -207,7 +200,18 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
'provider' => $this->service_name,
);
$row = $this->_has_acess_token($data);
return $this->_has_acess_token($data);
}
/**
* A helper function that performs the query for has access token functions
*
* @param array $data
* @return bool
*/
protected function _has_acess_token($data)
{
$row = $this->get_access_token_row($data);
if (!$row)
{
@ -217,23 +221,6 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
return true;
}
/**
* A helper function that performs the query for has access token functions
*
* @param array $data
* @return mixed
*/
protected function _has_acess_token($data)
{
$sql = 'SELECT oauth_token FROM ' . $this->auth_provider_oauth_table . '
WHERE ' . $this->db->sql_build_array('SELECT', $data);
$result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result);
return $row;
}
public function retrieve_access_token_by_session()
{
if( $this->cachedToken instanceOf TokenInterface ) {
@ -257,11 +244,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
*/
protected function _retrieve_access_token($data)
{
$sql = 'SELECT oauth_token FROM ' . $this->auth_provider_oauth_table . '
WHERE ' . $this->db->sql_build_array('SELECT', $data);
$result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result);
$row = $this->get_access_token_row($data);
if (!$row)
{
@ -282,4 +265,21 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
$this->cachedToken = $token;
return $token;
}
/**
* A helper function that performs the query for retrieving an access token
*
* @param array $data
* @return mixed
*/
protected function get_access_token_row($data)
{
$sql = 'SELECT oauth_token FROM ' . $this->auth_provider_oauth_table . '
WHERE ' . $this->db->sql_build_array('SELECT', $data);
$result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result);
return $row;
}
}