diff options
| author | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-14 17:40:09 -0400 |
|---|---|---|
| committer | Joseph Warner <hardolaf@hardolaf.com> | 2013-07-14 17:42:26 -0400 |
| commit | 0156bac3e2121cf23d0fef048233257fcb2c0d25 (patch) | |
| tree | 87e7385e244016e7498c24197228d65ab4283d74 /phpBB/phpbb | |
| parent | 80c5a4252569b4b219904f16069ca319670c8555 (diff) | |
| download | forums-0156bac3e2121cf23d0fef048233257fcb2c0d25.tar forums-0156bac3e2121cf23d0fef048233257fcb2c0d25.tar.gz forums-0156bac3e2121cf23d0fef048233257fcb2c0d25.tar.bz2 forums-0156bac3e2121cf23d0fef048233257fcb2c0d25.tar.xz forums-0156bac3e2121cf23d0fef048233257fcb2c0d25.zip | |
[feature/oauth] Update auth provider oauth to take in service providers
PHPBB3-11673
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/auth/provider/oauth/oauth.php | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php index c4908dbf6c..4db9946e50 100644 --- a/phpBB/phpbb/auth/provider/oauth/oauth.php +++ b/phpBB/phpbb/auth/provider/oauth/oauth.php @@ -68,6 +68,13 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base protected $services; /** + * All OAuth service providers + * + * @var array Contains phpbb_auth_provider_oauth_service_interface + */ + protected $service_providers; + + /** * Cached current uri object * * @var \OAuth\Common\Http\Uri\UriInterface|null @@ -82,14 +89,16 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base * @param phpbb_request $request * @param phpbb_user $user * @param string $auth_provider_oauth_table + * @param phpbb_auth_provider_oauth_service_interface $service_providers */ - public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $auth_provider_oauth_table) + public function __construct(phpbb_db_driver $db, phpbb_config $config, phpbb_request $request, phpbb_user $user, $auth_provider_oauth_table, phpbb_auth_provider_oauth_service_interface $service_providers) { $this->db = $db; $this->config = $config; $this->request = $request; $this->user = $user; $this->auth_provider_oauth_table = $auth_provider_oauth_table; + $this->service_providers = $service_providers; $this->services = array(); } |