mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-02-24 20:13:22 +01:00
Code Issues Releases Wiki Activity

[feature/oauth] Update auth provider oauth to take in service providers

Browse Source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-07-14 17:40:09 -04:00
parent 80c5a42525
commit 0156bac3e2
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
phpBB/config/auth_providers.yml
View File

@ -43,6 +43,7 @@ services:
- @request - @request
- @user - @user
- %tables.auth_provider_oauth% - %tables.auth_provider_oauth%
- @auth.provider.oauth.service_collection
tags: tags:
- { name: auth.provider } - { name: auth.provider }
auth.provider.oauth.service_collection: auth.provider.oauth.service_collection:

11
phpBB/phpbb/auth/provider/oauth/oauth.php
View File

@ -67,6 +67,13 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
*/ */
protected $services; protected $services;
/**
* All OAuth service providers
*
* @var array Contains phpbb_auth_provider_oauth_service_interface
*/
protected $service_providers;
/** /**
* Cached current uri object * Cached current uri object
* *
@ -82,14 +89,16 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
* @param phpbb_request $request * @param phpbb_request $request
* @param phpbb_user $user * @param phpbb_user $user
* @param string $auth_provider_oauth_table * @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->db = $db;
$this->config = $config; $this->config = $config;
$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->service_providers = $service_providers;
$this->services = array(); $this->services = array();
} }