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
Use `create_token_cookie` everywhere to unify order cookie handling i… (#13265)
Damian Legawiec08b853aaa4c4
diff --git a/core/lib/spree/core/controller_helpers/order.rb b/core/lib/spree/core/controller_helpers/order.rbindex 37833fef84..917bfa2255 100644--- a/core/lib/spree/core/controller_helpers/order.rb+++ b/core/lib/spree/core/controller_helpers/order.rb@@ -118,11 +118,20 @@ module Spreevalue: token,expires: 90.days.from_now,secure: Rails.configuration.force_ssl || Rails.application.config.ssl_options[:secure_cookies],- domain: current_store.url_or_custom_domain,+ domain: cookie_domain_without_port,httponly: true}end+ def cookie_domain_without_port+ domain = current_store.url_or_custom_domain+ return nil if domain.blank?++ # Remove port from domain (e.g., "localhost:3000" -> "localhost")+ # Cookies don't support port numbers in the domain attribute+ domain.split(':').first+ end+def last_incomplete_order(includes = {})@last_incomplete_order ||= try_spree_current_user.last_incomplete_spree_order(current_store, includes: includes)enddiff --git a/core/spec/lib/spree/core/controller_helpers/order_spec.rb b/core/spec/lib/spree/core/controller_helpers/order_spec.rbindex 8fdeb8c40a..d7d517a0c5 100644--- a/core/spec/lib/spree/core/controller_helpers/order_spec.rb+++ b/core/spec/lib/spree/core/controller_helpers/order_spec.rb@@ -216,4 +216,11 @@ describe Spree::Core::ControllerHelpers::Order, type: :controller doexpect(controller.ip_address).to eq request.remote_ipendend++ describe '#create_token_cookie' do+ it 'creates a new token cookie' do+ controller.send(:create_token_cookie, 'token-123')+ expect(request.cookie_jar.signed[:token]).to eq 'token-123'+ end+ endenddiff --git a/storefront/app/controllers/spree/checkout_controller.rb b/storefront/app/controllers/spree/checkout_controller.rbindex 749a492395..660a4a3121 100644--- a/storefront/app/controllers/spree/checkout_controller.rb+++ b/storefront/app/controllers/spree/checkout_controller.rb@@ -182,7 +182,7 @@ module Spreeendreset_session- cookies.permanent.signed[:token] = @order.token+ create_token_cookie(@order.token)redirect_to spree.checkout_path(@order.token)else@@ -204,7 +204,7 @@ module Spreeenddef allow_access_to_complete_order_with_new_user?- cookies_order_token = cookies.permanent.signed[:token]+ cookies_order_token = cookies.signed[:token]@order.completed? && @order.signup_for_an_account? && @order.user_id.present? && cookies_order_token.present? && cookies_order_token == @order.tokenenddiff --git a/storefront/app/controllers/spree/line_items_controller.rb b/storefront/app/controllers/spree/line_items_controller.rbindex 933c6a30ff..1bcb184410 100644--- a/storefront/app/controllers/spree/line_items_controller.rb+++ b/storefront/app/controllers/spree/line_items_controller.rb@@ -15,7 +15,7 @@ module Spree@quantity = params[:quantity].to_i || 1options = params[:options] || {}- cookies.permanent.signed[:token] = { value: @order.token, domain: current_store.url_or_custom_domain } if @order.persisted?+ create_token_cookie(@order.token) if @order.persisted?result = cart_add_item_service.call(order: @order,variant: @variant,