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

[feature/oauth] Start implementing link/unlink actions

Browse source 
PHPBB3-11673
This commit is contained in:
Joseph Warner 2013-08-14 15:19:26 -04:00
parent 836d3ba22e
commit 67b1ec5bb8
3 changed files with 26 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -48,7 +48,20 @@ class ucp_auth_link
if (!sizeof($error)) if (!sizeof($error))
{ {
// Any post data could be necessary for auth (un)linking
$link_data = $request->get_super_global(phpbb_request_interface::POST);
// The current user_id is also necessary
$link_data['user_id'] = $user->data['user_id'];
if ($request->variable('link', false, false, phpbb_request_interface::POST))
{
$error[] = $auth_provider->link_account($link_data);
}
else
{
$error[] = $auth_provider->unlink_account($link_data);
}
} }
} }

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

@ -405,10 +405,18 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
return 'LOGIN_LINK_ERROR_OAUTH_NO_ACCESS_TOKEN'; return 'LOGIN_LINK_ERROR_OAUTH_NO_ACCESS_TOKEN';
} }
// Prepare the query string
if ($this->request->variable('mode', 'login_link'))
{
$query = 'mode=login_link';
} else {
$query = 'i=ucp_auth_link&mode=auth_link';
}
$query .= '&login_link_oauth_service=' . strtolower($link_data['oauth_service']);
// Prepare for an authentication request // Prepare for an authentication request
$service_credentials = $this->service_providers[$service_name]->get_service_credentials(); $service_credentials = $this->service_providers[$service_name]->get_service_credentials();
$scopes = $this->service_providers[$service_name]->get_auth_scope(); $scopes = $this->service_providers[$service_name]->get_auth_scope();
$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); $service = $this->get_service(strtolower($link_data['oauth_service']), $storage, $service_credentials, $scopes, $query);
$this->service_providers[$service_name]->set_external_service_provider($service); $this->service_providers[$service_name]->set_external_service_provider($service);
@ -462,7 +470,7 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
$oauth_user_ids = array(); $oauth_user_ids = array();
if ($rows !== false && !empty($rows)) if ($rows !== false && sizeof($rows))
{ {
foreach ($rows as $row) foreach ($rows as $row)
{ {
@ -478,14 +486,13 @@ class phpbb_auth_provider_oauth extends phpbb_auth_provider_base
if ($credentials['key'] && $credentials['secret']) if ($credentials['key'] && $credentials['secret'])
{ {
$actual_name = str_replace('auth.provider.oauth.service.', '', $service_name); $actual_name = str_replace('auth.provider.oauth.service.', '', $service_name);
$redirect_url = build_url(false) . '&login=external&oauth_service=' . $actual_name;
$block_vars[$service_name] = array( $block_vars[$service_name] = array(
'HIDDEN_FIELDS' => array( 'HIDDEN_FIELDS' => array(
'link' => (!isset($oauth_user_ids[$actual_name])),
'oauth_service' => $actual_name, 'oauth_service' => $actual_name,
), ),
'REDIRECT_URL' => redirect($redirect_url, true),
'SERVICE_NAME' => $this->user->lang['AUTH_PROVIDER_OAUTH_SERVICE_' . strtoupper($actual_name)], 'SERVICE_NAME' => $this->user->lang['AUTH_PROVIDER_OAUTH_SERVICE_' . strtoupper($actual_name)],
'UNIQUE_ID' => (isset($oauth_user_ids[$actual_name])) ? $oauth_user_ids[$actual_name] : null, 'UNIQUE_ID' => (isset($oauth_user_ids[$actual_name])) ? $oauth_user_ids[$actual_name] : null,
); );

4
phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
View file

@ -10,7 +10,7 @@
</dl> </dl>
<dl> <dl>
<dt>&nbsp;</dt> <dt>&nbsp;</dt>
<dd><input type="submit" name="unlink" tabindex="6" value="{L_UNLINK}" class="button1" /></dd> <dd><input type="submit" name="submit" tabindex="6" value="{L_UNLINK}" class="button1" /></dd>
</dl> </dl>
<!-- ELSE --> <!-- ELSE -->
<dl> <dl>
@ -18,7 +18,7 @@
</dl> </dl>
<dl> <dl>
<dt>&nbsp;</dt> <dt>&nbsp;</dt>
<dd><input type="submit" name="link" tabindex="6" value="{L_LINK}" class="button1" /></dd> <dd><input type="submit" name="submit" tabindex="6" value="{L_LINK}" class="button1" /></dd>
</dl> </dl>
<!-- ENDIF--> <!-- ENDIF-->
</fieldset> </fieldset>