backup/ROC
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Display the OAuth association only in "account" page.

Browse Source 
Improved the template to show only when pertinent.
This commit is contained in:
Jocelyn FIAT
2015-07-16 15:49:14 +02:00
parent 3c0122d98f
commit 769c14caf8
3 changed files with 18 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
examples/demo/site/modules/oauth20/templates/block_account_info.tpl
View File

@@ -1,12 +1,11 @@
<hr> <hr>
{unless isempty="$oauth_associated"}
<h4>Un-Associate Account with Oauth Consumer</h4> <h4>Un-Associate Account with Oauth Consumer</h4>
<div> <div>
{foreach item="consumer" from="$oauth_associated"} {foreach item="consumer" from="$oauth_associated"}
<div> <div>
<form method="post" action="{$site_url/}account/oauth-un-associate"> <form method="post" action="{$site_url/}account/oauth-un-associate">
<div> <input type="hidden" name="consumer" value="{$consumer/}"/>
<input type="hidden" name="consumer" value="{$consumer/}"/>
</div>
<div> <div>
<button type="submit">Unlink {$consumer/}</button> <button type="submit">Unlink {$consumer/}</button>
</div> </div>
@@ -14,14 +13,14 @@
</div> </div>
{/foreach} {/foreach}
</div> </div>
{/unless}
{unless isempty="$oauth_not_associated"}
<h4>Associate Account with Oauth Consumer</h4> <h4>Associate Account with Oauth Consumer</h4>
<div> <div>
{foreach item="consumer" from="$oauth_not_associated"} {foreach item="consumer" from="$oauth_not_associated"}
<div> <div>
<form method="post" action="{$site_url/}account/oauth-associate"> <form method="post" action="{$site_url/}account/oauth-associate">
<div> <input type="hidden" name="consumer" value="{$consumer/}"/>
<input type="hidden" name="consumer" value="{$consumer/}"/>
</div>
<div> <div>
<input type="email" id="email" name="email" value="{$email/}" required/> <input type="email" id="email" name="email" value="{$email/}" required/>
<button type="submit">Link with {$consumer/}</button> <button type="submit">Link with {$consumer/}</button>
@@ -30,3 +29,4 @@
</div> </div>
{/foreach} {/foreach}
</div> </div>
{/unless}

6
modules/oauth20/cms_oauth_20_module.e
View File

@@ -266,10 +266,12 @@ feature -- Hooks
a_response.location.starts_with ("account/roc-oauth-login") a_response.location.starts_with ("account/roc-oauth-login")
then then
get_block_view_login (a_block_id, a_response) get_block_view_login (a_block_id, a_response)
elseif a_block_id.is_case_insensitive_equal_general ("account") then elseif a_block_id.is_case_insensitive_equal_general ("account") and then
a_response.location.same_string ("account")
then
if if
attached template_block ("account_info", a_response) as l_tpl_block and then attached template_block ("account_info", a_response) as l_tpl_block and then
attached current_user (a_response.request) as l_user attached a_response.user as l_user
then then
associate_account (l_user, a_response.values) associate_account (l_user, a_response.values)
a_response.add_block (l_tpl_block, "content") a_response.add_block (l_tpl_block, "content")

12
modules/oauth20/site/templates/block_account_info.tpl
View File

@@ -1,12 +1,11 @@
<hr> <hr>
{unless isempty="$oauth_associated"}
<h4>Un-Associate Account with Oauth Consumer</h4> <h4>Un-Associate Account with Oauth Consumer</h4>
<div> <div>
{foreach item="consumer" from="$oauth_associated"} {foreach item="consumer" from="$oauth_associated"}
<div> <div>
<form method="post" action="{$site_url/}account/oauth-un-associate"> <form method="post" action="{$site_url/}account/oauth-un-associate">
<div> <input type="hidden" name="consumer" value="{$consumer/}"/>
<input type="hidden" name="consumer" value="{$consumer/}"/>
</div>
<div> <div>
<button type="submit">Unlink {$consumer/}</button> <button type="submit">Unlink {$consumer/}</button>
</div> </div>
@@ -14,14 +13,14 @@
</div> </div>
{/foreach} {/foreach}
</div> </div>
{/unless}
{unless isempty="$oauth_not_associated"}
<h4>Associate Account with Oauth Consumer</h4> <h4>Associate Account with Oauth Consumer</h4>
<div> <div>
{foreach item="consumer" from="$oauth_not_associated"} {foreach item="consumer" from="$oauth_not_associated"}
<div> <div>
<form method="post" action="{$site_url/}account/oauth-associate"> <form method="post" action="{$site_url/}account/oauth-associate">
<div> <input type="hidden" name="consumer" value="{$consumer/}"/>
<input type="hidden" name="consumer" value="{$consumer/}"/>
</div>
<div> <div>
<input type="email" id="email" name="email" value="{$email/}" required/> <input type="email" id="email" name="email" value="{$email/}" required/>
<button type="submit">Link with {$consumer/}</button> <button type="submit">Link with {$consumer/}</button>
@@ -30,3 +29,4 @@
</div> </div>
{/foreach} {/foreach}
</div> </div>
{/unless}