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.
Ruby b2b-commercee-commerceecommerceecommerce-apiecommerce-frameworkecommerce-platformheadlessheadless-commerceheadless-ecommercemarketplacemulti-tenantmulti-vendormulti-vendor-ecommerceopen-sourcespree-commerce
Make `ControllerHelpers::Auth#store_location` work nicely for both Cu… (#12698)
Damian Legawiecafc74be2d246
diff --git a/admin/app/controllers/spree/admin/base_controller.rb b/admin/app/controllers/spree/admin/base_controller.rbindex d9f1e17783..e60e9b287d 100644--- a/admin/app/controllers/spree/admin/base_controller.rb+++ b/admin/app/controllers/spree/admin/base_controller.rb@@ -55,6 +55,10 @@ module Spreeendend+ def store_location_session_key+ "#{Spree.admin_user_class.model_name.singular_route_key.to_sym}_return_to"+ end+def flash_message_for(object, event_sym)if object.is_a?(ActiveRecord::Relation)resource_desc = object.model.model_name.human.pluralizediff --git a/core/lib/spree/core/controller_helpers/auth.rb b/core/lib/spree/core/controller_helpers/auth.rbindex 2ac156f17e..b7451790e5 100644--- a/core/lib/spree/core/controller_helpers/auth.rb+++ b/core/lib/spree/core/controller_helpers/auth.rb@@ -43,18 +43,19 @@ module Spree@current_oauth_token ||= get_last_access_token.call(user) || create_access_token.call(user)end- def store_location- # disallow return to login, logout, signup pages- authentication_routes = [:spree_signup_path, :spree_login_path, :spree_logout_path]- disallowed_urls = []- authentication_routes.each do |route|- disallowed_urls << send(route) if respond_to?(route)- end+ # this will work for devise out of the box+ # for other auth systems you will need to override this method+ def store_location(location = nil)+ return if try_spree_current_user- disallowed_urls.map! { |url| url[/\/\w+$/] }- unless disallowed_urls.include?(request.fullpath)- session['spree_user_return_to'] = request.fullpath.gsub('//', '/')- end+ location ||= request.fullpath+ session_key = store_location_session_key++ session[session_key] = location+ end++ def store_location_session_key+ "#{Spree.user_class.model_name.singular_route_key.to_sym}_return_to"end# proxy method to *possible* spree_current_user methoddiff --git a/core/spec/lib/spree/core/controller_helpers/auth_spec.rb b/core/spec/lib/spree/core/controller_helpers/auth_spec.rbindex e7427289df..c610cab383 100644--- a/core/spec/lib/spree/core/controller_helpers/auth_spec.rb+++ b/core/spec/lib/spree/core/controller_helpers/auth_spec.rb@@ -74,7 +74,7 @@ describe Spree::Core::ControllerHelpers::Auth, type: :controller doit 'sets session return url' doallow(controller).to receive_messages(request: double(fullpath: '/redirect'))controller.store_location- expect(session[:spree_user_return_to]).to eq '/redirect'+ expect(session[:legacy_user_return_to]).to eq '/redirect'endenddiff --git a/storefront/app/controllers/spree/store_controller.rb b/storefront/app/controllers/spree/store_controller.rbindex dc319f9b56..0d24c075e5 100644--- a/storefront/app/controllers/spree/store_controller.rb+++ b/storefront/app/controllers/spree/store_controller.rb@@ -212,18 +212,6 @@ module Spreeendend- # this will work for devise out of the box- # for other auth systems you will need to override this method- def store_location(location = nil)- return if try_spree_current_user- return unless defined?(store_location_for)- return unless defined?(Devise)-- location ||= request.fullpath-- store_location_for(Devise.mappings.keys.first, location)- end-def stored_locationreturn unless defined?(after_sign_in_path_for)return unless defined?(Devise)diff --git a/storefront/spec/controllers/spree/checkout_controller_spec.rb b/storefront/spec/controllers/spree/checkout_controller_spec.rbindex 6ab435dd1e..87297030ad 100644--- a/storefront/spec/controllers/spree/checkout_controller_spec.rb+++ b/storefront/spec/controllers/spree/checkout_controller_spec.rb@@ -81,20 +81,6 @@ describe Spree::CheckoutController, type: :controller doget :edit, params: { token: order.token }expect(response).to redirect_to(spree.checkout_state_path(order.token, 'address'))end-- context 'when Devise is installed' do- before do- allow(controller).to receive(:store_location_for)-- stub_const('Devise', double(mappings: { user: nil }))- end-- it 'saves the location so that we can redirect back after login' do- get :edit, params: { state: 'address', token: order.token }-- expect(controller).to have_received(:store_location_for).with(:user, spree.checkout_state_path(order.token, 'address'))- end- endendcontext 'when guest checkout is not allowed' do