From 4ee30d7cac0bf2ed5dc9005cefad1ae52b7cb6b2 Mon Sep 17 00:00:00 2001
From: Luis Ramos <luisramos0@gmail.com>
Date: Fri, 26 Jun 2020 10:05:26 +0100
Subject: [PATCH] Remove spree.root route and respective controller. Also move
 unauthorized route to main app.

This route is no longer used in OFN
---
 app/controllers/spree/home_controller.rb  | 7 -------
 config/routes.rb                          | 1 +
 config/routes/spree.rb                    | 4 ----
 lib/spree/core/controller_helpers/auth.rb | 2 +-
 4 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 app/controllers/spree/home_controller.rb

diff --git a/app/controllers/spree/home_controller.rb b/app/controllers/spree/home_controller.rb
deleted file mode 100644
index 9fbdabe940..0000000000
--- a/app/controllers/spree/home_controller.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Spree
-  class HomeController < Spree::StoreController
-    respond_to :html
-
-    def index; end
-  end
-end
diff --git a/config/routes.rb b/config/routes.rb
index ef3380ea79..a657f7f234 100644
--- a/config/routes.rb
+++ b/config/routes.rb
@@ -9,6 +9,7 @@ Openfoodnetwork::Application.routes.draw do
   get "/about_us", to: redirect(ContentConfig.footer_about_url)
 
   get "/login", to: redirect("/#/login")
+  get '/unauthorized', :to => 'home#unauthorized', :as => :unauthorized
 
   get "/discourse/login", to: "discourse_sso#login"
   get "/discourse/sso", to: "discourse_sso#sso"
diff --git a/config/routes/spree.rb b/config/routes/spree.rb
index ca5993aca5..3d29f74486 100644
--- a/config/routes/spree.rb
+++ b/config/routes/spree.rb
@@ -1,7 +1,5 @@
 # Overriding Devise routes to use our own controller
 Spree::Core::Engine.routes.draw do
-  root to: 'home#index'
-
   devise_for :spree_user,
              :class_name => 'Spree::User',
              :controllers => { :sessions => 'spree/user_sessions',
@@ -174,8 +172,6 @@ Spree::Core::Engine.routes.draw do
 
   # Used by spree_paypal_express
   get '/checkout/:state', :to => 'checkout#edit', :as => :checkout_state
-
-  get '/unauthorized', :to => 'home#unauthorized', :as => :unauthorized
   get '/content/cvv', :to => 'content#cvv', :as => :cvv
   get '/content/*path', :to => 'content#show', :as => :content
 end
diff --git a/lib/spree/core/controller_helpers/auth.rb b/lib/spree/core/controller_helpers/auth.rb
index 8f28c27cb1..7fb5672eff 100644
--- a/lib/spree/core/controller_helpers/auth.rb
+++ b/lib/spree/core/controller_helpers/auth.rb
@@ -30,7 +30,7 @@ module Spree
             redirect_to '/unauthorized'
           else
             store_location
-            redirect_to respond_to?(:spree_login_path) ? spree_login_path : spree.root_path
+            redirect_to(respond_to?(:spree_login_path) ? spree_login_path : main_app.root_path)
           end
         end