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

[feature/oauth] Fix errors in OAuth

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-07-23 21:16:19 -04:00
parent c166801fe3
commit fe9c97cfb4
4 changed files with 23 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
phpBB/config/auth_providers.yml
View file

@ -64,11 +64,13 @@ services:
class: phpbb_auth_provider_oauth_service_facebook class: phpbb_auth_provider_oauth_service_facebook
arguments: arguments:
- @config - @config
- @request
tags: tags:
- { name: auth.provider.oauth.service } - { name: auth.provider.oauth.service }
auth.provider.oauth.service.google: auth.provider.oauth.service.google:
class: phpbb_auth_provider_oauth_service_google class: phpbb_auth_provider_oauth_service_google
arguments: arguments:
- @config - @config
- @request
tags: tags:
- { name: auth.provider.oauth.service } - { name: auth.provider.oauth.service }

2
phpBB/phpbb/auth/provider/oauth/service/base.php
View file

@ -50,6 +50,6 @@ abstract class phpbb_auth_provider_oauth_service_base implements phpbb_auth_prov
*/ */
public function set_external_service_provider(\OAuth\Common\Service\ServiceInterface $service_provider) public function set_external_service_provider(\OAuth\Common\Service\ServiceInterface $service_provider)
{ {
$this->service_provider = $service; $this->service_provider = $service_provider;
} }
} }

11
phpBB/phpbb/auth/provider/oauth/service/facebook.php
View file

@ -29,14 +29,23 @@ class phpbb_auth_provider_oauth_service_facebook extends phpbb_auth_provider_oau
*/ */
protected $config; protected $config;
/**
* phpBB request
*
* @var phpbb_request
*/
protected $request;
/** /**
* Constructor * Constructor
* *
* @param phpbb_config $config * @param phpbb_config $config
* @param phpbb_request $request
*/ */
public function __construct(phpbb_config $config) public function __construct(phpbb_config $config, phpbb_request $request)
{ {
$this->config = $config; $this->config = $config;
$this->request = $request;
} }
/** /**

11
phpBB/phpbb/auth/provider/oauth/service/google.php
View file

@ -29,14 +29,23 @@ class phpbb_auth_provider_oauth_service_google extends phpbb_auth_provider_oauth
*/ */
protected $config; protected $config;
/**
* phpBB request
*
* @var phpbb_request
*/
protected $request;
/** /**
* Constructor * Constructor
* *
* @param phpbb_config $config * @param phpbb_config $config
* @param phpbb_request $request
*/ */
public function __construct(phpbb_config $config) public function __construct(phpbb_config $config, phpbb_request $request)
{ {
$this->config = $config; $this->config = $config;
$this->request = $request;
} }
/** /**