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

Updated Account info:

Browse Source 
If user is not logged in, show a login option.
Updated New Password
    Added option to request a new password using username.
Updated templates to use {$site_url}
This commit is contained in:
jvelilla
2015-07-14 10:58:16 -03:00
parent 5688cffcf1
commit bba504df53
15 changed files with 98 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
<div class="primary-tabs"> <div class="primary-tabs">
{if isset="$user"} {if isset="$user"}
<h3>Account Information</h3> <h3>Account Information</h3>
<div> <div>
<div> <div>
@@ -16,7 +16,7 @@
<label>Last login:</label> {$user.last_login_date/} <label>Last login:</label> {$user.last_login_date/}
</div> </div>
<div> <div>
<form method="get" action="{$site_url/}account/{$strategy/}"> <form method="get" action="{$site_url/}{$auth_login_strategy/}">
<button type="submit">Logout</button> <button type="submit">Logout</button>
</form> </form>
</div> </div>
@@ -57,6 +57,13 @@
</div> </div>
{/foreach} {/foreach}
</div> </div>
{/if}
{/if} {unless isset="$user"}
<div>
<p> You are not logged in </p>
<form method="get" action="{$site_url/}{$auth.login/}">
<button type="submit">Login</button>
</form>
</div>
{/unless}
</div> </div>

9
examples/demo/site/modules/auth/templates/block_login.tpl
View File

@@ -25,10 +25,5 @@
</p> </p>
</div> </div>
</div> </div>
<div> {/unless}
{foreach item="item" from="$oauth_consumers"} </div>
<a href="{$site_url/}account/login-with-oauth/{$item/}">Login with {$item/}</a><br>
{/foreach}
</div>
{/unless}
</div>

20
examples/demo/site/modules/auth/templates/block_new_password.tpl
View File

@@ -1,7 +1,7 @@
<div> <div>
<form action="/account/new-password" method="post"> <form action="{$site_url/}account/new-password" method="post">
<fieldset> <fieldset>
<legend>Require new password</legend> <legend>Require new password by email</legend>
<div> <div>
<input type="email" id="email" name="email" value="{$email/}" required/> <input type="email" id="email" name="email" value="{$email/}" required/>
<label for="email">Email</label> <label for="email">Email</label>
@@ -13,4 +13,20 @@
<button type="submit">Send</button> <button type="submit">Send</button>
</fieldset> </fieldset>
</form> </form>
<hr>
<form action="{$site_url/}account/new-password" method="post">
<fieldset>
<legend>Require new password by username</legend>
<div>
<input type="text" id="username" name="username" value="{$username/}" required/>
<label for="username">Username</label>
{if isset="$error_username"}
<span><i>{$error_username/}</i></span> <br>
{/if}
<br>
</div>
<button type="submit">Send</button>
</fieldset>
</form>
</div> </div>

2
examples/demo/site/modules/auth/templates/block_reactivate.tpl
View File

@@ -1,5 +1,5 @@
<div> <div>
<form action="/account/reactivate" method="post"> <form action="{$site_url/}account/reactivate" method="post">
<fieldset> <fieldset>
<legend>Reactivate Form</legend> <legend>Reactivate Form</legend>
<div> <div>

2
examples/demo/site/modules/auth/templates/block_register.tpl
View File

@@ -1,5 +1,5 @@
<div> <div>
<form action="/account/roc-register" method="post"> <form action="{$site_url/}account/roc-register" method="post">
<fieldset> <fieldset>
<legend>Register Form</legend> <legend>Register Form</legend>
<div> <div>

2
examples/demo/site/modules/auth/templates/block_reset_password.tpl
View File

@@ -1,5 +1,5 @@
<div> <div>
<form action="/account/reset-password" method="post"> <form action="{$site_url/}account/reset-password" method="post">
<fieldset> <fieldset>
<legend>Generate New Password Form</legend> <legend>Generate New Password Form</legend>
<div> <div>

22
modules/auth/cms_authentication_module.e
View File

@@ -343,6 +343,24 @@ feature -- Handler
r.values.force (l_email.value, "email") r.values.force (l_email.value, "email")
r.set_status_code ({HTTP_CONSTANTS}.bad_request) r.set_status_code ({HTTP_CONSTANTS}.bad_request)
end end
elseif attached {WSF_STRING} req.form_parameter ("username") as l_username then
if attached {CMS_USER} l_user_api.user_by_name (l_username) as l_user and then
attached l_user.email as l_email
then
-- User exist create a new token and send a new email.
l_token := new_token
l_user_api.new_password (l_token, l_user.id)
l_url := req.absolute_script_url ("/account/reset-password?token=" + l_token)
-- Send Email
create es.make (create {CMS_AUTHENTICATION_EMAIL_SERVICE_PARAMETERS}.make (api))
write_debug_log (generator + ".handle register: send_contact_password_email")
es.send_contact_password_email (l_email, l_url)
else
r.values.force ("The username does not exist !", "error_username")
r.values.force (l_username.value, "username")
r.set_status_code ({HTTP_CONSTANTS}.bad_request)
end
end end
end end
r.execute r.execute
@@ -621,10 +639,12 @@ feature {NONE} -- Block views
end end
end end
elseif a_response.request.is_post_request_method then elseif a_response.request.is_post_request_method then
if a_response.values.has ("error_email") then if a_response.values.has ("error_email") or else a_response.values.has ("error_username") then
if attached template_block (a_block_id, a_response) as l_tpl_block then if attached template_block (a_block_id, a_response) as l_tpl_block then
l_tpl_block.set_value (a_response.values.item ("error_email"), "error_email") l_tpl_block.set_value (a_response.values.item ("error_email"), "error_email")
l_tpl_block.set_value (a_response.values.item ("email"), "email") l_tpl_block.set_value (a_response.values.item ("email"), "email")
l_tpl_block.set_value (a_response.values.item ("error_username"), "error_username")
l_tpl_block.set_value (a_response.values.item ("username"), "username")
a_response.add_block (l_tpl_block, "content") a_response.add_block (l_tpl_block, "content")
else else
debug ("cms") debug ("cms")

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

