Merge branch 'develop' into feat/sso-saml

.env-example

@@ -121,3 +121,61 @@ RAILS_LOG_LEVEL=warn
 # OMNIAUTH_IMT_REQUEST_ATTRIBUTE_FIRST_NAME
 # OMNIAUTH_IMT_REQUEST_ATTRIBUTE_LAST_NAME
 # OMNIAUTH_IMT_REQUEST_ATTRIBUTE_NICKNAME
+
+# Default notifications sending frequency : (daily, weekly, none, real_time)
+# NOTIFICATIONS_SENDING_FREQUENCY=daily
+
+## SMS Gateway Service (eg: decidim-half_signup)
+# SMS_GATEWAY_SERVICE="Decidim::SmsGatewayService"
+# SMS_GATEWAY_URL="https://sms.gateway.service/api"
+# SMS_GATEWAY_BULK_URL="https://sms.gateway.service/api/bulk"
+# SMS_GATEWAY_USERNAME=
+# SMS_GATEWAY_PASSWORD=
+## Set to replace the organization name
+# SMS_GATEWAY_PLATFORM="hashimoto.local"
+
+#Timeout for the unsubscribe link of the newsletter
+#NEWSLETTERS_UNSUBSCRIBE_TIMEOUT=
+
+# Redirect to the TOS page after signup (default: true)
+# DECIDIM_HALF_SIGNUP_SHOW_TOS_PAGE_AFTER_SIGNUP=true
+
+## SSO SAML 
+# OMNIAUTH_IMT_ICON_PATH
+# OMNIAUTH_IMT_IDP_ENTITY_SELECTOR_URL
+# OMNIAUTH_IMT_IDP_METADATA_URL
+# OMNIAUTH_IMT_ISSUER
+# OMNIAUTH_IMT_ASSERTION_CONSUMER_SERVICE_URL
+# OMNIAUTH_IMT_SP_ENTITY_ID
+# OMNIAUTH_IMT_IDP_SSO_SERVICE_URL
+# OMNIAUTH_IMT_IDP_SLO_SERVICE_URL
+# OMNIAUTH_IMT_IDP_CERT
+# OMNIAUTH_IMT_NAME_IDENTIFIER_FORMAT
+# OMNIAUTH_IMT_ATTRIBUTE_SERVICE_NAME
+# OMNIAUTH_IMT_UID_ATTRIBUTE
+# OMNIAUTH_IMT_PROTOCOL_BINDING
+# OMNIAUTH_IMT_IDP_SECURITY_DIGEST_METHOD
+# OMNIAUTH_IMT_IDP_SECURITY_SIGNATURE_METHOD
+# OMNIAUTH_IMT_REQUEST_ATTRIBUTE_EMAIL
+# OMNIAUTH_IMT_REQUEST_ATTRIBUTE_NAME
+# OMNIAUTH_IMT_REQUEST_ATTRIBUTE_FIRST_NAME
+# OMNIAUTH_IMT_REQUEST_ATTRIBUTE_LAST_NAME
+# OMNIAUTH_IMT_REQUEST_ATTRIBUTE_NICKNAME
+
+# Default notifications sending frequency : (daily, weekly, none, real_time)
+# NOTIFICATIONS_SENDING_FREQUENCY=daily
+
+## SMS Gateway Service (eg: decidim-half_signup)
+# SMS_GATEWAY_SERVICE="Decidim::SmsGatewayService"
+# SMS_GATEWAY_URL="https://sms.gateway.service/api"
+# SMS_GATEWAY_BULK_URL="https://sms.gateway.service/api/bulk"
+# SMS_GATEWAY_USERNAME=
+# SMS_GATEWAY_PASSWORD=
+## Set to replace the organization name
+# SMS_GATEWAY_PLATFORM="hashimoto.local"
+
+#Timeout for the unsubscribe link of the newsletter
+#NEWSLETTERS_UNSUBSCRIBE_TIMEOUT=
+
+# Redirect to the TOS page after signup (default: true)
+# DECIDIM_HALF_SIGNUP_SHOW_TOS_PAGE_AFTER_SIGNUP=true

Gemfile

