aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/phpbb/auth/provider/oauth
diff options
context:
space:
mode:
authorJoseph Warner <hardolaf@hardolaf.com>2013-08-02 14:23:18 -0400
committerJoseph Warner <hardolaf@hardolaf.com>2013-08-02 14:23:35 -0400
commit2222f3f38048b004b353f0f346cee1d1a0eafd37 (patch)
treee4b37cd5d9dbe0aefc56446e20f47892f4241692 /phpBB/phpbb/auth/provider/oauth
parent1ae2283b348d6fef1f9e90a49e2a25914465585e (diff)
downloadforums-2222f3f38048b004b353f0f346cee1d1a0eafd37.tar
forums-2222f3f38048b004b353f0f346cee1d1a0eafd37.tar.gz
forums-2222f3f38048b004b353f0f346cee1d1a0eafd37.tar.bz2
forums-2222f3f38048b004b353f0f346cee1d1a0eafd37.tar.xz
forums-2222f3f38048b004b353f0f346cee1d1a0eafd37.zip
[feature/oauth] Fix error caused by previous change in OAuth
PHPBB3-11673
Diffstat (limited to 'phpBB/phpbb/auth/provider/oauth')
-rw-r--r--phpBB/phpbb/auth/provider/oauth/oauth.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/phpbb/auth/provider/oauth/oauth.php b/phpBB/phpbb/auth/provider/oauth/oauth.php
index 1cc19d143e..3528c0b83f 100644
--- a/phpBB/phpbb/auth/provider/oauth/oauth.php
+++ b/phpBB/phpbb/auth/provider/oauth/oauth.php
@@ -149,7 +149,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
$service_credentials = $this->service_providers[$service_name]->get_service_credentials();
$storage = new phpbb_auth_provider_oauth_token_storage($this->db, $this->user, $service_name, $this->auth_provider_oauth_token_storage_table);
- $query = 'mode=login&login=external&oauth_service=' . $service_name;
+ $query = 'mode=login&login=external&oauth_service=' . $service_name_original;
$service = $this->get_service($service_name_original, $storage, $service_credentials, $this->service_providers[$service_name]->get_auth_scope(), $query);
if ($this->request->is_set('code', phpbb_request_interface::GET))
@@ -399,7 +399,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
// Prepare for an authentication request
$service_credentials = $this->service_providers[$service_name]->get_service_credentials();
$scopes = $this->service_providers[$service_name]->get_auth_scope();
- $query = 'mode=login_link&login_link_oauth_service=' . $service_name;
+ $query = 'mode=login_link&login_link_oauth_service=' . strtolower($link_data['oauth_service']);
$service = $this->get_service(strtolower($link_data['oauth_service']), $storage, $service_credentials, $scopes, $query);
$this->service_providers[$service_name]->set_external_service_provider($service);