From b79c568b08268de1aa89a728d980c2ca63fef5cb Mon Sep 17 00:00:00 2001
From: Maikel Linke <maikel@email.org.au>
Date: Fri, 14 Aug 2020 10:34:50 +1000
Subject: [PATCH] Load our spree overrides instead of the originals

We changed some of Spree's logic and want to use that. And once we
remove the spree_core gem, we need to load those files before using
them.
---
 app/controllers/api/base_controller.rb                 | 1 +
 app/controllers/spree/user_passwords_controller.rb     | 7 +++++++
 app/controllers/spree/user_registrations_controller.rb | 7 +++++++
 app/controllers/spree/user_sessions_controller.rb      | 7 +++++++
 4 files changed, 22 insertions(+)

diff --git a/app/controllers/api/base_controller.rb b/app/controllers/api/base_controller.rb
index 423a4fb104..e9d82d19ad 100644
--- a/app/controllers/api/base_controller.rb
+++ b/app/controllers/api/base_controller.rb
@@ -1,5 +1,6 @@
 # Base controller for OFN's API
 require_dependency 'spree/api/controller_setup'
+require "spree/core/controller_helpers/ssl"
 
 module Api
   class BaseController < ActionController::Metal
diff --git a/app/controllers/spree/user_passwords_controller.rb b/app/controllers/spree/user_passwords_controller.rb
index bf8b13d379..4e7fc6e824 100644
--- a/app/controllers/spree/user_passwords_controller.rb
+++ b/app/controllers/spree/user_passwords_controller.rb
@@ -1,3 +1,10 @@
+# frozen_string_literal: true
+
+require "spree/core/controller_helpers/auth"
+require "spree/core/controller_helpers/common"
+require "spree/core/controller_helpers/order"
+require "spree/core/controller_helpers/ssl"
+
 module Spree
   class UserPasswordsController < Devise::PasswordsController
     helper 'spree/base', 'spree/store'
diff --git a/app/controllers/spree/user_registrations_controller.rb b/app/controllers/spree/user_registrations_controller.rb
index 98ad3c8d1c..1a2d740da7 100644
--- a/app/controllers/spree/user_registrations_controller.rb
+++ b/app/controllers/spree/user_registrations_controller.rb
@@ -1,3 +1,10 @@
+# frozen_string_literal: true
+
+require "spree/core/controller_helpers/auth"
+require "spree/core/controller_helpers/common"
+require "spree/core/controller_helpers/order"
+require "spree/core/controller_helpers/ssl"
+
 module Spree
   class UserRegistrationsController < Devise::RegistrationsController
     helper 'spree/base', 'spree/store'
diff --git a/app/controllers/spree/user_sessions_controller.rb b/app/controllers/spree/user_sessions_controller.rb
index 7ff26a3437..c17eafb892 100644
--- a/app/controllers/spree/user_sessions_controller.rb
+++ b/app/controllers/spree/user_sessions_controller.rb
@@ -1,3 +1,10 @@
+# frozen_string_literal: true
+
+require "spree/core/controller_helpers/auth"
+require "spree/core/controller_helpers/common"
+require "spree/core/controller_helpers/order"
+require "spree/core/controller_helpers/ssl"
+
 module Spree
   class UserSessionsController < Devise::SessionsController
     helper 'spree/base', 'spree/store'