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

[feature/oauth] Update oauth to reflect recent changes

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-07-15 14:57:00 -04:00
parent eb17462f90
commit 6e1c522bdd
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
phpBB/phpbb/auth/provider/oauth/oauth.php
View file

@ -109,7 +109,8 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
{ {
// Requst the name of the OAuth service // Requst the name of the OAuth service
$service_name = $this->request->variable('oauth_service', '', false, phpbb_request_interface::POST); $service_name = $this->request->variable('oauth_service', '', false, phpbb_request_interface::POST);
if ($service_name === '') $service_name = strtolower($service_name);
if ($service_name === '' && isset($this->services[$service_name]))
{ {
return array( return array(
'status' => LOGIN_ERROR_EXTERNAL_AUTH, 'status' => LOGIN_ERROR_EXTERNAL_AUTH,
@ -120,18 +121,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
} }
// Get the service credentials for the given service // Get the service credentials for the given service
$service_credentials = $this->get_credentials($service_name); $service_credentials = $this->services[$service_name]->get_credentials($service_name);
// Check that the service has settings
if ($service_credentials['key'] == false || $service_credentials['secret'] == false)
{
return array(
'status' => LOGIN_ERROR_EXTERNAL_AUTH,
// TODO: change error message
'error_msg' => 'LOGIN_ERROR_EXTERNAL_AUTH_APACHE',
'user_row' => array('user_id' => ANONYMOUS),
);
}
$storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $service_name, $this->auth_provider_oauth_table); $storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $service_name, $this->auth_provider_oauth_table);
$service = $this->get_service($service_name, $storage, $service_credentials, $this->get_scopes($service_name)); $service = $this->get_service($service_name, $storage, $service_credentials, $this->get_scopes($service_name));