@@ -1,5 +1,5 @@
<div class="primary-tabs"> <div class="primary-tabs">
{if isset="$user"} {if isset="$user"}
<h3>Account Information</h3> <h3>Account Information</h3>
<div> <div>
<div> <div>
@@ -16,7 +16,7 @@
<label>Last login:</label> {$user.last_login_date/} <label>Last login:</label> {$user.last_login_date/}
</div> </div>
<div> <div>
<form method="get" action="{$site_url/}account/{$strategy/}"> <form method="get" action="{$site_url/}{$auth_login_strategy/}">
<button type="submit">Logout</button> <button type="submit">Logout</button>
</form> </form>
</div> </div>
@@ -57,6 +57,13 @@
</div> </div>
{/foreach} {/foreach}
</div> </div>
{/if}
{/if} {unless isset="$user"}
<div>
<p> You are not logged in </p>
<form method="get" action="{$site_url/}{$auth.login/}">
<button type="submit">Login</button>
</form>
</div>
{/unless}
</div> </div>

20
modules/auth/site/templates/block_new_password.tpl
View File

@@ -1,7 +1,7 @@
<div> <div>
<form action="/account/new-password" method="post"> <form action="{$site_url/}account/new-password" method="post">
<fieldset> <fieldset>
<legend>Require new password</legend> <legend>Require new password by email</legend>
<div> <div>
<input type="email" id="email" name="email" value="{$email/}" required/> <input type="email" id="email" name="email" value="{$email/}" required/>
<label for="email">Email</label> <label for="email">Email</label>
@@ -13,4 +13,20 @@
<button type="submit">Send</button> <button type="submit">Send</button>
</fieldset> </fieldset>
</form> </form>
<hr>
<form action="{$site_url/}account/new-password" method="post">
<fieldset>
<legend>Require new password by username</legend>
<div>
<input type="text" id="username" name="username" value="{$username/}" required/>
<label for="username">Username</label>
{if isset="$error_username"}
<span><i>{$error_username/}</i></span> <br>
{/if}
<br>
</div>
<button type="submit">Send</button>
</fieldset>
</form>
</div> </div>

2
modules/auth/site/templates/block_reactivate.tpl
View File

@@ -1,5 +1,5 @@
<div> <div>
<form action="/account/reactivate" method="post"> <form action="{$site_url/}account/reactivate" method="post">
<fieldset> <fieldset>
<legend>Reactivate Form</legend> <legend>Reactivate Form</legend>
<div> <div>

2
modules/auth/site/templates/block_register.tpl
View File

@@ -1,5 +1,5 @@
<div> <div>
<form action="/account/roc-register" method="post"> <form action="{$site_url/}account/roc-register" method="post">
<fieldset> <fieldset>
<legend>Register Form</legend> <legend>Register Form</legend>
<div> <div>

2
modules/auth/site/templates/block_reset_password.tpl
View File

@@ -1,5 +1,5 @@
<div> <div>
<form action="/account/reset-password" method="post"> <form action="{$site_url/}account/reset-password" method="post">
<fieldset> <fieldset>
<legend>Generate New Password Form</legend> <legend>Generate New Password Form</legend>
<div> <div>

3
modules/basic_auth/cms_basic_auth_module.e
View File

@@ -115,9 +115,8 @@ feature -- Hooks
-- <Precursor> -- <Precursor>
do do
if attached current_user (a_response.request) as l_user then if attached current_user (a_response.request) as l_user then
a_value.force (l_user, "user") a_value.force ("basic_auth_logoff", "auth_login_strategy")
end end
a_value.force ("basic_auth_logoff", "strategy")
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)

8
modules/oauth20/cms_oauth_20_module.e
View File

@@ -199,10 +199,12 @@ feature -- Hooks
value_table_alter (a_value: CMS_VALUE_TABLE; a_response: CMS_RESPONSE) value_table_alter (a_value: CMS_VALUE_TABLE; a_response: CMS_RESPONSE)
-- <Precursor> -- <Precursor>
do do
if attached current_user (a_response.request) as l_user then if
a_value.force (l_user, "user") attached a_response.current_user (a_response.request) as u and then
attached {WSF_STRING} a_response.request.cookie ({CMS_OAUTH_20_CONSTANTS}.oauth_session)
then
a_value.force ("account/roc-oauth-logout", "auth_login_strategy")
end end
a_value.force ("roc-oauth-logout", "strategy")
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)

8
modules/openid/cms_openid_module.e
View File

@@ -179,10 +179,12 @@ feature -- Hooks
value_table_alter (a_value: CMS_VALUE_TABLE; a_response: CMS_RESPONSE) value_table_alter (a_value: CMS_VALUE_TABLE; a_response: CMS_RESPONSE)
-- <Precursor> -- <Precursor>
do do
if attached current_user (a_response.request) as l_user then if
a_value.force (l_user, "user") attached a_response.current_user (a_response.request) as u and then
attached {WSF_STRING} a_response.request.cookie ({CMS_OPENID_CONSTANTS}.openid_session)
then
a_value.force ("account/roc-openid-logout", "auth_login_strategy")
end end
a_value.force ("roc-openid-logout", "strategy")
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)