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.

FIX clear token cookie (#13499)

brozekaa4ffb50c1bd
diff --git a/storefront/app/controllers/spree/store_controller.rb b/storefront/app/controllers/spree/store_controller.rb
index 715887e1c1..4b3a79abe2 100644
--- a/storefront/app/controllers/spree/store_controller.rb
+++ b/storefront/app/controllers/spree/store_controller.rb
@@ -231,7 +231,7 @@ module Spree
end
def clear_order_token
- cookies.delete(:token)
+ cookies.delete(:token, domain: cookie_domain_without_port)
end
def disable_sesion_tracking
diff --git a/storefront/spec/controllers/spree/checkout_controller_spec.rb b/storefront/spec/controllers/spree/checkout_controller_spec.rb
index 7f7f0f2c90..895ee445ec 100644
--- a/storefront/spec/controllers/spree/checkout_controller_spec.rb
+++ b/storefront/spec/controllers/spree/checkout_controller_spec.rb
@@ -31,12 +31,25 @@ describe Spree::CheckoutController, type: :controller do
expect(response).to redirect_to(spree.cart_path)
end
+ it 'clears the order token cookie if token is invalid' do
+ cookies.signed[:token] = 'INVALID'
+ get :edit, params: { state: 'delivery', token: 'INVALID' }
+ expect(cookies.signed[:token]).to be_nil
+ end
+
it 'redirects to cart if order is completed' do
order.update_columns(completed_at: Time.current, state: 'complete')
get :edit, params: { state: 'address', token: order.token }
expect(response).to redirect_to(spree.cart_path)
end
+ it 'clears the order token cookie if order is completed' do
+ cookies.signed[:token] = order.token
+ order.update_columns(completed_at: Time.current, state: 'complete')
+ get :edit, params: { state: 'address', token: order.token }
+ expect(cookies.signed[:token]).to be_nil
+ end
+
it 'redirects to cart if order has removed line items' do
product = order.line_items.first.product
@@ -197,6 +210,12 @@ describe Spree::CheckoutController, type: :controller do
expect(flash[:error]).to eq('You cannot access this checkout')
expect(response).to redirect_to(spree.cart_path)
end
+
+ it 'clears the order token cookie' do
+ cookies.signed[:token] = order.token
+ get :edit, params: { token: order.token }
+ expect(cookies.signed[:token]).to be_nil
+ end
end
end
end
@@ -1099,6 +1118,10 @@ describe Spree::CheckoutController, type: :controller do
expect(session[:checkout_completed]).to be_nil
end
+ it 'clears the order token cookie' do
+ expect(cookies.signed[:token]).to be_nil
+ end
+
context 'when user is signed in' do
let(:user) { order_user }