Skip to content

armgit / spree

Public Imported from GitHub
0

Open Source Platform for DTC, B2B Commerce, Marketplaces & Omnichannel. REST APIs, TypeScript SDKs, and production-ready Next.js storefront. Self-host it. Own your data. No vendor lock-in. Zero platform fees.

Deprecate `redirect_back_or_default`

Damian Legawiecdb95d43a97f0
diff --git a/admin/app/controllers/spree/admin/shipments_controller.rb b/admin/app/controllers/spree/admin/shipments_controller.rb
index a4c707ad27..11690b716f 100644
--- a/admin/app/controllers/spree/admin/shipments_controller.rb
+++ b/admin/app/controllers/spree/admin/shipments_controller.rb
@@ -55,7 +55,7 @@ module Spree
if errors.any?
flash[:error] = errors.to_sentence
- return redirect_back_or_default(spree.edit_admin_order_path(@order))
+ return redirect_back(fallback_location: spree.edit_admin_order_path(@order))
end
if transfer.valid? && transfer.run!
@@ -64,7 +64,7 @@ module Spree
flash[:error] = transfer.errors.full_messages.to_sentence
end
- redirect_back_or_default(spree.edit_admin_order_path(@order))
+ redirect_back(fallback_location: spree.edit_admin_order_path(@order))
end
private
diff --git a/core/lib/spree/core/controller_helpers/auth.rb b/core/lib/spree/core/controller_helpers/auth.rb
index b7451790e5..7fd983148d 100644
--- a/core/lib/spree/core/controller_helpers/auth.rb
+++ b/core/lib/spree/core/controller_helpers/auth.rb
@@ -21,8 +21,8 @@ module Spree
end
def redirect_back_or_default(default)
- redirect_to(session['spree_user_return_to'] || request.env['HTTP_REFERER'] || default)
- session['spree_user_return_to'] = nil
+ Spree::Deprecation.warn('redirect_back_or_default is deprecated and will be removed in Spree 5.2. Please use redirect_back(fallback_location: default) instead.')
+ redirect_back(fallback_location: default)
end
def set_token
diff --git a/core/spec/lib/spree/core/controller_helpers/auth_spec.rb b/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
index c610cab383..5e900064a9 100644
--- a/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
+++ b/core/spec/lib/spree/core/controller_helpers/auth_spec.rb
@@ -24,29 +24,6 @@ describe Spree::Core::ControllerHelpers::Auth, type: :controller do
end
end
- describe '#redirect_back_or_default' do
- controller(FakesController) do
- def index
- redirect_back_or_default('/')
- end
- end
-
- it 'redirects to session url' do
- session[:spree_user_return_to] = '/redirect'
- get :index
- expect(response).to redirect_to('/redirect')
- end
- it 'redirects to HTTP_REFERER' do
- request.env['HTTP_REFERER'] = '/dummy_redirect'
- get :index
- expect(response).to redirect_to('/dummy_redirect')
- end
- it 'redirects to default page' do
- get :index
- expect(response).to redirect_to('/')
- end
- end
-
describe '#set_token' do
controller(FakesController) do
def index
diff --git a/storefront/app/controllers/spree/addresses_controller.rb b/storefront/app/controllers/spree/addresses_controller.rb
index 37d4615f38..0a36e994cd 100644
--- a/storefront/app/controllers/spree/addresses_controller.rb
+++ b/storefront/app/controllers/spree/addresses_controller.rb
@@ -69,7 +69,7 @@ module Spree
format.html { redirect_to spree.checkout_state_path(@order.token, 'address') }
end
else
- redirect_back_or_default(spree.account_addresses_path)
+ redirect_back(fallback_location: spree.account_addresses_path)
end
elsif params[:from_modal].present?
render turbo_stream: turbo_stream.update("edit_address_modal_#{@address.id}", partial: 'spree/account/addresses/edit_address_modal', locals: { address: @address }), status: :unprocessable_entity
diff --git a/storefront/app/controllers/spree/contacts_controller.rb b/storefront/app/controllers/spree/contacts_controller.rb
index 2d8ed35742..a72eea1dfe 100644
--- a/storefront/app/controllers/spree/contacts_controller.rb
+++ b/storefront/app/controllers/spree/contacts_controller.rb
@@ -40,7 +40,7 @@ module Spree
return if current_store.customer_support_email.present?
flash[:error] = Spree.t('storefront.contacts.customer_support_email_not_configured')
- redirect_back_or_default root_path
+ redirect_back(fallback_location: root_path)
end
end
end
diff --git a/storefront/app/controllers/spree/store_controller.rb b/storefront/app/controllers/spree/store_controller.rb
index 0d24c075e5..f2d4320051 100644
--- a/storefront/app/controllers/spree/store_controller.rb
+++ b/storefront/app/controllers/spree/store_controller.rb
@@ -198,7 +198,8 @@ module Spree
end
def redirect_back_or_default(default)
- redirect_to(session[:user_return_to] || default)
+ Spree::Deprecation.warn('redirect_back_or_default is deprecated and will be removed in Spree 5.2. Please use redirect_back(fallback_location: default) instead.')
+ redirect_back(fallback_location: default)
end
def require_user(return_to = nil)