From 0cf6e59a7608b2fe605e128bf6a348b680ded6c4 Mon Sep 17 00:00:00 2001 From: jvelilla Date: Fri, 8 Jan 2016 20:26:34 -0300 Subject: [PATCH] Updated templates and fixed typos. Renamed classes --- .../mail_templates/account_new_password.html | 2 +- .../auth/mail_templates/account_welcome.html | 2 +- .../admin_account_evaluation.html | 2 +- .../modules/auth/scripts/auth_temp_users.sql | 6 ++--- .../block_admin_pending_registrations.tpl | 21 ++++++++++++++++ ..._authentication_email_service_parameters.e | 2 +- modules/auth/cms_authentication_module.e | 24 +++++++++---------- ...ms_user_temp_api.e => cms_temp_user_api.e} | 14 +++++------ .../{cms_temporal_user.e => cms_temp_user.e} | 4 ++-- ..._storage_i.e => cms_temp_user_storage_i.e} | 10 ++++---- ...ge_null.e => cms_temp_user_storage_null.e} | 16 ++++++------- ...rage_sql.e => cms_temp_user_storage_sql.e} | 18 +++++++------- .../mail_templates/account_new_password.html | 2 +- .../site/mail_templates/account_welcome.html | 2 +- .../admin_account_evaluation.html | 2 +- .../auth/site/scripts/auth_temp_users.sql | 4 ++-- modules/auth/site/scripts/auth_temp_users.tpl | 13 ---------- .../block_admin_pending_registrations.tpl | 21 ++++++++++++++++ 18 files changed, 97 insertions(+), 68 deletions(-) create mode 100644 examples/demo/site/modules/auth/templates/block_admin_pending_registrations.tpl rename modules/auth/{cms_user_temp_api.e => cms_temp_user_api.e} (90%) rename modules/auth/model/{cms_temporal_user.e => cms_temp_user.e} (90%) rename modules/auth/persistence/{cms_temporal_user_storage_i.e => cms_temp_user_storage_i.e} (92%) rename modules/auth/persistence/{cms_temporal_user_storage_null.e => cms_temp_user_storage_null.e} (76%) rename modules/auth/persistence/{cms_temporal_user_storage_sql.e => cms_temp_user_storage_sql.e} (96%) rename examples/demo/site/modules/auth/scripts/auth_temp_users.tpl => modules/auth/site/scripts/auth_temp_users.sql (88%) delete mode 100644 modules/auth/site/scripts/auth_temp_users.tpl create mode 100644 modules/auth/site/templates/block_admin_pending_registrations.tpl diff --git a/examples/demo/site/modules/auth/mail_templates/account_new_password.html b/examples/demo/site/modules/auth/mail_templates/account_new_password.html index 0ad6560..ed5f4f4 100644 --- a/examples/demo/site/modules/auth/mail_templates/account_new_password.html +++ b/examples/demo/site/modules/auth/mail_templates/account_new_password.html @@ -10,7 +10,7 @@

You have required a new password at $sitename

-

To complete your request, please click on this link to genereate a new password:

+

To complete your request, please click on this link to generate a new password:

$link

diff --git a/examples/demo/site/modules/auth/mail_templates/account_welcome.html b/examples/demo/site/modules/auth/mail_templates/account_welcome.html index b2b8d04..7371013 100644 --- a/examples/demo/site/modules/auth/mail_templates/account_welcome.html +++ b/examples/demo/site/modules/auth/mail_templates/account_welcome.html @@ -7,7 +7,7 @@ -

Welcome to$sitename

+

Welcome to $sitename

Thank you for joining us.

diff --git a/examples/demo/site/modules/auth/mail_templates/admin_account_evaluation.html b/examples/demo/site/modules/auth/mail_templates/admin_account_evaluation.html index e626446..dcecbac 100644 --- a/examples/demo/site/modules/auth/mail_templates/admin_account_evaluation.html +++ b/examples/demo/site/modules/auth/mail_templates/admin_account_evaluation.html @@ -11,7 +11,7 @@

