Compare commits
2 Commits
clean20160
...
es_rev9848
| Author | SHA1 | Date | |
|---|---|---|---|
| db697cec3e | |||
| 892f2331de |
@@ -68,9 +68,9 @@ feature -- Hooks
|
|||||||
l_destination: READABLE_STRING_8
|
l_destination: READABLE_STRING_8
|
||||||
do
|
do
|
||||||
if attached {WSF_STRING} a_response.request.query_parameter ("destination") as p_destination then
|
if attached {WSF_STRING} a_response.request.query_parameter ("destination") as p_destination then
|
||||||
l_destination := p_destination.url_encoded_value
|
l_destination := p_destination.value
|
||||||
else
|
else
|
||||||
l_destination := percent_encoded (a_response.location)
|
l_destination := a_response.location
|
||||||
end
|
end
|
||||||
if is_authenticating (a_response) then
|
if is_authenticating (a_response) then
|
||||||
|
|
||||||
|
|||||||
@@ -130,13 +130,13 @@ feature -- Access
|
|||||||
account_re_activation: STRING
|
account_re_activation: STRING
|
||||||
-- Account re_activation template email message.
|
-- Account re_activation template email message.
|
||||||
do
|
do
|
||||||
Result := template_string ("accunt_re_activation.html", default_template_account_re_activation)
|
Result := template_string ("account_re_activation.html", default_template_account_re_activation)
|
||||||
end
|
end
|
||||||
|
|
||||||
account_rejected: STRING
|
account_rejected: STRING
|
||||||
-- Account rejected template email message.
|
-- Account rejected template email message.
|
||||||
do
|
do
|
||||||
Result := template_string ("accunt_rejected.html", default_template_account_rejected)
|
Result := template_string ("account_rejected.html", default_template_account_rejected)
|
||||||
end
|
end
|
||||||
|
|
||||||
account_password: STRING
|
account_password: STRING
|
||||||
@@ -277,7 +277,7 @@ feature {NONE} -- Message email
|
|||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<p>You requested has been rejected, your application does not conform our rules <a href="$host">$sitename</a></p>
|
<p>Your account application is rejected, it does not conform our rules <a href="$host">$sitename</a></p>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
]"
|
]"
|
||||||
@@ -316,7 +316,7 @@ feature {NONE} -- Message email
|
|||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<p>You have required a new password at <a href="$host">$sitename</a></p>
|
<p>You have requested a new password at <a href="$host">$sitename</a></p>
|
||||||
|
|
||||||
<p>To complete your request, please click on this link to generate a new password:<p>
|
<p>To complete your request, please click on this link to generate a new password:<p>
|
||||||
|
|
||||||
@@ -337,7 +337,7 @@ feature {NONE} -- Message email
|
|||||||
</head>
|
</head>
|
||||||
|
|
||||||
<body>
|
<body>
|
||||||
<p>Welcome to<a href="...">$sitename</a></p>
|
<p>Welcome to <a href="$host">$sitename</a>.</p>
|
||||||
<p>Thank you for joining us.</p>
|
<p>Thank you for joining us.</p>
|
||||||
</body>
|
</body>
|
||||||
</html>
|
</html>
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
note
|
note
|
||||||
description: "Module Auth"
|
description: "Module Auth"
|
||||||
date: "$Date: 2015-05-20 06:50:50 -0300 (mi. 20 de may. de 2015) $"
|
date: "$Date$"
|
||||||
revision: "$Revision: 97328 $"
|
revision: "$Revision$"
|
||||||
|
|
||||||
class
|
class
|
||||||
CMS_AUTHENTICATION_MODULE
|
CMS_AUTHENTICATION_MODULE
|
||||||
@@ -79,6 +79,10 @@ feature -- Access: docs
|
|||||||
|
|
||||||
feature -- Router
|
feature -- Router
|
||||||
|
|
||||||
|
roc_login_location: STRING = "account/roc-login"
|
||||||
|
|
||||||
|
roc_logout_location: STRING = "account/roc-logout"
|
||||||
|
|
||||||
setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
|
setup_router (a_router: WSF_ROUTER; a_api: CMS_API)
|
||||||
-- <Precursor>
|
-- <Precursor>
|
||||||
do
|
do
|
||||||
@@ -97,8 +101,8 @@ feature -- Router
|
|||||||
a_router.map (m, a_router.methods_head_get)
|
a_router.map (m, a_router.methods_head_get)
|
||||||
|
|
||||||
|
|
||||||
a_router.handle ("/account/roc-login", create {WSF_URI_AGENT_HANDLER}.make (agent handle_login(a_api, ?, ?)), a_router.methods_head_get)
|
a_router.handle ("/" + roc_login_location, create {WSF_URI_AGENT_HANDLER}.make (agent handle_login(a_api, ?, ?)), a_router.methods_head_get)
|
||||||
a_router.handle ("/account/roc-logout", create {WSF_URI_AGENT_HANDLER}.make (agent handle_logout(a_api, ?, ?)), a_router.methods_head_get)
|
a_router.handle ("/" + roc_logout_location, create {WSF_URI_AGENT_HANDLER}.make (agent handle_logout(a_api, ?, ?)), a_router.methods_head_get)
|
||||||
a_router.handle ("/account/roc-register", create {WSF_URI_AGENT_HANDLER}.make (agent handle_register(a_api, ?, ?)), a_router.methods_get_post)
|
a_router.handle ("/account/roc-register", create {WSF_URI_AGENT_HANDLER}.make (agent handle_register(a_api, ?, ?)), a_router.methods_get_post)
|
||||||
a_router.handle ("/account/activate/{token}", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent handle_activation(a_api, ?, ?)), a_router.methods_head_get)
|
a_router.handle ("/account/activate/{token}", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent handle_activation(a_api, ?, ?)), a_router.methods_head_get)
|
||||||
a_router.handle ("/account/reject/{token}", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent handle_reject(a_api, ?, ?)), a_router.methods_head_get)
|
a_router.handle ("/account/reject/{token}", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent handle_reject(a_api, ?, ?)), a_router.methods_head_get)
|
||||||
@@ -128,8 +132,35 @@ feature -- Hooks configuration
|
|||||||
|
|
||||||
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>
|
||||||
|
local
|
||||||
|
l_destination: detachable READABLE_STRING_GENERAL
|
||||||
|
l_url: STRING
|
||||||
|
l_url_name: READABLE_STRING_GENERAL
|
||||||
do
|
do
|
||||||
a_value.force (a_response.user, "user")
|
if attached {WSF_STRING} a_response.request.query_parameter ("destination") as p_destination then
|
||||||
|
l_destination := p_destination.value
|
||||||
|
else
|
||||||
|
l_destination := a_response.location
|
||||||
|
end
|
||||||
|
if l_destination.starts_with ("account/auth/") then
|
||||||
|
l_destination := Void
|
||||||
|
end
|
||||||
|
|
||||||
|
if attached a_response.user as u then
|
||||||
|
a_value.force (u, "user")
|
||||||
|
|
||||||
|
l_url_name := "site_sign_out_url"
|
||||||
|
l_url := a_response.url (roc_logout_location, Void)
|
||||||
|
else
|
||||||
|
a_value.force (Void, "user")
|
||||||
|
|
||||||
|
l_url_name := "site_sign_in_url"
|
||||||
|
l_url := a_response.url (roc_login_location, Void)
|
||||||
|
end
|
||||||
|
if l_destination /= Void then
|
||||||
|
l_url.append ("?destination=" + percent_encoded (l_destination))
|
||||||
|
end
|
||||||
|
a_value.force (l_url, l_url_name)
|
||||||
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)
|
||||||
@@ -143,14 +174,14 @@ feature -- Hooks configuration
|
|||||||
lnk.set_weight (97)
|
lnk.set_weight (97)
|
||||||
a_menu_system.primary_menu.extend (lnk)
|
a_menu_system.primary_menu.extend (lnk)
|
||||||
|
|
||||||
create lnk.make ("Logout", "account/roc-logout")
|
create lnk.make ("Logout", roc_logout_location)
|
||||||
else
|
else
|
||||||
create lnk.make ("Login", "account/roc-login")
|
create lnk.make ("Login", roc_login_location)
|
||||||
end
|
end
|
||||||
lnk.set_weight (98)
|
lnk.set_weight (98)
|
||||||
if
|
if
|
||||||
a_response.location.starts_with_general ("account/auth/")
|
a_response.location.starts_with_general ("account/auth/")
|
||||||
or a_response.location.starts_with_general ("account/roc-log")
|
or a_response.location.starts_with_general ("account/roc-log") -- in ou out
|
||||||
then
|
then
|
||||||
-- ignore destination
|
-- ignore destination
|
||||||
else
|
else
|
||||||
@@ -199,7 +230,7 @@ feature -- Handler
|
|||||||
r.set_main_content (b)
|
r.set_main_content (b)
|
||||||
|
|
||||||
if l_user = Void then
|
if l_user = Void then
|
||||||
r.set_redirection ("account/roc-login")
|
r.set_redirection (roc_login_location)
|
||||||
end
|
end
|
||||||
r.execute
|
r.execute
|
||||||
end
|
end
|
||||||
|
|||||||
Reference in New Issue
Block a user