Add extension point for handling access denied.

core/lib/spree/core/controller_helpers/auth.rb

@@ -8,8 +8,14 @@ module Auth
           before_filter :set_guest_token
           helper_method :try_spree_current_user
 
-          rescue_from CanCan::AccessDenied do |exception|
-            redirect_unauthorized_access
+          class_attribute :unauthorized_redirect
+          self.unauthorized_redirect = -> do
+            flash[:error] = Spree.t(:authorization_failure)
+            redirect_to "/unauthorized"
+          end
+
+          rescue_from CanCan::AccessDenied do
+            instance_exec &unauthorized_redirect
           end
         end
 
@@ -59,24 +65,6 @@ def try_spree_current_user
             nil
           end
         end
-
-        # Redirect as appropriate when an access request fails.  The default action is to redirect to the login screen.
-        # Override this method in your controllers if you want to have special behavior in case the user is not authorized
-        # to access the requested action.  For example, a popup window might simply close itself.
-        def redirect_unauthorized_access
-          if try_spree_current_user
-            flash[:error] = Spree.t(:authorization_failure)
-            redirect_to '/unauthorized'
-          else
-            store_location
-            if respond_to?(:spree_login_path)
-              redirect_to spree_login_path
-            else
-              redirect_to '/unauthorized'
-            end
-          end
-        end
-
       end
     end
   end

core/spec/lib/spree/core/controller_helpers/auth_spec.rb

@@ -63,33 +63,4 @@ def index
       expect(controller.try_spree_current_user).to eq nil
     end
   end
-
-  describe '#redirect_unauthorized_access' do
-    controller(FakesController) do
-      def index; redirect_unauthorized_access; end
-    end
-    context 'when logged in' do
-      before do
-        allow(controller).to receive_messages(try_spree_current_user: double('User', id: 1, last_incomplete_spree_order: nil))
-      end
-      it 'redirects unauthorized path' do
-        get :index
-        expect(response).to redirect_to('/unauthorized')
-      end
-    end
-    context 'when guest user' do
-      before do
-        allow(controller).to receive_messages(try_spree_current_user: nil)
-      end
-      it 'redirects login path' do
-        allow(controller).to receive_messages(spree_login_path: '/login')
-        get :index
-        expect(response).to redirect_to('/login')
-      end
-      it 'redirects root path' do
-        get :index
-        expect(response).to redirect_to('/unauthorized')
-      end
-    end
-  end
 end