@@ -14,7 +14,7 @@ gem "decidim-initiatives", "~> #{DECIDIM_VERSION}.0"
 gem "decidim-templates", "~> #{DECIDIM_VERSION}.0"
 
 # Load Budgets Booth to avoid errors
-gem "decidim-budgets_booth", github: "OpenSourcePolitics/decidim-module-ptp"
+# gem "decidim-budgets_booth", github: "OpenSourcePolitics/decidim-module-ptp"
 
 # External Decidim gems
 gem "decidim-budget_category_voting", git: "https://github.com/alecslupu-pfa/decidim-budget_category_voting.git", branch: DECIDIM_BRANCH
@@ -26,7 +26,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: "feature/half_signup_and_budgets_booth"
 gem "decidim-homepage_interactive_map", git: "https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git", branch: DECIDIM_BRANCH
 gem "decidim-ludens", git: "https://github.com/OpenSourcePolitics/decidim-ludens.git", branch: DECIDIM_BRANCH
 gem "decidim-phone_authorization_handler", git: "https://github.com/OpenSourcePolitics/decidim-module_phone_authorization_handler", branch: "release/0.27-stable"

Gemfile.lock

@@ -40,15 +40,6 @@ GIT
       decidim-admin (>= 0.26.0, < 0.28.0)
       decidim-core (>= 0.26.0, < 0.28.0)
 
-GIT
-  remote: https://github.com/OpenSourcePolitics/decidim-module-half_sign_up.git
-  revision: 661bfe02e51d1cd4f16df1eb483d932494d5df1f
-  branch: feature/half_signup_and_budgets_booth
-  specs:
-    decidim-half_signup (0.27.0)
-      countries (~> 5.1, >= 5.1.2)
-      decidim-core (~> 0.27.0)
-
 GIT
   remote: https://github.com/OpenSourcePolitics/decidim-module-homepage_interactive_map.git
   revision: dd685166fdf953a11bd6a9e0dac56feca3bd0708
@@ -61,14 +52,6 @@ GIT
       rgeo (~> 2.4)
       rgeo-proj4 (~> 3.1)
 
-GIT
-  remote: https://github.com/OpenSourcePolitics/decidim-module-ptp.git
-  revision: 32b0f9a29499768cf6783a0026badaed33f025ab
-  specs:
-    decidim-budgets_booth (0.27.0)
-      decidim-budgets (~> 0.27.0)
-      decidim-core (~> 0.27.0)
-
 GIT
   remote: https://github.com/OpenSourcePolitics/decidim-module-survey_multiple_answers
   revision: 65ea83227f99d0f3d6237f98334ecc914a2a5597
@@ -1146,7 +1129,6 @@ DEPENDENCIES
   dalli
   decidim (~> 0.27.0)
   decidim-budget_category_voting!
-  decidim-budgets_booth!
   decidim-cache_cleaner
   decidim-category_enhanced (~> 0.0.1)
   decidim-conferences (~> 0.27.0)
@@ -1156,7 +1138,6 @@ DEPENDENCIES
   decidim-extra_user_fields!
   decidim-friendly_signup!
   decidim-gallery!
-  decidim-half_signup!
   decidim-homepage_interactive_map!
   decidim-initiatives (~> 0.27.0)
   decidim-ludens!

config/initializers/half_signup.rb

@@ -1,9 +1,9 @@
 # frozen_string_literal: true
 
-Decidim::HalfSignup.configure do |config|
-  config.show_tos_page_after_signup = Rails.application.secrets.dig(:decidim, :half_signup, :show_tos_page_after_signup)
-  config.auth_code_length = 4
-  config.default_countries = ENV.fetch("AVAILABLE_LOCALES", "fr").split(",").map(&:to_sym)
+# Decidim::HalfSignup.configure do |config|
+#   config.show_tos_page_after_signup = Rails.application.secrets.dig(:decidim, :half_signup, :show_tos_page_after_signup)
+#   config.auth_code_length = 4
+#   config.default_countries = ENV.fetch("AVAILABLE_LOCALES", "fr").split(",").map(&:to_sym)
 
-  config.skip_csrf = ENV.fetch("HALF_SIGNUP_SKIP_CSRF", "false") == "true"
-end
+#   config.skip_csrf = ENV.fetch("HALF_SIGNUP_SKIP_CSRF", "false") == "true"
+# end