decidim · alecslupu · Jul 31, 2024 · Jul 31, 2024 · Jul 31, 2024 · Jul 31, 2024
diff --git a/decidim-accountability/lib/decidim/accountability.rb b/decidim-accountability/lib/decidim/accountability.rb
@@ -15,7 +15,7 @@ module Accountability
 
     # Public Setting that defines whether proposals can be linked to meetings
     config_accessor :enable_proposal_linking do
-      Decidim.const_defined?("Proposals")
+      Decidim::Env.new("ACCOUNTABILITY_ENABLE_PROPOSAL_LINKING", Decidim.const_defined?("Proposals")).present?
     end
   end
 end
diff --git a/decidim-api/lib/decidim/api.rb b/decidim-api/lib/decidim/api.rb
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require "decidim/env"
 require "decidim/api/engine"
 require "decidim/api/types"
 
@@ -11,21 +12,21 @@ module Api
 
     # defines the schema max_per_page to configure GraphQL pagination
     config_accessor :schema_max_per_page do
-      50
+      Decidim::Env.new("API_SCHEMA_MAX_PER_PAGE", 50).to_i
     end
 
     # defines the schema max_complexity to configure GraphQL query complexity
     config_accessor :schema_max_complexity do
-      5000
+      Decidim::Env.new("API_SCHEMA_MAX_COMPLEXITY", 5000).to_i
     end
 
     # defines the schema max_depth to configure GraphQL query max_depth
     config_accessor :schema_max_depth do
-      15
+      Decidim::Env.new("API_SCHEMA_MAX_DEPTH", 15).to_i
     end
 
     config_accessor :disclose_system_version do
-      %w(1 true yes).include?(ENV.fetch("DECIDIM_API_DISCLOSE_SYSTEM_VERSION", nil))
+      Decidim::Env.new("DECIDIM_API_DISCLOSE_SYSTEM_VERSION").present?
     end
 
     # This declares all the types an interface or union can resolve to. This needs

diff --git a/decidim-budgets/lib/decidim/budgets.rb b/decidim-budgets/lib/decidim/budgets.rb
@@ -16,7 +16,7 @@ module Budgets
 
     # Public Setting that defines whether proposals can be linked to meetings
     config_accessor :enable_proposal_linking do
-      Decidim.const_defined?("Proposals")
+      Decidim::Env.new("BUDGETS_ENABLE_PROPOSAL_LINKING", Decidim.const_defined?("Proposals")).present?
     end
   end
 end
diff --git a/decidim-core/app/forms/decidim/notifications_settings_form.rb b/decidim-core/app/forms/decidim/notifications_settings_form.rb
@@ -46,7 +46,7 @@ def direct_message_types
     end
 
     def meet_push_notifications_requirements?
-      Rails.application.secrets.dig(:vapid, :enabled) || false
+      Decidim::Env.new("VAPID_PUBLIC_KEY", nil).present?
     end
   end
 end
diff --git a/decidim-core/app/models/decidim/omniauth_provider.rb b/decidim-core/app/models/decidim/omniauth_provider.rb
@@ -3,7 +3,7 @@
 module Decidim
   class OmniauthProvider
     def self.available
-      Rails.application.secrets[:omniauth] || {}
+      Decidim.omniauth_providers
     end
 
     def self.enabled

diff --git a/decidim-core/app/services/decidim/send_push_notification.rb b/decidim-core/app/services/decidim/send_push_notification.rb
@@ -19,7 +19,7 @@ class SendPushNotification
     #
     # @return [Array<Net::HTTPCreated>, nil] the result of the dispatch or nil if user or subscription are empty
     def perform(notification, title = nil)
-      return unless Rails.application.secrets.dig(:vapid, :enabled)
+      return if Decidim::Env.new("VAPID_PUBLIC_KEY").blank?
       raise ArgumentError, "Need to provide a title if the notification is a PushNotificationMessage" if notification.is_a?(Decidim::PushNotificationMessage) && title.nil?
 
       user = notification.user
@@ -66,8 +66,8 @@ def build_payload(message_params, subscription)
         p256dh: subscription["p256dh"],
         auth: subscription["auth"],
         vapid: {
-          public_key: Rails.application.secrets.vapid[:public_key],
-          private_key: Rails.application.secrets.vapid[:private_key]
+          public_key: ENV.fetch("VAPID_PUBLIC_KEY", nil),
+          private_key: ENV.fetch("VAPID_PRIVATE_KEY", nil)
         }
       }
     end

diff --git a/decidim-core/app/views/decidim/notifications_settings/show.html.erb b/decidim-core/app/views/decidim/notifications_settings/show.html.erb
@@ -194,7 +194,7 @@
           </div>
         </div>
 
-        <input id="vapidPublicKey" name="vapid_public_key" type="hidden" value="<%= Base64.urlsafe_decode64(Rails.application.secrets.vapid[:public_key]).bytes %>">
+        <input id="vapidPublicKey" name="vapid_public_key" type="hidden" value="<%= Base64.urlsafe_decode64(Decidim::Env.new("VAPID_PUBLIC_KEY", nil).to_s).bytes %>">
         <input id="subKeys" name="sub_key" type="hidden" value="<%= current_user.notifications_subscriptions.keys %>">
       <% end %>
 

diff --git a/decidim-core/config/initializers/omniauth.rb b/decidim-core/config/initializers/omniauth.rb
@@ -13,7 +13,7 @@ def setup_provider_proc(provider, config_mapping = {})
 end
 
 Rails.application.config.middleware.use OmniAuth::Builder do
-  omniauth_config = Rails.application.secrets[:omniauth]
+  omniauth_config = Decidim.omniauth_providers
 
   if omniauth_config
     if omniauth_config[:developer].present?

diff --git a/decidim-core/lib/decidim/asset_router/storage.rb b/decidim-core/lib/decidim/asset_router/storage.rb
@@ -104,7 +104,7 @@ def default_options
       # @return [Hash] The remote storage options hash
       def remote_storage_options
         @remote_storage_options ||= {
-          host: Rails.application.secrets.dig(:storage, :cdn_host)
+          host: ENV.fetch("STORAGE_CDN_HOST", nil)
         }.compact
       end