Account Evaluation

The user $user ($email) wants to register to the site $sitename

-

This is his/her application.

+

User application:

$application

diff --git a/examples/demo/site/modules/auth/scripts/auth_temp_users.sql b/examples/demo/site/modules/auth/scripts/auth_temp_users.sql index 14d42f6..25ad9b5 100644 --- a/examples/demo/site/modules/auth/scripts/auth_temp_users.sql +++ b/examples/demo/site/modules/auth/scripts/auth_temp_users.sql @@ -1,7 +1,5 @@ - -DROP TABLE IF EXISTS "auth_temp_users"; CREATE TABLE `auth_temp_users` ( - `uid` INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, + `uid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL, `name` VARCHAR(100) NOT NULL, `password` VARCHAR(100) NOT NULL, `salt` VARCHAR(100) NOT NULL, @@ -11,3 +9,5 @@ CREATE TABLE `auth_temp_users` ( UNIQUE(`name`) ); + + diff --git a/examples/demo/site/modules/auth/templates/block_admin_pending_registrations.tpl b/examples/demo/site/modules/auth/templates/block_admin_pending_registrations.tpl new file mode 100644 index 0000000..cfc3d90 --- /dev/null +++ b/examples/demo/site/modules/auth/templates/block_admin_pending_registrations.tpl @@ -0,0 +1,21 @@ +

Listing 4 Pending Registrations

+ diff --git a/modules/auth/cms_authentication_email_service_parameters.e b/modules/auth/cms_authentication_email_service_parameters.e index efcf557..9898ceb 100644 --- a/modules/auth/cms_authentication_email_service_parameters.e +++ b/modules/auth/cms_authentication_email_service_parameters.e @@ -108,7 +108,7 @@ feature -- Access -- Contact email. site_name: IMMUTABLE_STRING_8 - -- Site name. + -- UTF-8 encoded Site name. contact_subject_account_evaluation: IMMUTABLE_STRING_8 contact_subject_register: IMMUTABLE_STRING_8 diff --git a/modules/auth/cms_authentication_module.e b/modules/auth/cms_authentication_module.e index 76cd1d5..f6dcda7 100644 --- a/modules/auth/cms_authentication_module.e +++ b/modules/auth/cms_authentication_module.e @@ -91,16 +91,16 @@ feature {CMS_API} -- Module Initialization -- local l_auth_api: like auth_api - l_user_auth_storage: CMS_TEMPORAL_USER_STORAGE_I + l_user_auth_storage: CMS_TEMP_USER_STORAGE_I do Precursor (a_api) -- Storage initialization if attached a_api.storage.as_sql_storage as l_storage_sql then - create {CMS_TEMPORAL_USER_STORAGE_SQL} l_user_auth_storage.make (l_storage_sql) + create {CMS_TEMP_USER_STORAGE_SQL} l_user_auth_storage.make (l_storage_sql) else -- FIXME: in case of NULL storage, should Current be disabled? - create {CMS_TEMPORAL_USER_STORAGE_NULL} l_user_auth_storage + create {CMS_TEMP_USER_STORAGE_NULL} l_user_auth_storage end -- API initialization @@ -128,7 +128,7 @@ feature {CMS_API} -- Module Initialization feature {CMS_API} -- Access: API - auth_api: detachable CMS_USER_TEMP_API + auth_api: detachable CMS_TEMP_USER_API -- feature -- Router @@ -252,7 +252,7 @@ feature -- Handler local r: CMS_RESPONSE l_user_api: CMS_USER_API - u: CMS_TEMPORAL_USER + u: CMS_TEMP_USER l_exist: BOOLEAN es: CMS_AUTHENTICATON_EMAIL_SERVICE l_url_activate: STRING @@ -337,19 +337,19 @@ feature -- Handler create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api) if r.has_permission ("account activate") then if attached {WSF_STRING} req.path_parameter ("token") as l_token then - if attached {CMS_TEMPORAL_USER} l_auth_api.user_by_activation_token (l_token.value) as l_user then + if attached {CMS_TEMP_USER} l_auth_api.user_by_activation_token (l_token.value) as l_user then -- TODO copy the personal information --! to CMS_USER_PROFILE and persist data --! check also CMS_USER.data_items -- Delete temporal User - l_auth_api.delete_temporary_user (l_user) + l_auth_api.delete_temp_user (l_user) -- Valid user_id l_user.set_id (0) l_user.mark_active - l_auth_api.new_user_from_temporal_user (l_user) + l_auth_api.new_user_from_temp_user (l_user) l_auth_api.remove_activation (l_token.value) r.set_main_content ("

The account " + l_user.name + " has been activated

") -- Send Email @@ -388,8 +388,8 @@ feature -- Handler create {GENERIC_VIEW_CMS_RESPONSE} r.make (req, res, api) if r.has_permission ("account reject") then if attached {WSF_STRING} req.path_parameter ("token") as l_token then - if attached {CMS_USER} l_auth_api.user_by_activation_token (l_token.value) as l_user then - l_auth_api.delete_temporary_user (l_user) + if attached {CMS_TEMP_USER} l_auth_api.user_by_activation_token (l_token.value) as l_user then + l_auth_api.delete_temp_user (l_user) r.set_main_content ("

The temporal account for " + l_user.name + " has been removed

") -- Send Email if attached l_user.email as l_email then @@ -432,7 +432,7 @@ feature -- Handler if req.is_post_request_method then if attached {WSF_STRING} req.form_parameter ("email") as l_email then l_user_api := api.user_api - if attached {CMS_TEMPORAL_USER} l_auth_api.user_by_email (l_email.value) as l_user then + if attached {CMS_TEMP_USER} l_auth_api.user_by_email (l_email.value) as l_user then -- User exist create a new token and send a new email. if l_user.is_active then r.set_value ("The asociated user to the given email " + l_email.value + " , is already active", "is_active") @@ -593,7 +593,7 @@ feature -- Handler local l_response: CMS_RESPONSE s: STRING - u: CMS_TEMPORAL_USER + u: CMS_TEMP_USER l_page_helper: CMS_PAGINATION_GENERATOR s_pager: STRING l_count: INTEGER diff --git a/modules/auth/cms_user_temp_api.e b/modules/auth/cms_temp_user_api.e similarity index 90% rename from modules/auth/cms_user_temp_api.e rename to modules/auth/cms_temp_user_api.e index 94831a6..99fc981 100644 --- a/modules/auth/cms_user_temp_api.e +++ b/modules/auth/cms_temp_user_api.e @@ -4,7 +4,7 @@ note revision: "$Revision$" class - CMS_USER_TEMP_API + CMS_TEMP_USER_API inherit CMS_MODULE_API @@ -16,7 +16,7 @@ create {CMS_AUTHENTICATION_MODULE} feature {NONE} -- Initialization - make_with_storage (a_api: CMS_API; a_auth_storage: CMS_TEMPORAL_USER_STORAGE_I) + make_with_storage (a_api: CMS_API; a_auth_storage: CMS_TEMP_USER_STORAGE_I) -- Create an object with api `a_api' and storage `a_auth_storage'. do auth_storage := a_auth_storage @@ -52,7 +52,7 @@ feature -- Access Result := auth_storage.user_by_activation_token (a_token) end - recent_users (params: CMS_DATA_QUERY_PARAMETERS): ITERABLE [CMS_TEMPORAL_USER] + recent_users (params: CMS_DATA_QUERY_PARAMETERS): ITERABLE [CMS_TEMP_USER] -- List of the `a_rows' most recent users starting from `a_offset'. do Result := auth_storage.recent_users (params.offset.to_integer_32, params.size.to_integer_32) @@ -65,7 +65,7 @@ feature -- Access feature -- Temp User - new_user_from_temporal_user (a_user: CMS_TEMPORAL_USER) + new_user_from_temp_user (a_user: CMS_TEMP_USER) -- Add a new user `a_user'. require no_id: not a_user.has_id @@ -85,7 +85,7 @@ feature -- Temp User end end - new_temp_user (a_user: CMS_TEMPORAL_USER) + new_temp_user (a_user: CMS_TEMP_USER) -- Add a new user `a_user'. require no_id: not a_user.has_id @@ -109,7 +109,7 @@ feature -- Temp User auth_storage.remove_activation (a_token) end - delete_temporary_user (a_user: CMS_USER) + delete_temp_user (a_user: CMS_TEMP_USER) -- Delete user `a_user'. require has_id: a_user.has_id @@ -121,7 +121,7 @@ feature -- Temp User feature {CMS_MODULE} -- Access: User auth storage. - auth_storage: CMS_TEMPORAL_USER_STORAGE_I + auth_storage: CMS_TEMP_USER_STORAGE_I -- storage interface. end diff --git a/modules/auth/model/cms_temporal_user.e b/modules/auth/model/cms_temp_user.e similarity index 90% rename from modules/auth/model/cms_temporal_user.e rename to modules/auth/model/cms_temp_user.e index b2605a3..59101af 100644 --- a/modules/auth/model/cms_temporal_user.e +++ b/modules/auth/model/cms_temp_user.e @@ -1,10 +1,10 @@ note - description: "Summary description for {CMS_TEMPORAL_USER}." + description: "Summary description for {CMS_TEMP_USER}." date: "$Date$" revision: "$Revision$" class - CMS_TEMPORAL_USER + CMS_TEMP_USER inherit diff --git a/modules/auth/persistence/cms_temporal_user_storage_i.e b/modules/auth/persistence/cms_temp_user_storage_i.e similarity index 92% rename from modules/auth/persistence/cms_temporal_user_storage_i.e rename to modules/auth/persistence/cms_temp_user_storage_i.e index 6b2f43a..d5aece1 100644 --- a/modules/auth/persistence/cms_temporal_user_storage_i.e +++ b/modules/auth/persistence/cms_temp_user_storage_i.e @@ -6,7 +6,7 @@ note revision: "$Revision$" deferred class - CMS_TEMPORAL_USER_STORAGE_I + CMS_TEMP_USER_STORAGE_I inherit SHARED_LOGGER @@ -57,7 +57,7 @@ feature -- Access: Users password: Result /= Void implies (Result.hashed_password /= Void and Result.password = Void) end - recent_users (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_TEMPORAL_USER] + recent_users (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_TEMP_USER] -- List of recent `a_count' temporal users with an offset of `lower'. deferred end @@ -71,7 +71,7 @@ feature -- Access: Users feature -- New Temp User - new_user_from_temporal_user (a_user: CMS_TEMPORAL_USER) + new_user_from_temporal_user (a_user: CMS_TEMP_USER) -- new user from temporal user `a_user' require no_id: not a_user.has_id @@ -83,14 +83,14 @@ feature -- New Temp User deferred end - new_temp_user (a_user: CMS_TEMPORAL_USER) + new_temp_user (a_user: CMS_TEMP_USER) -- New temp user `a_user'. require no_id: not a_user.has_id deferred end - delete_user (a_user: CMS_USER) + delete_user (a_user: CMS_TEMP_USER) -- Delete user `a_user'. require has_id: a_user.has_id diff --git a/modules/auth/persistence/cms_temporal_user_storage_null.e b/modules/auth/persistence/cms_temp_user_storage_null.e similarity index 76% rename from modules/auth/persistence/cms_temporal_user_storage_null.e rename to modules/auth/persistence/cms_temp_user_storage_null.e index 39292ca..6b7a834 100644 --- a/modules/auth/persistence/cms_temporal_user_storage_null.e +++ b/modules/auth/persistence/cms_temp_user_storage_null.e @@ -1,14 +1,14 @@ note - description: "Summary description for {CMS_TEMPORAL_USER_STORAGE_NULL}." + description: "Summary description for {CMS_TEMP_USER_STORAGE_NULL}." date: "$Date$" revision: "$Revision$" class - CMS_TEMPORAL_USER_STORAGE_NULL + CMS_TEMP_USER_STORAGE_NULL inherit - CMS_TEMPORAL_USER_STORAGE_I + CMS_TEMP_USER_STORAGE_I feature -- Error handler @@ -46,10 +46,10 @@ feature -- Access: Users do end - recent_users (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_TEMPORAL_USER] + recent_users (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_TEMP_USER] -- List of recent `a_count' temporal users with an offset of `lower'. do - create {ARRAYED_LIST[CMS_TEMPORAL_USER]} Result.make (0) + create {ARRAYED_LIST[CMS_TEMP_USER]} Result.make (0) end token_by_user_id (a_id: like {CMS_USER}.id): detachable STRING @@ -59,7 +59,7 @@ feature -- Access: Users feature -- Temp Users - new_user_from_temporal_user (a_user: CMS_TEMPORAL_USER) + new_user_from_temporal_user (a_user: CMS_TEMP_USER) -- do end @@ -70,12 +70,12 @@ feature -- Temp Users do end - new_temp_user (a_user: CMS_TEMPORAL_USER) + new_temp_user (a_user: CMS_TEMP_USER) -- do end - delete_user (a_user: CMS_USER) + delete_user (a_user: CMS_TEMP_USER) -- do end diff --git a/modules/auth/persistence/cms_temporal_user_storage_sql.e b/modules/auth/persistence/cms_temp_user_storage_sql.e similarity index 96% rename from modules/auth/persistence/cms_temporal_user_storage_sql.e rename to modules/auth/persistence/cms_temp_user_storage_sql.e index a6244ff..699dfcd 100644 --- a/modules/auth/persistence/cms_temporal_user_storage_sql.e +++ b/modules/auth/persistence/cms_temp_user_storage_sql.e @@ -1,13 +1,13 @@ note - description: "Summary description for {CMS_TEMPORAL_USER_STORAGE_SQL}." + description: "Summary description for {CMS_TEMP_USER_STORAGE_SQL}." date: "$Date$" revision: "$Revision$" class - CMS_TEMPORAL_USER_STORAGE_SQL + CMS_TEMP_USER_STORAGE_SQL inherit - CMS_TEMPORAL_USER_STORAGE_I + CMS_TEMP_USER_STORAGE_I CMS_PROXY_STORAGE_SQL @@ -113,12 +113,12 @@ feature -- Access User sql_finalize end - recent_users (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_TEMPORAL_USER] + recent_users (a_lower: INTEGER; a_count: INTEGER): LIST [CMS_TEMP_USER] -- local l_parameters: STRING_TABLE [detachable ANY] do - create {ARRAYED_LIST [CMS_TEMPORAL_USER]} Result.make (0) + create {ARRAYED_LIST [CMS_TEMP_USER]} Result.make (0) error_handler.reset write_information_log (generator + ".recent_users") @@ -162,7 +162,7 @@ feature -- Access User feature {NONE} -- Implementation: User - fetch_user: detachable CMS_TEMPORAL_USER + fetch_user: detachable CMS_TEMP_USER local l_id: INTEGER_64 l_name: detachable READABLE_STRING_32 @@ -204,7 +204,7 @@ feature {NONE} -- Implementation: User feature -- New Temp User - new_user_from_temporal_user (a_user: CMS_TEMPORAL_USER) + new_user_from_temporal_user (a_user: CMS_TEMP_USER) -- local l_parameters: STRING_TABLE [detachable ANY] @@ -242,7 +242,7 @@ feature -- New Temp User end end - new_temp_user (a_user: CMS_TEMPORAL_USER) + new_temp_user (a_user: CMS_TEMP_USER) -- Add a new temp_user `a_user'. local l_parameters: STRING_TABLE [detachable ANY] @@ -301,7 +301,7 @@ feature -- Remove Activation sql_finalize end - delete_user (a_user: CMS_USER) + delete_user (a_user: CMS_TEMP_USER) -- Delete user `a_user'. local l_parameters: STRING_TABLE [detachable ANY] diff --git a/modules/auth/site/mail_templates/account_new_password.html b/modules/auth/site/mail_templates/account_new_password.html index 0ad6560..ed5f4f4 100644 --- a/modules/auth/site/mail_templates/account_new_password.html +++ b/modules/auth/site/mail_templates/account_new_password.html @@ -10,7 +10,7 @@

You have required a new password at $sitename

-

To complete your request, please click on this link to genereate a new password:

+

To complete your request, please click on this link to generate a new password:

$link

diff --git a/modules/auth/site/mail_templates/account_welcome.html b/modules/auth/site/mail_templates/account_welcome.html index b2b8d04..7371013 100644 --- a/modules/auth/site/mail_templates/account_welcome.html +++ b/modules/auth/site/mail_templates/account_welcome.html @@ -7,7 +7,7 @@ -

Welcome to$sitename

+

Welcome to $sitename

Thank you for joining us.

diff --git a/modules/auth/site/mail_templates/admin_account_evaluation.html b/modules/auth/site/mail_templates/admin_account_evaluation.html index e626446..dcecbac 100644 --- a/modules/auth/site/mail_templates/admin_account_evaluation.html +++ b/modules/auth/site/mail_templates/admin_account_evaluation.html @@ -11,7 +11,7 @@

Account Evaluation

The user $user ($email) wants to register to the site $sitename

-

This is his/her application.

+

User application:

$application

diff --git a/examples/demo/site/modules/auth/scripts/auth_temp_users.tpl b/modules/auth/site/scripts/auth_temp_users.sql similarity index 88% rename from examples/demo/site/modules/auth/scripts/auth_temp_users.tpl rename to modules/auth/site/scripts/auth_temp_users.sql index d06c641..25ad9b5 100644 --- a/examples/demo/site/modules/auth/scripts/auth_temp_users.tpl +++ b/modules/auth/site/scripts/auth_temp_users.sql @@ -1,5 +1,3 @@ - -DROP TABLE IF EXISTS "auth_temp_users"; CREATE TABLE `auth_temp_users` ( `uid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL, `name` VARCHAR(100) NOT NULL, @@ -11,3 +9,5 @@ CREATE TABLE `auth_temp_users` ( UNIQUE(`name`) ); + + diff --git a/modules/auth/site/scripts/auth_temp_users.tpl b/modules/auth/site/scripts/auth_temp_users.tpl deleted file mode 100644 index d06c641..0000000 --- a/modules/auth/site/scripts/auth_temp_users.tpl +++ /dev/null @@ -1,13 +0,0 @@ - -DROP TABLE IF EXISTS "auth_temp_users"; -CREATE TABLE `auth_temp_users` ( - `uid` INTEGER PRIMARY KEY AUTO_INCREMENT NOT NULL, - `name` VARCHAR(100) NOT NULL, - `password` VARCHAR(100) NOT NULL, - `salt` VARCHAR(100) NOT NULL, - `email` VARCHAR(250) NOT NULL, - `application` TEXT NOT NULL, - CONSTRAINT `name` - UNIQUE(`name`) -); - diff --git a/modules/auth/site/templates/block_admin_pending_registrations.tpl b/modules/auth/site/templates/block_admin_pending_registrations.tpl new file mode 100644 index 0000000..cfc3d90 --- /dev/null +++ b/modules/auth/site/templates/block_admin_pending_registrations.tpl @@ -0,0 +1,21 @@ +

Listing 4 Pending Registrations

+
    +
  • +
      +
    • + Javier - javier@testing +
      • +
    • + Software Developer +
      • + +
    • + activate +
      • +
    • + reject +
      • + +
    +
    • +