From 7d38bec26d2a5dbd646b7fc3c50f2ad03bd2c57e Mon Sep 17 00:00:00 2001
From: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com>
Date: Thu, 3 Jun 2021 20:52:09 +0100
Subject: [PATCH] Remove Spree::Config[:allow_ssl_in_development_and_test]

Unconditionally disables forced https-redirects in dev and test
---
 app/controllers/spree/admin/general_settings_controller.rb | 3 +--
 app/models/spree/app_configuration.rb                      | 1 -
 config/locales/en.yml                                      | 1 -
 lib/spree/core/controller_helpers/ssl.rb                   | 3 +--
 4 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/controllers/spree/admin/general_settings_controller.rb b/app/controllers/spree/admin/general_settings_controller.rb
index dd5fbbc51f..6a7f116c89 100644
--- a/app/controllers/spree/admin/general_settings_controller.rb
+++ b/app/controllers/spree/admin/general_settings_controller.rb
@@ -4,8 +4,7 @@ module Spree
       def edit
         @preferences_general = [:site_name, :default_seo_title, :default_meta_keywords,
                                 :default_meta_description, :site_url]
-        @preferences_security = [:allow_ssl_in_production,
-                                 :allow_ssl_in_staging, :allow_ssl_in_development_and_test]
+        @preferences_security = [:allow_ssl_in_production, :allow_ssl_in_staging]
         @preferences_currency = [:display_currency, :hide_cents]
       end
 
diff --git a/app/models/spree/app_configuration.rb b/app/models/spree/app_configuration.rb
index 5190b92547..222c42e1cc 100644
--- a/app/models/spree/app_configuration.rb
+++ b/app/models/spree/app_configuration.rb
@@ -33,7 +33,6 @@ module Spree
     preference :allow_backorder_shipping, :boolean, default: false
     preference :allow_checkout_on_gateway_error, :boolean, default: false
     preference :allow_guest_checkout, :boolean, default: true
-    preference :allow_ssl_in_development_and_test, :boolean, default: false
     preference :allow_ssl_in_production, :boolean, default: true
     preference :allow_ssl_in_staging, :boolean, default: true
     # Replace with the name of a zone if you would like to limit the countries
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 8ac5f28653..18085ef2d0 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -3219,7 +3219,6 @@ See the %{link} to find out more about %{sitename}'s features and to start using
     default_meta_description: "Default Meta Description"
     default_meta_keywords: "Default Meta Keywords"
     security_settings: "Security Settings"
-    allow_ssl_in_development_and_test: "Allow SSL to be used when in development and test modes"
     allow_ssl_in_production: "Allow SSL to be used in production mode"
     allow_ssl_in_staging: "Allow SSL to be used in staging mode"
     currency_decimal_mark: "Currency decimal mark"
diff --git a/lib/spree/core/controller_helpers/ssl.rb b/lib/spree/core/controller_helpers/ssl.rb
index 07a9ad5ccd..e9460f3d7d 100644
--- a/lib/spree/core/controller_helpers/ssl.rb
+++ b/lib/spree/core/controller_helpers/ssl.rb
@@ -29,9 +29,8 @@ module Spree
           def self.ssl_supported?
             return Spree::Config[:allow_ssl_in_production] if Rails.env.production?
             return Spree::Config[:allow_ssl_in_staging] if Rails.env.staging?
-            return unless Rails.env.development? || Rails.env.test?
 
-            Spree::Config[:allow_ssl_in_development_and_test]
+            false
           end
 
           private