")
diff --git a/modules/admin/handler/user/cms_user_form_response.e b/modules/admin/handler/user/cms_admin_user_form_response.e
similarity index 98%
rename from modules/admin/handler/user/cms_user_form_response.e
rename to modules/admin/handler/user/cms_admin_user_form_response.e
index 8bda43d..4da8244 100644
--- a/modules/admin/handler/user/cms_user_form_response.e
+++ b/modules/admin/handler/user/cms_admin_user_form_response.e
@@ -1,10 +1,10 @@
note
- description: "Summary description for {CMS_USER_FORM_RESPONSE}."
+ description: "Summary description for {CMS_ADMIN_USER_FORM_RESPONSE}."
date: "$Date$"
revision: "$Revision$"
class
- CMS_USER_FORM_RESPONSE
+ CMS_ADMIN_USER_FORM_RESPONSE
inherit
CMS_RESPONSE
@@ -324,10 +324,10 @@ feature -- Form
create fs.make
fs.set_legend ("Basic User Account Information")
fs.extend_html_text ("
")
- fs.extend_html_text (a_user.name)
+ fs.extend_raw_text (a_user.name)
if attached a_user.email as l_email then
- create fe.make_with_text ("email", l_email)
+ create fe.make_with_text ("email", l_email.to_string_32)
else
create fe.make_with_text ("email", "")
end
@@ -477,7 +477,7 @@ feature -- Form
api.user_api.user_by_email (l_email) = Void
then
-- Valid email
- a_user.set_email (l_email)
+ a_user.set_email (api.utf_8_encoded (l_email))
else
if attached l_user.email as u_email and then not u_email.is_case_insensitive_equal_general (l_email) then
a_form_data.report_invalid_field ("email", "Email already exist!")
diff --git a/modules/admin/handler/user/cms_user_handler.e b/modules/admin/handler/user/cms_admin_user_handler.e
similarity index 89%
rename from modules/admin/handler/user/cms_user_handler.e
rename to modules/admin/handler/user/cms_admin_user_handler.e
index 5f01136..2f2d427 100644
--- a/modules/admin/handler/user/cms_user_handler.e
+++ b/modules/admin/handler/user/cms_admin_user_handler.e
@@ -1,12 +1,12 @@
note
description: "[
- Handler for a CMS user in the CMS interface
+ Administration handler for a CMS user in the CMS interface
]"
date: "$Date$"
revision: "$Revision$"
class
- CMS_USER_HANDLER
+ CMS_ADMIN_USER_HANDLER
inherit
CMS_HANDLER
@@ -79,12 +79,10 @@ feature -- HTTP Methods
local
l_user: detachable CMS_USER
l_uid: INTEGER_64
- edit_response: CMS_USER_FORM_RESPONSE
- view_response: CMS_USER_VIEW_RESPONSE
- r: CMS_RESPONSE
+ edit_response: CMS_ADMIN_USER_FORM_RESPONSE
+ view_response: CMS_ADMIN_USER_VIEW_RESPONSE
do
- create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
- if r.has_permission ("admin users") then
+ if api.has_permission ("admin users") then
if req.percent_encoded_path_info.ends_with_general ("/edit") then
check valid_url: req.percent_encoded_path_info.starts_with_general (api.administration_path ("/user/")) end
create edit_response.make (req, res, api)
@@ -111,18 +109,16 @@ feature -- HTTP Methods
end
end
else
- r.execute
+ send_access_denied (req, res)
end
end
do_post (req: WSF_REQUEST; res: WSF_RESPONSE)
local
- edit_response: CMS_USER_FORM_RESPONSE
- r: CMS_RESPONSE
+ edit_response: CMS_ADMIN_USER_FORM_RESPONSE
do
- create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
- if r.has_permission ("admin users") then
+ if api.has_permission ("admin users") then
if req.percent_encoded_path_info.ends_with_general ("/edit") then
create edit_response.make (req, res, api)
edit_response.execute
@@ -138,7 +134,7 @@ feature -- HTTP Methods
edit_response.execute
end
else
- r.execute
+ send_access_denied (req, res)
end
end
@@ -190,7 +186,7 @@ feature {NONE} -- New User
create_new_user (req: WSF_REQUEST; res: WSF_RESPONSE)
local
- edit_response: CMS_USER_FORM_RESPONSE
+ edit_response: CMS_ADMIN_USER_FORM_RESPONSE
do
if req.percent_encoded_path_info.starts_with (api.administration_path ("/add/user")) then
create edit_response.make (req, res, api)
diff --git a/modules/admin/handler/user/cms_user_view_response.e b/modules/admin/handler/user/cms_admin_user_view_response.e
similarity index 97%
rename from modules/admin/handler/user/cms_user_view_response.e
rename to modules/admin/handler/user/cms_admin_user_view_response.e
index 00fccc6..07d17e0 100644
--- a/modules/admin/handler/user/cms_user_view_response.e
+++ b/modules/admin/handler/user/cms_admin_user_view_response.e
@@ -1,10 +1,10 @@
note
- description: "Summary description for {CMS_USER_VIEW_RESPONSE}."
+ description: "Summary description for {CMS_ADMIN_USER_VIEW_RESPONSE}."
date: "$Date$"
revision: "$Revision$"
class
- CMS_USER_VIEW_RESPONSE
+ CMS_ADMIN_USER_VIEW_RESPONSE
inherit
CMS_RESPONSE
@@ -27,7 +27,6 @@ feature -- Query
end
end
-
feature -- Execution
process
diff --git a/modules/admin/handler/user/cms_admin_users_handler.e b/modules/admin/handler/user/cms_admin_users_handler.e
index 735fdd4..8451b2c 100644
--- a/modules/admin/handler/user/cms_admin_users_handler.e
+++ b/modules/admin/handler/user/cms_admin_users_handler.e
@@ -73,8 +73,7 @@ feature -- HTTP Methods
-- get them from the configuration file and load them into
-- the setup class.
- create {FORBIDDEN_ERROR_CMS_RESPONSE} l_response.make (req, res, api)
- if l_response.has_permission ("admin users") then
+ if api.has_permission ("admin users") then
user_api := api.user_api
l_count := user_api.users_count
@@ -157,7 +156,7 @@ feature -- HTTP Methods
l_response.set_main_content (s)
l_response.execute
else
- l_response.execute
+ send_access_denied (req, res)
end
end
end
diff --git a/modules/auth/cms_authentication_email_service.e b/modules/auth/cms_authentication_email_service.e
index f29d80c..57268fb 100644
--- a/modules/auth/cms_authentication_email_service.e
+++ b/modules/auth/cms_authentication_email_service.e
@@ -81,7 +81,7 @@ feature -- Basic Operations / Internal
feature -- Basic Operations / Contact
- send_account_evaluation (a_user: CMS_USER; a_application, a_url_activate, a_url_reject, a_host: READABLE_STRING_8)
+ send_account_evaluation (a_user: CMS_USER; a_application: READABLE_STRING_GENERAL; a_url_activate, a_url_reject, a_host: READABLE_STRING_8)
-- Send new user register to webmaster to confirm or reject itt.
local
l_message: STRING
@@ -95,7 +95,7 @@ feature -- Basic Operations / Contact
else
l_message.replace_substring_all ("$email", "unknown email")
end
- l_message.replace_substring_all ("$application", a_application)
+ l_message.replace_substring_all ("$application", cms_api.utf_8_encoded (a_application))
l_message.replace_substring_all ("$activation_url", a_url_activate)
l_message.replace_substring_all ("$rejection_url", a_url_reject)
send_message (contact_email_address, contact_email_address, parameters.contact_subject_account_evaluation, l_message)
diff --git a/modules/auth/cms_authentication_email_service_parameters.e b/modules/auth/cms_authentication_email_service_parameters.e
index 161761b..d496927 100644
--- a/modules/auth/cms_authentication_email_service_parameters.e
+++ b/modules/auth/cms_authentication_email_service_parameters.e
@@ -13,7 +13,6 @@ feature {NONE} -- Initialization
make (a_cms_api: CMS_API)
local
- utf: UTF_CONVERTER
s: detachable READABLE_STRING_32
l_utf8_site_name: IMMUTABLE_STRING_8
l_contact_email, l_subject_register, l_subject_activate, l_subject_password, l_subject_oauth: detachable READABLE_STRING_8
@@ -31,23 +30,23 @@ feature {NONE} -- Initialization
if attached a_cms_api.module_configuration_by_name ({CMS_AUTHENTICATION_MODULE}.name, Void) as cfg then
s := cfg.text_item ("email")
if s /= Void then
- l_contact_email := utf.utf_32_string_to_utf_8_string_8 (s)
+ l_contact_email := cms_api.utf_8_encoded (s)
end
s := cfg.text_item ("subject_register")
if s /= Void then
- l_subject_register := utf.utf_32_string_to_utf_8_string_8 (s)
+ l_subject_register := cms_api.utf_8_encoded (s)
end
s := cfg.text_item ("subject_activate")
if s /= Void then
- l_subject_register := utf.utf_32_string_to_utf_8_string_8 (s)
+ l_subject_register := cms_api.utf_8_encoded (s)
end
s := cfg.text_item ("subject_password")
if s /= Void then
- l_subject_register := utf.utf_32_string_to_utf_8_string_8 (s)
+ l_subject_register := cms_api.utf_8_encoded (s)
end
s := cfg.text_item ("subject_oauth")
if s /= Void then
- l_subject_oauth := utf.utf_32_string_to_utf_8_string_8 (s)
+ l_subject_oauth := cms_api.utf_8_encoded (s)
end
end
if l_contact_email = Void then
diff --git a/modules/auth/cms_authentication_module.e b/modules/auth/cms_authentication_module.e
index 83311aa..c1e3cdf 100644
--- a/modules/auth/cms_authentication_module.e
+++ b/modules/auth/cms_authentication_module.e
@@ -65,6 +65,7 @@ feature -- Access
Result.force ("account reject")
Result.force ("account reactivate")
Result.force ("change own username")
+ Result.force ("view user")
end
feature {CMS_EXECUTION} -- Administration
@@ -123,6 +124,8 @@ feature -- Router
a_router.handle ("/account/new-password", create {WSF_URI_AGENT_HANDLER}.make (agent handle_new_password(a_api, ?, ?)), a_router.methods_get_post)
a_router.handle ("/account/reset-password", create {WSF_URI_AGENT_HANDLER}.make (agent handle_reset_password(a_api, ?, ?)), a_router.methods_get_post)
a_router.handle ("/account/change/{field}", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent handle_change_field (a_api, ?, ?)), a_router.methods_get_post)
+
+ a_router.handle ("/user/{uid}", create {CMS_USER_HANDLER}.make (a_api), a_router.methods_get)
end
feature -- Hooks configuration
@@ -382,7 +385,7 @@ feature -- Handler
l_exist := True
end
if attached recaptcha_secret_key (api) as l_recaptcha_key then
- if attached {WSF_STRING} req.form_parameter ("g-recaptcha-response") as l_recaptcha_response and then is_captcha_verified (l_recaptcha_key, l_recaptcha_response.value) then
+ if attached {WSF_STRING} req.form_parameter ("g-recaptcha-response") as l_recaptcha_response and then is_captcha_verified (l_recaptcha_key, l_recaptcha_response.url_encoded_value) then
l_captcha_passed := True
else
--| Bad or missing captcha
@@ -428,15 +431,13 @@ feature -- Handler
r.set_status_code ({HTTP_CONSTANTS}.bad_request)
end
else
- create {BAD_REQUEST_ERROR_CMS_RESPONSE} r.make (req, res, api)
- r.set_main_content ("There were issue with your application, invalid or missing values.")
+ api.response_api.send_bad_request ("There were issue with your application, invalid or missing values.", req, res)
end
end
+ r.execute
else
- create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
- r.set_main_content ("You can also contact the webmaster to ask for an account.")
+ api.response_api.send_permissions_access_denied ("You can also contact the webmaster to ask for an account.", Void, req, res)
end
- r.execute
end
handle_activation (api: CMS_API; req: WSF_REQUEST; res: WSF_RESPONSE)
@@ -500,8 +501,7 @@ feature -- Handler
l_ir.execute
end
else
- create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
- r.execute
+ api.response_api.send_access_denied (Void, req, res)
end
end
@@ -536,8 +536,7 @@ feature -- Handler
l_ir.execute
end
else
- create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
- r.execute
+ api.response_api.send_access_denied (Void, req, res)
end
end
@@ -551,8 +550,8 @@ feature -- Handler
l_url_reject: STRING
l_email: READABLE_STRING_8
do
- create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
- if r.has_permission ("account reactivate") then
+ if api.has_permission ("account reactivate") then
+ create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
if req.is_post_request_method then
if attached {WSF_STRING} req.form_parameter ("email") as p_email then
if p_email.value.is_valid_as_string_8 then
@@ -587,11 +586,10 @@ feature -- Handler
end
end
end
- else
- create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
r.execute
+ else
+ api.response_api.send_access_denied (Void, req, res)
end
- r.execute
end
handle_new_password (api: CMS_API; req: WSF_REQUEST; res: WSF_RESPONSE)
@@ -700,7 +698,7 @@ feature -- Handler
l_fieldname := p_field.url_encoded_value
end
if l_fieldname = Void then
- create {BAD_REQUEST_ERROR_CMS_RESPONSE} r.make (req, res, api)
+ api.response_api.send_bad_request (Void, req, res)
else
create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
@@ -814,8 +812,8 @@ feature -- Handler
end
r.set_main_content (b)
end
+ r.execute
end
- r.execute
end
block_list: ITERABLE [like {CMS_BLOCK}.name]
@@ -1118,36 +1116,30 @@ feature -- Access: configuration
form_registration_application_description (api: CMS_API): detachable READABLE_STRING_8
-- Get recaptcha security key.
- local
- utf: UTF_CONVERTER
do
if attached api.module_configuration (Current, Void) as cfg then
if attached cfg.text_item ("forms.registration.application_description") as l_desc and then not l_desc.is_whitespace then
- Result := utf.utf_32_string_to_utf_8_string_8 (l_desc)
+ Result := api.utf_8_encoded (l_desc)
end
end
end
recaptcha_secret_key (api: CMS_API): detachable READABLE_STRING_8
-- Get recaptcha security key.
- local
- utf: UTF_CONVERTER
do
if attached api.module_configuration (Current, Void) as cfg then
if attached cfg.text_item ("recaptcha.secret_key") as l_recaptcha_key and then not l_recaptcha_key.is_empty then
- Result := utf.utf_32_string_to_utf_8_string_8 (l_recaptcha_key)
+ Result := api.utf_8_encoded (l_recaptcha_key)
end
end
end
recaptcha_site_key (api: CMS_API): detachable READABLE_STRING_8
-- Get recaptcha security key.
- local
- utf: UTF_CONVERTER
do
if attached api.module_configuration (Current, Void) as cfg then
if attached cfg.text_item ("recaptcha.site_key") as l_recaptcha_key and then not l_recaptcha_key.is_empty then
- Result := utf.utf_32_string_to_utf_8_string_8 (l_recaptcha_key)
+ Result := api.utf_8_encoded (l_recaptcha_key)
end
end
end
diff --git a/modules/auth/cms_authentication_module_administration.e b/modules/auth/cms_authentication_module_administration.e
index e8a984d..9fe173c 100644
--- a/modules/auth/cms_authentication_module_administration.e
+++ b/modules/auth/cms_authentication_module_administration.e
@@ -54,9 +54,8 @@ feature -- Request handling
-- get them from the configuration file and load them into
-- the setup class.
- create {FORBIDDEN_ERROR_CMS_RESPONSE} l_response.make (req, res, api)
if
- l_response.has_permission ("admin registration")
+ api.has_permission ("admin registration")
then
l_user_api := api.user_api
@@ -127,7 +126,7 @@ feature -- Request handling
l_response.set_main_content (s)
l_response.execute
else
- l_response.execute
+ api.response_api.send_access_denied (Void, req, res)
end
end
diff --git a/modules/auth/cms_user_handler.e b/modules/auth/cms_user_handler.e
new file mode 100644
index 0000000..d54b431
--- /dev/null
+++ b/modules/auth/cms_user_handler.e
@@ -0,0 +1,103 @@
+note
+ description: "[
+ Handler for a CMS user in the CMS interface
+ ]"
+ date: "$Date$"
+ revision: "$Revision$"
+
+class
+ CMS_USER_HANDLER
+
+inherit
+ CMS_HANDLER
+
+ WSF_URI_HANDLER
+ rename
+ execute as uri_execute,
+ new_mapping as new_uri_mapping
+ end
+
+ WSF_URI_TEMPLATE_HANDLER
+ rename
+ execute as uri_template_execute,
+ new_mapping as new_uri_template_mapping
+ select
+ new_uri_template_mapping
+ end
+
+ WSF_RESOURCE_HANDLER_HELPER
+ redefine
+ do_get
+ end
+
+ REFACTORING_HELPER
+
+create
+ make
+
+feature -- execute
+
+ execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+ -- Execute request handler
+ do
+ execute_methods (req, res)
+ end
+
+ uri_execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+ -- Execute request handler
+ do
+ execute (req, res)
+ end
+
+ uri_template_execute (req: WSF_REQUEST; res: WSF_RESPONSE)
+ -- Execute request handler
+ do
+ execute (req, res)
+ end
+
+feature -- Query
+
+ user_id_path_parameter (req: WSF_REQUEST): INTEGER_64
+ -- User id passed as path parameter for request `req'.
+ local
+ s: STRING
+ do
+ if attached {WSF_STRING} req.path_parameter ("uid") as p_nid then
+ s := p_nid.value
+ if s.is_integer_64 then
+ Result := s.to_integer_64
+ end
+ end
+ end
+
+feature -- HTTP Methods
+
+ do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
+ --
+ local
+ l_user: detachable CMS_USER
+ l_uid: INTEGER_64
+ view_response: CMS_USER_VIEW_RESPONSE
+ do
+ if api.has_permission ("view user") then
+ -- Display existing node
+ l_uid := user_id_path_parameter (req)
+ if l_uid > 0 then
+ l_user := api.user_api.user_by_id (l_uid)
+ if
+ l_user /= Void
+ then
+ create view_response.make (req, res, api)
+ view_response.execute
+ else
+ send_not_found (req, res)
+ end
+ else
+ send_bad_request (req, res)
+ end
+ else
+ send_access_denied (req, res)
+ end
+ end
+
+end
diff --git a/modules/auth/cms_user_view_response.e b/modules/auth/cms_user_view_response.e
new file mode 100644
index 0000000..612180c
--- /dev/null
+++ b/modules/auth/cms_user_view_response.e
@@ -0,0 +1,103 @@
+note
+ description: "Summary description for {CMS_USER_VIEW_RESPONSE}."
+ date: "$Date$"
+ revision: "$Revision$"
+
+class
+ CMS_USER_VIEW_RESPONSE
+
+inherit
+ CMS_RESPONSE
+
+create
+ make
+
+feature -- Query
+
+ user_id_path_parameter (req: WSF_REQUEST): INTEGER_64
+ -- User id passed as path parameter for request `req'.
+ local
+ s: STRING
+ do
+ if attached {WSF_STRING} req.path_parameter ("uid") as p_nid then
+ s := p_nid.value
+ if s.is_integer_64 then
+ Result := s.to_integer_64
+ end
+ end
+ end
+
+feature -- Process
+
+ process
+ -- Computed response message.
+ local
+ b: STRING_8
+ uid: INTEGER_64
+ user_api: CMS_USER_API
+ f: CMS_FORM
+ do
+ user_api := api.user_api
+ create b.make_empty
+ uid := user_id_path_parameter (request)
+ if
+ uid > 0 and then
+ attached user_api.user_by_id (uid) as l_user
+ then
+ if
+ api.has_permission ("view user")
+ or l_user.same_as (user) -- Same user
+ then
+ f := new_view_form (l_user, request.request_uri, "view-user")
+ f.append_to_html (wsf_theme, b)
+ else
+ b.append ("You don't have the permission to view this user!")
+ end
+ else
+ b.append ("User not found!")
+ end
+ set_main_content (b)
+ end
+
+feature -- Process Edit
+
+ new_view_form (a_user: detachable CMS_USER; a_url: READABLE_STRING_8; a_name: STRING): CMS_FORM
+ -- Create a web form named `a_name' for user `a_user' (if set), using form action url `a_url'.
+ local
+ th: WSF_FORM_HIDDEN_INPUT
+ do
+ create Result.make (a_url, a_name)
+
+ create th.make ("user-id")
+ if a_user /= Void then
+ th.set_text_value (a_user.id.out)
+ else
+ th.set_text_value ("0")
+ end
+ Result.extend (th)
+
+ populate_form (Result, a_user)
+ end
+
+ populate_form (a_form: WSF_FORM; a_user: detachable CMS_USER)
+ -- Fill the web form `a_form' with data from `a_node' if set,
+ -- and apply this to content type `a_content_type'.
+ local
+ ti: WSF_FORM_TEXT_INPUT
+ fs: WSF_FORM_FIELD_SET
+ do
+ if a_user /= Void then
+ create fs.make
+ fs.set_legend ("User Information")
+ create ti.make_with_text ("profile_name", a_user.name)
+ if attached a_user.profile_name as l_profile_name then
+ ti.set_text_value (l_profile_name)
+ end
+ ti.set_label ("Profile name")
+ ti.set_is_readonly (True)
+ fs.extend (ti)
+ a_form.extend (fs)
+ end
+ end
+
+end
diff --git a/modules/blog/handler/blog_user_handler.e b/modules/blog/handler/blog_user_handler.e
index 674788c..d471921 100644
--- a/modules/blog/handler/blog_user_handler.e
+++ b/modules/blog/handler/blog_user_handler.e
@@ -37,8 +37,6 @@ feature -- HTTP Methods
do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
--
- local
- l_error: NOT_FOUND_ERROR_CMS_RESPONSE
do
check user_void: user = Void end
if attached user_from_request (req) as l_user then
@@ -47,13 +45,11 @@ feature -- HTTP Methods
Precursor (req, res)
else
-- Throw a bad request error because the user is not valid
- create l_error.make (req, res, api)
if attached user_parameter (req) as l_user_id then
- l_error.set_main_content ("
Error
User with id " + api.html_encoded (l_user_id) + " not found!")
+ api.response_api.send_not_found ("
Error
User with id " + api.html_encoded (l_user_id) + " not found!", req, res)
else
- l_error.set_main_content ("
Error
User not found!")
+ api.response_api.send_not_found ("
Error
User not found!", req, res)
end
- l_error.execute
end
user := Void
end
diff --git a/modules/contact/src/cms_contact_module.e b/modules/contact/src/cms_contact_module.e
index 6db9fa3..d7da476 100644
--- a/modules/contact/src/cms_contact_module.e
+++ b/modules/contact/src/cms_contact_module.e
@@ -123,30 +123,26 @@ feature -- Recaptcha
recaptcha_secret_key (api: CMS_API): detachable READABLE_STRING_8
-- Get recaptcha security key.
- local
- utf: UTF_CONVERTER
do
if attached api.module_configuration (Current, Void) as cfg then
if
attached cfg.text_item ("recaptcha.secret_key") as l_recaptcha_key and then
not l_recaptcha_key.is_empty
then
- Result := utf.utf_32_string_to_utf_8_string_8 (l_recaptcha_key)
+ Result := api.utf_8_encoded (l_recaptcha_key)
end
end
end
recaptcha_site_key (api: CMS_API): detachable READABLE_STRING_8
-- Get recaptcha security key.
- local
- utf: UTF_CONVERTER
do
if attached api.module_configuration (Current, Void) as cfg then
if
attached cfg.text_item ("recaptcha.site_key") as l_recaptcha_key and then
not l_recaptcha_key.is_empty
then
- Result := utf.utf_32_string_to_utf_8_string_8 (l_recaptcha_key)
+ Result := api.utf_8_encoded (l_recaptcha_key)
end
end
end
diff --git a/modules/contact/src/contact_email_service_parameters.e b/modules/contact/src/contact_email_service_parameters.e
index 4baedbe..6aa0ef4 100644
--- a/modules/contact/src/contact_email_service_parameters.e
+++ b/modules/contact/src/contact_email_service_parameters.e
@@ -13,13 +13,12 @@ feature {NONE} -- Initialization
make (a_cms_api: CMS_API; a_contact_module: CMS_CONTACT_MODULE)
local
- utf: UTF_CONVERTER
l_site_name: READABLE_STRING_8
s: detachable READABLE_STRING_32
l_contact_email, l_contact_subject: detachable READABLE_STRING_8
do
-- Use global smtp setting if any, otherwise "localhost"
- l_site_name := utf.escaped_utf_32_string_to_utf_8_string_8 (a_cms_api.setup.site_name)
+ l_site_name := a_cms_api.utf_8_encoded (a_cms_api.setup.site_name)
admin_email := a_cms_api.setup.site_email
if not admin_email.has ('<') then
@@ -29,11 +28,11 @@ feature {NONE} -- Initialization
if attached {CONFIG_READER} a_cms_api.module_configuration (a_contact_module, Void) as cfg then
s := cfg.text_item ("email")
if s /= Void then
- l_contact_email := utf.utf_32_string_to_utf_8_string_8 (s)
+ l_contact_email := a_cms_api.utf_8_encoded (s)
end
s := cfg.text_item ("subject")
if s /= Void then
- l_contact_subject := utf.utf_32_string_to_utf_8_string_8 (s)
+ l_contact_subject := a_cms_api.utf_8_encoded (s)
end
end
if l_contact_email /= Void then
diff --git a/modules/contact/src/persistence/contact_storage_fs.e b/modules/contact/src/persistence/contact_storage_fs.e
index fa6a921..5af97d5 100644
--- a/modules/contact/src/persistence/contact_storage_fs.e
+++ b/modules/contact/src/persistence/contact_storage_fs.e
@@ -25,7 +25,6 @@ feature -- Change
save_contact_message (m: CONTACT_MESSAGE)
local
s: STRING
- utf: UTF_CONVERTER
now: DATE_TIME
do
error_handler.reset
@@ -38,7 +37,7 @@ feature -- Change
s.append (m.date.out)
s.append_character ('%N')
s.append ("name=")
- s.append (utf.utf_32_string_to_utf_8_string_8 (m.username))
+ s.append (api.utf_8_encoded (m.username))
s.append_character ('%N')
if attached m.email as l_email then
@@ -47,7 +46,7 @@ feature -- Change
s.append_character ('%N')
end
s.append ("message=%N")
- s.append (utf.utf_32_string_to_utf_8_string_8 (m.message))
+ s.append (api.utf_8_encoded (m.message))
s.append_character ('%N')
save_to_file (s, date_to_yyyymmdd_hhmmss_string (now))
diff --git a/modules/embedded_video/src/video_content_filter.e b/modules/embedded_video/src/video_content_filter.e
index 3a28e8d..f1f5f18 100644
--- a/modules/embedded_video/src/video_content_filter.e
+++ b/modules/embedded_video/src/video_content_filter.e
@@ -253,11 +253,19 @@ feature {NONE} -- Implementation
end
replace_substring_all (s: STRING_GENERAL; a_old: READABLE_STRING_8; a_new: STRING_GENERAL)
+ local
+ utf: UTF_CONVERTER
do
if attached {STRING_8} s as s8 then
- s8.replace_substring_all (a_old, a_new.to_string_8)
+ if a_new.is_valid_as_string_8 then
+ s8.replace_substring_all (a_old, a_new.to_string_8)
+ else
+ check a_new_is_string_8: False end
+ -- Use UTF-8 for now.
+ s8.replace_substring_all (a_old, utf.utf_32_string_to_utf_8_string_8 (a_new))
+ end
elseif attached {STRING_32} s as s32 then
- s32.replace_substring_all (a_old, a_new)
+ s32.replace_substring_all (a_old.to_string_32, a_new)
end
end
diff --git a/modules/feed_aggregator/feed_aggregator_api.e b/modules/feed_aggregator/feed_aggregator_api.e
index 0cffb44..1c35d43 100644
--- a/modules/feed_aggregator/feed_aggregator_api.e
+++ b/modules/feed_aggregator/feed_aggregator_api.e
@@ -35,7 +35,6 @@ feature -- Access
l_feed_id: READABLE_STRING_32
l_title: detachable READABLE_STRING_GENERAL
l_locations: detachable STRING_TABLE [READABLE_STRING_8]
- utf: UTF_CONVERTER
l_table: like internal_aggregations
do
l_table := internal_aggregations
@@ -56,20 +55,20 @@ feature -- Access
across
l_location_list as loc_ic
loop
- l_locations.force (utf.utf_32_string_to_utf_8_string_8 (loc_ic.item), loc_ic.item)
+ l_locations.force (cms_api.utf_8_encoded (loc_ic.item), loc_ic.item)
end
end
if attached cfg.text_table_item ({STRING_32} "feeds." + l_feed_id + ".locations") as l_location_table then
across
l_location_table as loc_tb_ic
loop
- l_locations.force (utf.utf_32_string_to_utf_8_string_8 (loc_tb_ic.item), loc_tb_ic.key)
+ l_locations.force (cms_api.utf_8_encoded (loc_tb_ic.item), loc_tb_ic.key)
end
end
if
attached cfg.text_item ({STRING_32} "feeds." + l_feed_id + ".location") as l_location
then
- l_locations.force (utf.utf_32_string_to_utf_8_string_8 (l_location), l_location)
+ l_locations.force (cms_api.utf_8_encoded (l_location), l_location)
end
if l_locations /= Void and then not l_locations.is_empty then
l_title := cfg.text_item ({STRING_32} "feeds." + l_feed_id + ".title")
@@ -93,7 +92,7 @@ feature -- Access
across
l_locations as loc_ic
loop
- agg.locations.force (utf.utf_32_string_to_utf_8_string_8 (loc_ic.item))
+ agg.locations.force (cms_api.utf_8_encoded (loc_ic.item))
end
Result.force (agg, l_feed_id)
if attached cfg.text_list_item ({STRING_32} "feeds." + l_feed_id + ".categories") as l_cats then
diff --git a/modules/feed_aggregator/feed_aggregator_module.e b/modules/feed_aggregator/feed_aggregator_module.e
index 60a335a..a843146 100644
--- a/modules/feed_aggregator/feed_aggregator_module.e
+++ b/modules/feed_aggregator/feed_aggregator_module.e
@@ -98,8 +98,7 @@ feature -- Handle
m.header.put_content_type_text_html
res.send (m)
else
- create {NOT_FOUND_ERROR_CMS_RESPONSE} r.make (req, res, a_api)
- r.execute
+ a_api.response_api.send_not_found (Void, req, res)
end
else
create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, a_api)
@@ -143,8 +142,7 @@ feature -- Handle
r.execute
end
else
- create {NOT_FOUND_ERROR_CMS_RESPONSE} r.make (req, res, a_api)
- r.execute
+ a_api.response_api.send_not_found (Void, req, res)
end
else
create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, a_api)
@@ -199,7 +197,6 @@ feature -- Hook
-- List of block names, managed by current object.
local
res: ARRAYED_LIST [like {CMS_BLOCK}.name]
- utf_conv: UTF_CONVERTER
do
if
attached feed_aggregator_api as l_feed_api and then
@@ -209,7 +206,7 @@ feature -- Hook
across
l_aggs as ic
loop
- res.force ("?feed." + utf_conv.utf_32_string_to_utf_8_string_8 (ic.item))
+ res.force ("?feed." + utf_8_encoded (ic.item))
end
else
create res.make (0)
diff --git a/modules/files/cms_files_module.e b/modules/files/cms_files_module.e
index 98df481..129ce7d 100644
--- a/modules/files/cms_files_module.e
+++ b/modules/files/cms_files_module.e
@@ -140,8 +140,8 @@ feature -- Handler
do
check req.is_get_request_method end
if not api.has_permission (browse_files_permission) then
- create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
- r.add_error_message ("You are not allowed to browse CMS files!")
+ create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make_with_permissions (req, res, api, <>)
+ r.add_error_message ("You are not allowed to browse files!")
elseif attached {WSF_STRING} req.path_parameter ("filename") as p_filename then
create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
@@ -276,7 +276,7 @@ feature -- Handler
body.append ("%N")
- body.append ("Use basic file uploading.%N")
+ body.append ("Use basic file uploading.%N")
end
body.append ("
")
end
@@ -284,15 +284,15 @@ feature -- Handler
if req.is_get_head_request_method then
-- Build the response.
if r.has_permission (browse_files_permission) then
- body.append ("
")
append_uploaded_file_album_to (req, api, body)
else
r.add_warning_message ("You are not allowed to browse files!")
end
end
-
r.set_main_content (body)
+ r.execute
elseif req.is_post_request_method then
if api.has_permission (upload_files_permission) then
create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
@@ -305,14 +305,13 @@ feature -- Handler
r.set_redirection (r.url (uploads_location, Void))
end
r.set_main_content (body)
+ r.execute
else
- create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
- r.set_main_content ("You are not allowed to upload file!")
+ api.response_api.send_permissions_access_denied ("You are not allowed to upload file!", <>, req, res)
end
else
- create {BAD_REQUEST_ERROR_CMS_RESPONSE} r.make (req, res, api)
+ api.response_api.send_bad_request (Void, req, res)
end
- r.execute
end
process_uploaded_files (req: WSF_REQUEST; api: CMS_API; a_output: STRING)
@@ -472,7 +471,7 @@ feature -- Handler
do
if attached files_api as l_files_api then
if not api.has_permission (admin_files_permission) then
- create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
+ create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make_with_permissions (req, res, api, <>)
r.add_error_message ("You are not allowed to remove file!")
elseif attached {WSF_STRING} req.path_parameter ("filename") as p_filename then
create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
diff --git a/modules/files/cms_uploaded_file.e b/modules/files/cms_uploaded_file.e
index ccc77ab..48a1e8c 100644
--- a/modules/files/cms_uploaded_file.e
+++ b/modules/files/cms_uploaded_file.e
@@ -83,14 +83,16 @@ feature -- Element change
-- sets `a_number' after the name. This is done when the file was already uploaded
local
position: INTEGER_32
- new_name: STRING_8
+ new_name: STRING_32
+ l_uploaded_file_string_representation: READABLE_STRING_32
do
- position := uploaded_file.string_representation.index_of ('.', 1)
+ l_uploaded_file_string_representation := uploaded_file.string_representation
+ position := l_uploaded_file_string_representation.index_of ('.', 1)
create new_name.make_empty
- new_name := uploaded_file.string_representation.head (position-1)
- new_name.append ("_(" + a_number.out + ")")
- new_name.append (uploaded_file.string_representation.substring (position, uploaded_file.string_representation.count))
+ new_name := l_uploaded_file_string_representation.head (position-1)
+ new_name.append_string_general ("_(" + a_number.out + ")")
+ new_name.append (l_uploaded_file_string_representation.substring (position, l_uploaded_file_string_representation.count))
location := uploads_directory.extended (new_name)
end
diff --git a/modules/google_search_20/src/google_custom_search_module_20.e b/modules/google_search_20/src/google_custom_search_module_20.e
index cfa2e8a..9a9f38b 100644
--- a/modules/google_search_20/src/google_custom_search_module_20.e
+++ b/modules/google_search_20/src/google_custom_search_module_20.e
@@ -57,15 +57,13 @@ feature -- GCSE Keys
gcse_cx_key (api: CMS_API): detachable READABLE_STRING_8
-- Get google custom search engine id.
- local
- utf: UTF_CONVERTER
do
if attached api.module_configuration (Current, Void) as cfg then
if
attached cfg.text_item ("gcse.search_engine_id") as l_gcse_cx_key and then
not l_gcse_cx_key.is_empty
then
- Result := utf.utf_32_string_to_utf_8_string_8 (l_gcse_cx_key)
+ Result := api.utf_8_encoded (l_gcse_cx_key)
end
end
end
diff --git a/modules/messaging/src/cms_messaging_module.e b/modules/messaging/src/cms_messaging_module.e
index b0f589d..da5f855 100644
--- a/modules/messaging/src/cms_messaging_module.e
+++ b/modules/messaging/src/cms_messaging_module.e
@@ -223,12 +223,12 @@ $(document).ready(function() {
local
r: CMS_RESPONSE
do
- if api.has_permission ("use messaging") or api.has_permission ("message any user") then
+ if api.has_permissions (<<"use messaging", "message any user">>) then
create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api)
r.values.force ("messaging", "messaging")
r.set_main_content (new_html_messaging_form (r, api))
else
- create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
+ create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make_with_permissions (req, res, api, <<"use messaging", "message any user">>)
end
r.execute
end
@@ -314,7 +314,7 @@ $(document).ready(function() {
end
r.set_main_content (s)
else
- create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
+ create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make_with_permissions (req, res, api, <<"message any user">>)
end
r.execute
end
@@ -337,9 +337,8 @@ feature {NONE} -- Contact Message
resolved_template_text (api: CMS_API; a_text: READABLE_STRING_GENERAL; a_target_user: detachable CMS_USER): STRING_8
local
smt: CMS_SMARTY_TEMPLATE_TEXT
- utf: UTF_CONVERTER
do
- create smt.make (utf.utf_32_string_to_utf_8_string_8 (a_text))
+ create smt.make (api.utf_8_encoded (a_text))
across
api.builtin_variables as vars_ic
loop
diff --git a/modules/node/cms_node_module.e b/modules/node/cms_node_module.e
index a0d2ba7..3484cb2 100644
--- a/modules/node/cms_node_module.e
+++ b/modules/node/cms_node_module.e
@@ -372,7 +372,7 @@ feature -- Hooks
loop
if
attached ic.item.typename as l_typename and then
- across l_node_typenames as t_ic some t_ic.item.same_string (l_typename) end
+ across l_node_typenames as t_ic some t_ic.item.same_string_general (l_typename) end
then
if ic.item.entity.is_integer then
nid := ic.item.entity.to_integer_64
diff --git a/modules/node/handler/cms_node_type_webform_manager.e b/modules/node/handler/cms_node_type_webform_manager.e
index 27398e1..cfd22a4 100644
--- a/modules/node/handler/cms_node_type_webform_manager.e
+++ b/modules/node/handler/cms_node_type_webform_manager.e
@@ -142,8 +142,8 @@ feature -- Forms ...
ti.set_description ("Optionally specify an alternative URL path by which this content can be accessed. %NFor example, type 'about' when writing an about page. Use a relative path or the URL alias won't work.")
end
- ti.set_text_value (l_uri)
- ti.set_placeholder (l_auto_path_alias)
+ ti.set_text_value (l_uri.to_string_32)
+ ti.set_placeholder (l_auto_path_alias.to_string_32)
ti.set_validation_action (agent (fd: WSF_FORM_DATA; ia_response: NODE_RESPONSE; ia_node: detachable CMS_NODE)
do
if
@@ -204,7 +204,7 @@ feature -- Forms ...
end
-- Auto path alias / suggestion
create thi.make ("auto_path_alias")
- thi.set_text_value (l_auto_path_alias)
+ thi.set_text_value (l_auto_path_alias.to_string_32)
thi.set_is_readonly (True)
f.insert_before (thi, w)
end
diff --git a/modules/node/handler/node_form_response.e b/modules/node/handler/node_form_response.e
index 331da77..e4da68e 100644
--- a/modules/node/handler/node_form_response.e
+++ b/modules/node/handler/node_form_response.e
@@ -241,7 +241,11 @@ feature -- Form
if attached fd.string_item ("content") as l_content then
b.append ("Content:
")
if l_format /= Void then
- b.append (l_format.formatted_output (l_content))
+ if l_content.is_valid_as_string_8 then
+ b.append (l_format.formatted_output (l_content.to_string_8))
+ else
+ b.append (l_format.formatted_output (api.utf_8_encoded (l_content)))
+ end
else
b.append (html_encoded (l_content))
end
diff --git a/modules/node/handler/node_handler.e b/modules/node/handler/node_handler.e
index 47ebd16..6b0cf4b 100644
--- a/modules/node/handler/node_handler.e
+++ b/modules/node/handler/node_handler.e
@@ -75,6 +75,14 @@ feature -- Query
end
end
+feature -- Permissions
+
+ view_unpublished_permissions (a_node: CMS_NODE): ITERABLE [READABLE_STRING_8]
+ -- Permissions to view unpublished node `a_node`.
+ do
+ Result := <<"view unpublished " + a_node.content_type>>
+ end
+
feature -- HTTP Methods
do_get (req: WSF_REQUEST; res: WSF_RESPONSE)
@@ -148,7 +156,7 @@ feature -- HTTP Methods
attached api.user as l_user and then
( node_api.is_author_of_node (l_user, l_node)
or else (
- api.user_has_permission (l_user, "view unpublished " + l_node.content_type)
+ api.user_has_permissions (l_user, view_unpublished_permissions (l_node))
)
)
then
@@ -403,15 +411,10 @@ feature -- Error
send_access_denied_to_unpublished_node (req: WSF_REQUEST; res: WSF_RESPONSE; a_node: CMS_NODE)
-- Forbidden response.
- local
- r: CMS_RESPONSE
do
- create {FORBIDDEN_ERROR_CMS_RESPONSE} r.make (req, res, api)
- r.set_main_content ("This content is NOT published!")
- r.execute
+ send_custom_access_denied ("This content is NOT published!", view_unpublished_permissions (a_node), req, res)
end
-
feature {NONE} -- Node
create_new_node (req: WSF_REQUEST; res: WSF_RESPONSE)
diff --git a/modules/node/handler/trash_handler.e b/modules/node/handler/trash_handler.e
index e032d3a..9df0e29 100644
--- a/modules/node/handler/trash_handler.e
+++ b/modules/node/handler/trash_handler.e
@@ -86,8 +86,7 @@ feature -- HTTP Methods
-- l_page.add_block (create {CMS_CONTENT_BLOCK}.make ("nodes_warning", Void, "/nodes/ is not yet fully implemented ", Void), "highlighted")
l_page.execute
else
- create {FORBIDDEN_ERROR_CMS_RESPONSE} l_page.make (req, res, api)
- l_page.execute
+ send_custom_access_denied (Void, <<"view trash", "view any trash", "view own trash">>, req, res)
end
end
diff --git a/modules/oauth20/cms_oauth_20_api.e b/modules/oauth20/cms_oauth_20_api.e
index cb5ef6a..d4a2669 100644
--- a/modules/oauth20/cms_oauth_20_api.e
+++ b/modules/oauth20/cms_oauth_20_api.e
@@ -83,13 +83,13 @@ feature -- Access: Consumers OAuth20
Result := oauth_20_storage.oauth2_consumers
end
- oauth_consumer_by_name (a_name: READABLE_STRING_8): detachable CMS_OAUTH_20_CONSUMER
+ oauth_consumer_by_name (a_name: READABLE_STRING_GENERAL): detachable CMS_OAUTH_20_CONSUMER
-- Retrieve a consumer by name `a_name', if any.
do
Result := oauth_20_storage.oauth_consumer_by_name (a_name)
end
- oauth_consumer_by_callback (a_callback: READABLE_STRING_8): detachable CMS_OAUTH_20_CONSUMER
+ oauth_consumer_by_callback (a_callback: READABLE_STRING_GENERAL): detachable CMS_OAUTH_20_CONSUMER
-- Retrieve a consumer by callback `a_callback', if any.
do
Result := oauth_20_storage.oauth_consumer_by_callback (a_callback)
@@ -97,7 +97,12 @@ feature -- Access: Consumers OAuth20
feature -- Change: User OAuth20
- new_user_oauth2 (a_token: READABLE_STRING_GENERAL; a_user_profile: READABLE_STRING_32; a_user: CMS_USER; a_consumer: READABLE_STRING_GENERAL)
+ save_oauth_consumer (a_cons: CMS_OAUTH_20_CONSUMER)
+ do
+ oauth_20_storage.save_oauth_consumer (a_cons)
+ end
+
+ new_user_oauth2 (a_token: READABLE_STRING_GENERAL; a_user_profile: READABLE_STRING_GENERAL; a_user: CMS_USER; a_consumer: READABLE_STRING_GENERAL)
-- Add a new user with oauth20 using the consumer `a_consumer'.
require
has_id: a_user.has_id
@@ -105,8 +110,7 @@ feature -- Change: User OAuth20
oauth_20_storage.new_user_oauth2 (a_token, a_user_profile, a_user, a_consumer)
end
-
- update_user_oauth2 (a_token: READABLE_STRING_GENERAL; a_user_profile: READABLE_STRING_32; a_user: CMS_USER; a_consumer_table: READABLE_STRING_GENERAL)
+ update_user_oauth2 (a_token: READABLE_STRING_GENERAL; a_user_profile: READABLE_STRING_GENERAL; a_user: CMS_USER; a_consumer_table: READABLE_STRING_GENERAL)
-- Update user `a_user' with oauth2 for the consumer `a_consumer'.
require
has_id: a_user.has_id
@@ -114,7 +118,6 @@ feature -- Change: User OAuth20
oauth_20_storage.update_user_oauth2 (a_token, a_user_profile, a_user, a_consumer_table)
end
-
remove_user_oauth2 (a_user: CMS_USER; a_consumer_table: READABLE_STRING_GENERAL)
-- Remove user `a_user' with oauth2 for the consumer `a_consumer'.
require
diff --git a/modules/oauth20/cms_oauth_20_consumer.e b/modules/oauth20/cms_oauth_20_consumer.e
index 1e14806..b297194 100644
--- a/modules/oauth20/cms_oauth_20_consumer.e
+++ b/modules/oauth20/cms_oauth_20_consumer.e
@@ -38,8 +38,18 @@ feature {NONE} -- Initialization
set_name ("")
end
+feature -- Status report
+
+ has_id: BOOLEAN
+ do
+ Result := id > 0
+ end
+
feature -- Access
+ id: INTEGER_64
+ -- unique identifier.
+
endpoint: READABLE_STRING_8
-- Url that receives the access token request.
@@ -68,9 +78,6 @@ feature -- Access
name: READABLE_STRING_32
-- consumer name.
- id: INTEGER_64
- -- unique identifier.
-
feature -- Element change
set_extractor (a_extractor: like extractor)
diff --git a/modules/oauth20/cms_oauth_20_module.e b/modules/oauth20/cms_oauth_20_module.e
index 2ea9610..8bd65af 100644
--- a/modules/oauth20/cms_oauth_20_module.e
+++ b/modules/oauth20/cms_oauth_20_module.e
@@ -21,6 +21,8 @@ inherit
oauth20_api
end
+ CMS_ADMINISTRABLE
+
CMS_HOOK_BLOCK
SHARED_EXECUTION_ENVIRONMENT
@@ -50,6 +52,13 @@ feature -- Access
name: STRING = "oauth20"
+feature {CMS_EXECUTION} -- Administration
+
+ administration: CMS_OAUTH_20_MODULE_ADMINISTRATION
+ do
+ create Result.make (Current)
+ end
+
feature {CMS_API} -- Module Initialization
initialize (a_api: CMS_API)
@@ -130,7 +139,7 @@ feature {CMS_API} -- Module management
end
end
-feature {CMS_API} -- Access: API
+feature {CMS_API, CMS_MODULE_ADMINISTRATION} -- Access: API
oauth20_api: detachable CMS_OAUTH_20_API
--
@@ -280,7 +289,7 @@ feature -- Hooks
attached {WSF_STRING} req.cookie (a_oauth20_api.session_token) as l_cookie_token
then
-- Logout OAuth
- create l_cookie.make (a_oauth20_api.session_token, l_cookie_token.value)
+ create l_cookie.make (a_oauth20_api.session_token, l_cookie_token.url_encoded_value)
l_cookie.set_path ("/")
l_cookie.set_max_age (-1)
res.add_cookie (l_cookie)
@@ -386,7 +395,8 @@ feature -- OAuth2 Login with Provider
l_cookie: WSF_COOKIE
es: CMS_AUTHENTICATION_EMAIL_SERVICE
do
- if attached {WSF_STRING} req.path_parameter (oauth_callback_path_parameter) as l_callback and then
+ if
+ attached {WSF_STRING} req.path_parameter (oauth_callback_path_parameter) as l_callback and then
attached {CMS_OAUTH_20_CONSUMER} a_oauth_api.oauth_consumer_by_callback (l_callback.value) as l_consumer and then
attached {WSF_STRING} req.query_parameter (oauth_code_query_parameter) as l_code
then
@@ -411,7 +421,7 @@ feature -- OAuth2 Login with Provider
a_oauth_api.update_user_oauth2 (l_access_token.token, l_user_profile, p_user, l_consumer.name )
else
-- create a oauth entry
- a_oauth_api.new_user_oauth2 (l_access_token.token, l_user_profile, p_user, l_consumer.name )
+ a_oauth_api.new_user_oauth2 (l_access_token.token, l_user_profile.to_string_32, p_user, l_consumer.name )
end
create l_cookie.make (a_oauth_api.session_token, l_access_token.token)
l_cookie.set_max_age (l_access_token.expires_in)
@@ -468,7 +478,7 @@ feature -- OAuth2 Login with Provider
attached {WSF_STRING} req.form_parameter ("email") as l_email and then
attached r.user as l_user
then
- l_user.set_email (l_email.value)
+ l_user.set_email (api.utf_8_encoded (l_email.value))
a_oauth_api.new_user_oauth2 ("none", "none", l_user, l_consumer.value )
-- TODO send email?
end
diff --git a/modules/oauth20/cms_oauth_20_module_administration.e b/modules/oauth20/cms_oauth_20_module_administration.e
new file mode 100644
index 0000000..1e1fd67
--- /dev/null
+++ b/modules/oauth20/cms_oauth_20_module_administration.e
@@ -0,0 +1,178 @@
+note
+ description: "Summary description for {CMS_OAUTH_20_MODULE_ADMINISTRATION}."
+ author: ""
+ date: "$Date$"
+ revision: "$Revision$"
+
+class
+ CMS_OAUTH_20_MODULE_ADMINISTRATION
+
+inherit
+ CMS_MODULE_ADMINISTRATION [CMS_OAUTH_20_MODULE]
+ redefine
+ setup_hooks,
+ permissions
+ end
+
+ CMS_HOOK_MENU_SYSTEM_ALTER
+
+create
+ make
+
+feature -- Access
+
+ permissions: LIST [READABLE_STRING_8]
+ -- List of permission ids, used by this module, and declared.
+ do
+ Result := Precursor
+ end
+
+feature {NONE} -- Router/administration
+
+ setup_administration_router (a_router: WSF_ROUTER; a_api: CMS_API)
+ do
+ a_router.handle ("/oauth20/", create {WSF_URI_AGENT_HANDLER}.make (agent handle_admin_consumers (a_api, ?, ?)), a_router.methods_head_get_post)
+ a_router.handle ("/oauth20/{consumer}", create {WSF_URI_TEMPLATE_AGENT_HANDLER}.make (agent handle_admin_consumer (a_api, ?, ?)), a_router.methods_head_get_post)
+ end
+
+feature -- Handle
+
+ handle_admin_consumers (a_api: CMS_API; req: WSF_REQUEST; res: WSF_RESPONSE)
+ local
+ r: CMS_RESPONSE
+ s: STRING
+ do
+ create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, a_api)
+ create s.make_empty
+ s.append ("
Consumers
")
+ if attached module.oauth20_api as l_oauth20_api then
+ s.append ("
")
+ across
+ l_oauth20_api.oauth2_consumers as ic
+ loop
+ s.append ("