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

[feature/oauth] Have array of services not just one in oauth

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-07-13 18:30:41 -04:00
parent 68a80f8ea8
commit 3c8187c277
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
phpBB/includes/auth/provider/oauth.php
View file

@ -61,11 +61,11 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
protected $auth_provider_oauth_table; protected $auth_provider_oauth_table;
/** /**
* Cached service once it has been created * Cached services once they has been created
* *
* @var \OAuth\Common\Service\ServiceInterface|null * @var array Contains \OAuth\Common\Service\ServiceInterface or null
*/ */
protected $service; protected $services;
/** /**
* Cached current uri object * Cached current uri object
@ -90,6 +90,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
$this->request = $request; $this->request = $request;
$this->user = $user; $this->user = $user;
$this->auth_provider_oauth_table = $auth_provider_oauth_table; $this->auth_provider_oauth_table = $auth_provider_oauth_table;
$this->services = array();
} }
/** /**
@ -181,9 +182,9 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
*/ */
protected function get_service($service_name, array $service_credentials, array $scopes = array()) protected function get_service($service_name, array $service_credentials, array $scopes = array())
{ {
if ($this->service) if ($this->services[$service_name])
{ {
return $this->service; return $this->services[$service_name];
} }
$storage = new phpbb_auth_oauth_token_storage($this->db, $this->user, $service_name, $this->auth_provider_oauth_table); $storage = new phpbb_auth_oauth_token_storage($this->db, $this->user, $service_name, $this->auth_provider_oauth_table);
@ -198,8 +199,8 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
); );
$service_factory = new \OAuth\ServiceFactory(); $service_factory = new \OAuth\ServiceFactory();
$this->service = $service_factory->createService($service_name, $credentials, $storage, $scopes); $this->service[$service_name] = $service_factory->createService($service_name, $credentials, $storage, $scopes);
return $this->service; return $this->service[$service_name];
} }
} }