makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-11 05:48:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

[feature/oauth] Update link_account to allow for two methods of linking

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-08-14 15:35:37 -04:00
parent ce387d9bfc
commit afebbf231a
3 changed files with 19 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
phpBB/includes/ucp/ucp_auth_link.php
View file

@ -54,7 +54,10 @@ class ucp_auth_link
// The current user_id is also necessary // The current user_id is also necessary
$link_data['user_id'] = $user->data['user_id']; $link_data['user_id'] = $user->data['user_id'];
if ($request->variable('link', false, false, phpbb_request_interface::POST)) // Tell the provider that the method is auth_link not login_link
$link_data['link_method'] = 'auth_link';
if ($request->variable('link', null))
{ {
$error[] = $auth_provider->link_account($link_data); $error[] = $auth_provider->link_account($link_data);
} }

3
phpBB/includes/ucp/ucp_login_link.php
View file

@ -73,6 +73,9 @@ class ucp_login_link
// Give the user_id to the data // Give the user_id to the data
$data['user_id'] = $login_result['user_row']['user_id']; $data['user_id'] = $login_result['user_row']['user_id'];
// Set the link_method to login_link
$data['link_method'] = 'login_link';
// The user is now logged in, attempt to link the user to the external account // The user is now logged in, attempt to link the user to the external account
$result = $auth_provider->link_account($data); $result = $auth_provider->link_account($data);

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

@ -364,7 +364,8 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
return 'LOGIN_LINK_NO_DATA_PROVIDED'; return 'LOGIN_LINK_NO_DATA_PROVIDED';
} }
if (!array_key_exists('oauth_service', $login_link_data) || !$login_link_data['oauth_service']) if (!array_key_exists('oauth_service', $login_link_data) || !$login_link_data['oauth_service'] ||
!array_key_exists('link_method', $login_link_data) || !$login_link_data['link_method'])
{ {
return 'LOGIN_LINK_MISSING_DATA'; return 'LOGIN_LINK_MISSING_DATA';
} }
@ -377,6 +378,16 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
*/ */
public function link_account(array $link_data) public function link_account(array $link_data)
{ {
// Check for a valid link method (auth_link or login_link)
if (!array_key_exists('link_method', $link_data) ||
!in_array($link_data['link_method'], array(
'auth_link',
'login_link',
)))
{
return 'LOGIN_LINK_MISSING_DATA';
}
// We must have an oauth_service listed, check for it two ways // We must have an oauth_service listed, check for it two ways
if (!array_key_exists('oauth_service', $link_data) || !$link_data['oauth_service']) if (!array_key_exists('oauth_service', $link_data) || !$link_data['oauth_service'])
{ {