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

Merge branch '3.2.x'

Browse source
This commit is contained in:
Marc Alexander 2019-04-07 10:58:38 +02:00
commit 2fd4b972b1
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
1 changed files with 13 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -221,24 +221,33 @@ class oauth extends \phpbb\auth\provider\base
'provider' => $service_name_original, 'provider' => $service_name_original,
'oauth_provider_id' => $unique_id 'oauth_provider_id' => $unique_id
); );
$sql = 'SELECT user_id FROM ' . $this->auth_provider_oauth_token_account_assoc . ' $sql = 'SELECT user_id FROM ' . $this->auth_provider_oauth_token_account_assoc . '
WHERE ' . $this->db->sql_build_array('SELECT', $data); WHERE ' . $this->db->sql_build_array('SELECT', $data);
$result = $this->db->sql_query($sql); $result = $this->db->sql_query($sql);
$row = $this->db->sql_fetchrow($result); $row = $this->db->sql_fetchrow($result);
$this->db->sql_freeresult($result); $this->db->sql_freeresult($result);
$redirect_data = array(
'auth_provider' => 'oauth',
'login_link_oauth_service' => $service_name_original,
);
/** /**
* Event is triggered before check if provider is already associated with an account * Event is triggered before check if provider is already associated with an account
* *
* @event core.oauth_login_after_check_if_provider_id_has_match * @event core.oauth_login_after_check_if_provider_id_has_match
* @var array row User row * @var array row User row
* @var array data Provider data * @var array data Provider data
* @var array redirect_data Data to be appended to the redirect url
* @var \OAuth\Common\Service\ServiceInterface service OAuth service * @var \OAuth\Common\Service\ServiceInterface service OAuth service
* @since 3.2.3-RC1 * @since 3.2.3-RC1
* @changed 3.2.6-RC1 Added redirect_data
*/ */
$vars = array( $vars = array(
'row', 'row',
'data', 'data',
'redirect_data',
'service', 'service',
); );
extract($this->dispatcher->trigger_event('core.oauth_login_after_check_if_provider_id_has_match', compact($vars))); extract($this->dispatcher->trigger_event('core.oauth_login_after_check_if_provider_id_has_match', compact($vars)));
@ -250,10 +259,7 @@ class oauth extends \phpbb\auth\provider\base
'status' => LOGIN_SUCCESS_LINK_PROFILE, 'status' => LOGIN_SUCCESS_LINK_PROFILE,
'error_msg' => 'LOGIN_OAUTH_ACCOUNT_NOT_LINKED', 'error_msg' => 'LOGIN_OAUTH_ACCOUNT_NOT_LINKED',
'user_row' => array(), 'user_row' => array(),
'redirect_data' => array( 'redirect_data' => $redirect_data,
'auth_provider' => 'oauth',
'login_link_oauth_service' => $service_name_original,
),
); );
} }