From 816f0eb8200b19379ceb6fe9fb124905bdb11046 Mon Sep 17 00:00:00 2001 From: Jocelyn Fiat Date: Wed, 13 Apr 2016 12:53:10 +0200 Subject: [PATCH] Improved session auth module routing. --- modules/auth/cms_authentication_module.e | 6 +++--- modules/session_auth/cms_session_auth_module.e | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/auth/cms_authentication_module.e b/modules/auth/cms_authentication_module.e index 07b4dc6..a903134 100644 --- a/modules/auth/cms_authentication_module.e +++ b/modules/auth/cms_authentication_module.e @@ -1,7 +1,7 @@ note description: "Module Auth" - date: "$Date$" - revision: "$Revision$" + date: "$Date: 2016-04-13 10:59:18 +0200 (mer., 13 avr. 2016) $" + revision: "$Revision: 98616 $" class CMS_AUTHENTICATION_MODULE @@ -159,7 +159,7 @@ feature -- Hooks configuration l_url_name := "site_sign_in_url" l_url := a_response.url (roc_login_location, Void) end - if l_destination /= Void then + if l_destination /= Void and then not l_url.has_substring ("?destination") then l_url.append ("?destination=" + percent_encoded (l_destination)) end a_value.force (l_url, l_url_name) diff --git a/modules/session_auth/cms_session_auth_module.e b/modules/session_auth/cms_session_auth_module.e index 9b57b59..1b19150 100644 --- a/modules/session_auth/cms_session_auth_module.e +++ b/modules/session_auth/cms_session_auth_module.e @@ -3,8 +3,8 @@ note This module allows the use Session Based Authentication using Cookies to restrict access by looking up users in the given providers. ]" - date: "$Date$" - revision: "$Revision$" + date: "$Date: 2016-04-13 10:59:18 +0200 (mer., 13 avr. 2016) $" + revision: "$Revision: 98616 $" class CMS_SESSION_AUTH_MODULE @@ -115,7 +115,7 @@ feature -- Access: router if attached session_api as l_session_api then a_router.handle ("/" + login_location, create {WSF_URI_AGENT_HANDLER}.make (agent handle_login (a_api, ?, ?)), a_router.methods_head_get) a_router.handle ("/" + logout_location, create {WSF_URI_AGENT_HANDLER}.make (agent handle_logout (a_api, l_session_api, ?, ?)), a_router.methods_get_post) - a_router.handle ("/account/auth/roc-session-login", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent handle_login_with_session (a_api,session_api, ?, ?)), a_router.methods_get_post) + a_router.handle ("/" + login_location, create {WSF_URI_AGENT_HANDLER}.make (agent handle_login_with_session (a_api,session_api, ?, ?)), a_router.methods_post) end end