mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 22:10:45 +02:00
[feature/oauth] Make token storage service ignorant
PHPBB3-11673
This commit is contained in:
@@ -175,7 +175,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
|
||||
// Get the service credentials for the given service
|
||||
$service_credentials = $this->service_providers[$service_name]->get_service_credentials();
|
||||
|
||||
$storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $service_name, $this->auth_provider_oauth_token_storage_table);
|
||||
$storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table);
|
||||
$query = 'mode=login&login=external&oauth_service=' . $service_name_original;
|
||||
$service = $this->get_service($service_name_original, $storage, $service_credentials, $this->service_providers[$service_name]->get_auth_scope(), $query);
|
||||
|
||||
@@ -442,10 +442,10 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
|
||||
*/
|
||||
protected function link_account_login_link(array $link_data, $service_name)
|
||||
{
|
||||
$storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $service_name, $this->auth_provider_oauth_token_storage_table);
|
||||
$storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table);
|
||||
|
||||
// Check for an access token, they should have one
|
||||
if (!$storage->has_access_token_by_session())
|
||||
if (!$storage->has_access_token_by_session($service_name))
|
||||
{
|
||||
return 'LOGIN_LINK_ERROR_OAUTH_NO_ACCESS_TOKEN';
|
||||
}
|
||||
@@ -485,7 +485,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
|
||||
*/
|
||||
protected function link_account_auth_link(array $link_data, $service_name)
|
||||
{
|
||||
$storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $service_name, $this->auth_provider_oauth_token_storage_table);
|
||||
$storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table);
|
||||
$query = 'i=ucp_auth_link&mode=auth_link&link=1&oauth_service=' . strtolower($link_data['oauth_service']);
|
||||
$service_credentials = $this->service_providers[$service_name]->get_service_credentials();
|
||||
$scopes = $this->service_providers[$service_name]->get_auth_scope();
|
||||
@@ -530,7 +530,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
|
||||
public function logout($data, $new_session)
|
||||
{
|
||||
// Clear all tokens belonging to the user
|
||||
$storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, '', $this->auth_provider_oauth_token_storage_table);
|
||||
$storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table);
|
||||
$stroage->clearAllTokens();
|
||||
|
||||
return;
|
||||
@@ -610,7 +610,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
|
||||
|
||||
// Clear all tokens belonging to the user on this servce
|
||||
$service_name = 'auth.provider.oauth.service.' . strtolower($link_data['oauth_service']);
|
||||
$storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $service_name, $this->auth_provider_oauth_token_storage_table);
|
||||
$storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $this->auth_provider_oauth_token_storage_table);
|
||||
$storage->clearToken($service_name);
|
||||
|
||||
return;
|
||||
|
@@ -43,13 +43,6 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
|
||||
*/
|
||||
protected $user;
|
||||
|
||||
/**
|
||||
* Name of the OAuth provider
|
||||
*
|
||||
* @var string
|
||||
*/
|
||||
protected $service_name;
|
||||
|
||||
/**
|
||||
* OAuth token table
|
||||
*
|
||||
@@ -67,21 +60,19 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
|
||||
*
|
||||
* @param phpbb_db_driver $db
|
||||
* @param phpbb_user $user
|
||||
* @param string $service_name
|
||||
* @param string $auth_provider_oauth_table
|
||||
*/
|
||||
public function __construct(phpbb_db_driver $db, phpbb_user $user, $service_name, $auth_provider_oauth_table)
|
||||
public function __construct(phpbb_db_driver $db, phpbb_user $user, $auth_provider_oauth_table)
|
||||
{
|
||||
$this->db = $db;
|
||||
$this->user = $user;
|
||||
$this->service_name = $service_name;
|
||||
$this->auth_provider_oauth_table = $auth_provider_oauth_table;
|
||||
}
|
||||
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function retrieveAccessToken()
|
||||
public function retrieveAccessToken($service)
|
||||
{
|
||||
if ($this->cachedToken instanceOf TokenInterface)
|
||||
{
|
||||
@@ -90,7 +81,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
|
||||
|
||||
$data = array(
|
||||
'user_id' => $this->user->data['user_id'],
|
||||
'provider' => $this->service_name,
|
||||
'provider' => $service,
|
||||
);
|
||||
|
||||
if ($this->user->data['user_id'] === ANONYMOUS)
|
||||
@@ -104,13 +95,13 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function storeAccessToken(TokenInterface $token)
|
||||
public function storeAccessToken($service, TokenInterface $token)
|
||||
{
|
||||
$this->cachedToken = $token;
|
||||
|
||||
$data = array(
|
||||
'user_id' => $this->user->data['user_id'],
|
||||
'provider' => $this->service_name,
|
||||
'provider' => $service,
|
||||
'oauth_token' => $this->json_encode_token($token),
|
||||
'session_id' => $this->user->data['session_id'],
|
||||
);
|
||||
@@ -123,7 +114,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
|
||||
/**
|
||||
* {@inheritdoc}
|
||||
*/
|
||||
public function hasAccessToken()
|
||||
public function hasAccessToken($service)
|
||||
{
|
||||
if ($this->cachedToken) {
|
||||
return true;
|
||||
@@ -131,7 +122,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
|
||||
|
||||
$data = array(
|
||||
'user_id' => $this->user->data['user_id'],
|
||||
'provider' => $this->service_name,
|
||||
'provider' => $service,
|
||||
);
|
||||
|
||||
if ($this->user->data['user_id'] === ANONYMOUS)
|
||||
@@ -205,7 +196,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
|
||||
*
|
||||
* @return bool true if they have token, false if they don't
|
||||
*/
|
||||
public function has_access_token_by_session()
|
||||
public function has_access_token_by_session($service)
|
||||
{
|
||||
if ($this->cachedToken)
|
||||
{
|
||||
@@ -214,7 +205,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
|
||||
|
||||
$data = array(
|
||||
'session_id' => $this->user->data['session_id'],
|
||||
'provider' => $this->service_name,
|
||||
'provider' => $service,
|
||||
);
|
||||
|
||||
return $this->_has_acess_token($data);
|
||||
@@ -231,7 +222,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
|
||||
return (bool) $this->get_access_token_row($data);
|
||||
}
|
||||
|
||||
public function retrieve_access_token_by_session()
|
||||
public function retrieve_access_token_by_session($service)
|
||||
{
|
||||
if ($this->cachedToken instanceOf TokenInterface) {
|
||||
return $this->cachedToken;
|
||||
@@ -239,7 +230,7 @@ class phpbb_auth_provider_oauth_token_storage implements TokenStorageInterface
|
||||
|
||||
$data = array(
|
||||
'session_id' => $this->user->data['session_id'],
|
||||
'provider' => $this->service_name,
|
||||
'provider' => $service,
|
||||
);
|
||||
|
||||
return $this->_retrieve_access_token($data);
|
||||
|
Reference in New Issue
Block a user