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

Added account block to link and unlink with Oauth

Browse Source 
Updated CMS_OAUTH_20_MODULE, to handle account_info, block
This commit is contained in:
jvelilla
2015-07-15 13:22:19 -03:00
parent 5d498c0bf2
commit 77487e90f3
5 changed files with 80 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
examples/demo/site/modules/auth/templates/block_account_info.tpl
View File

@@ -24,40 +24,7 @@
</div>
<hr>
{include file="block_change_password.tpl" /}
<hr>
<h4>Un-Associate Account with Oauth Consumer</h4>
<div>
{foreach item="consumer" from="$oauth_associated"}
<div>
<form method="post" action="{$site_url/}account/oauth-un-associate">
<div>
<input type="hidden" name="consumer" value="{$consumer/}"/>
</div>
<div>
<button type="submit">Unlink {$consumer/}</button>
</div>
</form>
</div>
{/foreach}
</div>
<h4>Associate Account with Oauth Consumer</h4>
<div>
{foreach item="consumer" from="$oauth_not_associated"}
<div>
<form method="post" action="{$site_url/}account/oauth-associate">
<div>
<input type="hidden" name="consumer" value="{$consumer/}"/>
</div>
<div>
<input type="email" id="email" name="email" value="{$email/}" required/>
<button type="submit">Link with {$consumer/}</button>
</div>
</form>
</div>
{/foreach}
</div>
<hr>
<hr>
<h4>Roles</h4>
<div>
{foreach item="ic" from="$roles"}

32
examples/demo/site/modules/oauth20/templates/block_account_info.tpl Normal file
View File

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

35
modules/auth/site/templates/block_account_info.tpl
View File

@@ -24,40 +24,7 @@
</div>
<hr>
{include file="block_change_password.tpl" /}
<hr>
<h4>Un-Associate Account with Oauth Consumer</h4>
<div>
{foreach item="consumer" from="$oauth_associated"}
<div>
<form method="post" action="{$site_url/}account/oauth-un-associate">
<div>
<input type="hidden" name="consumer" value="{$consumer/}"/>
</div>
<div>
<button type="submit">Unlink {$consumer/}</button>
</div>
</form>
</div>
{/foreach}
</div>
<h4>Associate Account with Oauth Consumer</h4>
<div>
{foreach item="consumer" from="$oauth_not_associated"}
<div>
<form method="post" action="{$site_url/}account/oauth-associate">
<div>
<input type="hidden" name="consumer" value="{$consumer/}"/>
</div>
<div>
<input type="email" id="email" name="email" value="{$email/}" required/>
<button type="submit">Link with {$consumer/}</button>
</div>
</form>
</div>
{/foreach}
</div>
<hr>
<hr>
<h4>Roles</h4>
<div>
{foreach item="ic" from="$roles"}

19
modules/oauth20/cms_oauth_20_module.e
View File

@@ -207,10 +207,6 @@ feature -- Hooks
then
a_value.force ("account/roc-oauth-logout", "auth_login_strategy")
end
if attached a_response.current_user (a_response.request) as u then
associate_account (u, a_value)
end
end
menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
@@ -250,7 +246,7 @@ feature -- Hooks
local
l_string: STRING
do
Result := <<"login">>
Result := <<"login", "account">>
debug ("roc")
create l_string.make_empty
across
@@ -270,6 +266,18 @@ feature -- Hooks
a_response.location.starts_with ("account/roc-oauth-login")
then
get_block_view_login (a_block_id, a_response)
elseif a_block_id.is_case_insensitive_equal_general ("account") then
if
attached template_block ("account_info", a_response) as l_tpl_block and then
attached current_user (a_response.request) as l_user
then
associate_account (l_user, a_response.values)
a_response.add_block (l_tpl_block, "content")
else
debug ("cms")
a_response.add_warning_message ("Error with block [resources_page]")
end
end
end
end
@@ -491,6 +499,7 @@ feature -- OAuth2 Login with Provider
r: CMS_RESPONSE
do
create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
if req.is_post_request_method then
if
attached {WSF_STRING} req.form_parameter ("consumer") as l_consumer and then

32
modules/oauth20/site/templates/block_account_info.tpl Normal file
View File

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