From 87418a06a42440011d73655983757b4d6a21fde7 Mon Sep 17 00:00:00 2001 From: Quentin Champenois Date: Sat, 18 Jan 2025 18:56:56 +0100 Subject: [PATCH 1/3] fix: Allow to get verification code --- Gemfile | 2 +- Gemfile.lock | 6 +++--- config/initializers/half_signup.rb | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Gemfile b/Gemfile index fbe02a049a..9713c310a8 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem "decidim-extended_socio_demographic_authorization_handler", git: "https://gi gem "decidim-extra_user_fields", git: "https://github.com/OpenSourcePolitics/decidim-module-extra_user_fields.git", branch: "temp/twilio-compatibility-0.27" gem "decidim-friendly_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-friendly_signup.git" gem "decidim-gallery", git: "https://github.com/OpenSourcePolitics/decidim-module-gallery.git", branch: "fix/nokogiri_deps" -gem "decidim-half_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-half_sign_up.git", branch: "feature/half_signup_and_budgets_booth" +gem "decidim-half_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-half_sign_up.git", branch: "fix/show_sms_verification_code" gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_BRANCH gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: "release/0.27-stable" gem "decidim-simple_proposal", git: "https://github.com/OpenSourcePolitics/decidim-module-simple_proposal", branch: DECIDIM_BRANCH diff --git a/Gemfile.lock b/Gemfile.lock index 38e36f1af8..5f0826e500 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,8 +51,8 @@ GIT GIT remote: https://github.com/OpenSourcePolitics/decidim-module-half_sign_up.git - revision: 5bee2b5422e4131f933ad854ab872e049dcf7b54 - branch: feature/half_signup_and_budgets_booth + revision: 34bbced1a8215618b8b115467c3cffc8e190d465 + branch: fix/show_sms_verification_code specs: decidim-half_signup (0.27.0) countries (~> 5.1, >= 5.1.2) @@ -1235,4 +1235,4 @@ RUBY VERSION ruby 3.0.6p216 BUNDLED WITH - 2.5.10 + 2.5.22 diff --git a/config/initializers/half_signup.rb b/config/initializers/half_signup.rb index 33b729485b..253a7331d9 100644 --- a/config/initializers/half_signup.rb +++ b/config/initializers/half_signup.rb @@ -8,4 +8,5 @@ config.default_countries = ENV.fetch("AVAILABLE_LOCALES", "fr").split(",").map(&:to_sym) config.skip_csrf = ENV.fetch("HALF_SIGNUP_SKIP_CSRF", "false") == "true" + config.show_sms_verification_code = ENV.fetch("HALF_SIGNUP_SHOW_SMS_VERIFICATION_CODE", "false") == "true" end From d8da4d65d312c8412099d97786ae06e000fb9b46 Mon Sep 17 00:00:00 2001 From: Quentin Champenois Date: Sat, 18 Jan 2025 19:35:48 +0100 Subject: [PATCH 2/3] fix: Add task to clear users --- config/sidekiq.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/sidekiq.yml b/config/sidekiq.yml index fc2aeb03a0..ef174cb719 100644 --- a/config/sidekiq.yml +++ b/config/sidekiq.yml @@ -83,3 +83,8 @@ cron: '0 0 3 * * *' class: Decidim::PapertrailVersionJob queue: default + ArchiveUsersPhone: + cron: '0 <%= Random.rand(0..59) %> <%= Random.rand(6..8) %> * * *' # Run randomly between 06:00 and 08:59 + class: ArchiveUsersPhoneJob + queue: default + enabled: false \ No newline at end of file From eab7c257d20ecfdfbdbefdb63e4aded91773a6e4 Mon Sep 17 00:00:00 2001 From: Quentin Champenois Date: Sun, 19 Jan 2025 14:40:00 +0100 Subject: [PATCH 3/3] fix: Bump Gemfile --- Gemfile | 2 +- Gemfile.lock | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Gemfile b/Gemfile index 9713c310a8..dbd5d63799 100644 --- a/Gemfile +++ b/Gemfile @@ -32,7 +32,7 @@ gem "decidim-extended_socio_demographic_authorization_handler", git: "https://gi gem "decidim-extra_user_fields", git: "https://github.com/OpenSourcePolitics/decidim-module-extra_user_fields.git", branch: "temp/twilio-compatibility-0.27" gem "decidim-friendly_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-friendly_signup.git" gem "decidim-gallery", git: "https://github.com/OpenSourcePolitics/decidim-module-gallery.git", branch: "fix/nokogiri_deps" -gem "decidim-half_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-half_sign_up.git", branch: "fix/show_sms_verification_code" +gem "decidim-half_signup", git: "https://github.com/OpenSourcePolitics/decidim-module-half_sign_up.git", branch: "refactor/half_signup_budgets_booth" gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_BRANCH gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: "release/0.27-stable" gem "decidim-simple_proposal", git: "https://github.com/OpenSourcePolitics/decidim-module-simple_proposal", branch: DECIDIM_BRANCH diff --git a/Gemfile.lock b/Gemfile.lock index 5f0826e500..47d849123e 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -51,8 +51,8 @@ GIT GIT remote: https://github.com/OpenSourcePolitics/decidim-module-half_sign_up.git - revision: 34bbced1a8215618b8b115467c3cffc8e190d465 - branch: fix/show_sms_verification_code + revision: 03b2b148762131802f878f2e6e08b6fc917776f5 + branch: refactor/half_signup_budgets_booth specs: decidim-half_signup (0.27.0) countries (~> 5.1, >= 5.1.2)