Added account block to link and unlink with Oauth
Updated CMS_OAUTH_20_MODULE, to handle account_info, block
This commit is contained in:
jvelilla
@@ -24,40 +24,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
{include file="block_change_password.tpl" /}
|
{include file="block_change_password.tpl" /}
|
||||||
<hr>
|
<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>
|
|
||||||
<h4>Roles</h4>
|
<h4>Roles</h4>
|
||||||
<div>
|
<div>
|
||||||
{foreach item="ic" from="$roles"}
|
{foreach item="ic" from="$roles"}
|
||||||
|
|||||||
@@ -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>
|
||||||
@@ -24,40 +24,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<hr>
|
<hr>
|
||||||
{include file="block_change_password.tpl" /}
|
{include file="block_change_password.tpl" /}
|
||||||
<hr>
|
<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>
|
|
||||||
<h4>Roles</h4>
|
<h4>Roles</h4>
|
||||||
<div>
|
<div>
|
||||||
{foreach item="ic" from="$roles"}
|
{foreach item="ic" from="$roles"}
|
||||||
|
|||||||
@@ -207,10 +207,6 @@ feature -- Hooks
|
|||||||
then
|
then
|
||||||
a_value.force ("account/roc-oauth-logout", "auth_login_strategy")
|
a_value.force ("account/roc-oauth-logout", "auth_login_strategy")
|
||||||
end
|
end
|
||||||
|
|
||||||
if attached a_response.current_user (a_response.request) as u then
|
|
||||||
associate_account (u, a_value)
|
|
||||||
end
|
|
||||||
end
|
end
|
||||||
|
|
||||||
menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
|
menu_system_alter (a_menu_system: CMS_MENU_SYSTEM; a_response: CMS_RESPONSE)
|
||||||
@@ -250,7 +246,7 @@ feature -- Hooks
|
|||||||
local
|
local
|
||||||
l_string: STRING
|
l_string: STRING
|
||||||
do
|
do
|
||||||
Result := <<"login">>
|
Result := <<"login", "account">>
|
||||||
debug ("roc")
|
debug ("roc")
|
||||||
create l_string.make_empty
|
create l_string.make_empty
|
||||||
across
|
across
|
||||||
@@ -270,6 +266,18 @@ 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
|
||||||
|
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
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -491,6 +499,7 @@ feature -- OAuth2 Login with Provider
|
|||||||
r: CMS_RESPONSE
|
r: CMS_RESPONSE
|
||||||
do
|
do
|
||||||
create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
|
create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
|
||||||
|
|
||||||
if req.is_post_request_method then
|
if req.is_post_request_method then
|
||||||
if
|
if
|
||||||
attached {WSF_STRING} req.form_parameter ("consumer") as l_consumer and then
|
attached {WSF_STRING} req.form_parameter ("consumer") as l_consumer and then
|
||||||
|
|||||||
32
modules/oauth20/site/templates/block_account_info.tpl
Normal file
32
modules/oauth20/site/templates/block_account_info.tpl
Normal 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>
|
||||||
Reference in New Issue
Block a user