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
V-3252 Fix accessing the checkout complete page on user orders for guests (#13136)
Łukasz Adamczykd51c1e241173
diff --git a/storefront/app/controllers/spree/checkout_controller.rb b/storefront/app/controllers/spree/checkout_controller.rbindex 8eb7587fe8..749a492395 100644--- a/storefront/app/controllers/spree/checkout_controller.rb+++ b/storefront/app/controllers/spree/checkout_controller.rb@@ -171,7 +171,7 @@ module Spreeclear_order_tokenflash[:error] = 'You cannot access this checkout'redirect_to_cart- elsif try_spree_current_user.nil? && [email protected]?+ elsif try_spree_current_user.nil? && !allow_access_to_complete_order_with_new_user?if params[:guest] && current_store.prefers_guest_checkout?@order = current_store.orders.@@ -203,6 +203,12 @@ module Spree@current_order = @order # for compatibility with the rest of storefront, analytics, etcend+ def allow_access_to_complete_order_with_new_user?+ cookies_order_token = cookies.permanent.signed[:token]++ @order.completed? && @order.signup_for_an_account? && @order.user_id.present? && cookies_order_token.present? && cookies_order_token == @order.token+ end+def remove_out_of_stock_items_validated_order, messages = Spree::Cart::RemoveOutOfStockItems.call(order: @order).valuediff --git a/storefront/spec/controllers/spree/checkout_controller_spec.rb b/storefront/spec/controllers/spree/checkout_controller_spec.rbindex 8bc158e08c..7f7f0f2c90 100644--- a/storefront/spec/controllers/spree/checkout_controller_spec.rb+++ b/storefront/spec/controllers/spree/checkout_controller_spec.rb@@ -1087,16 +1087,89 @@ describe Spree::CheckoutController, type: :controller doendcontext 'when order is in complete state' do- let(:order) { create(:completed_order_with_totals, store: store) }+ let(:order) { create(:completed_order_with_totals, store: store, user: order_user, signup_for_an_account: signup_for_an_account) }+ let(:signup_for_an_account) { false }- before { get :complete, params: { token: order.token } }+ context 'when checkout is associated with a user' do+ let(:order_user) { create(:user) }++ before { get :complete, params: { token: order.token } }++ it 'clears out the session' do+ expect(session[:checkout_completed]).to be_nil+ end++ context 'when user is signed in' do+ let(:user) { order_user }++ it 'renders the page' do+ expect(response).to render_template(:complete)+ end+ end++ context 'when other user is signed in' do+ let(:user) { create(:user) }++ it 'redirects to the cart' do+ expect(response).to redirect_to spree.cart_path+ end+ end++ context 'for a guest user' do+ let(:user) { nil }++ it 'redirects to the login page' do+ expect(response).to redirect_to('/login')+ end+ end+ end++ context 'when checkout is not associated with a user' do+ let(:order_user) { nil }++ before { get :complete, params: { token: order.token } }- it 'renders the page' do- expect(response).to render_template(:complete)+ it 'clears out the session' do+ expect(session[:checkout_completed]).to be_nil+ end++ it 'renders the page' do+ expect(response).to render_template(:complete)+ endend- it 'clears out the session' do- expect(session[:checkout_completed]).to be_nil+ context 'when a guest user signed up for an account' do+ let(:order_user) { create(:user) }+ let(:signup_for_an_account) { true }++ before do+ request.cookie_jar.signed[:token] = cookies_order_token+ get :complete, params: { token: order.token }+ end++ context 'when cookies order token is valid' do+ let(:cookies_order_token) { order.token }++ it 'renders the page' do+ expect(response).to render_template(:complete)+ end+ end++ context 'when cookies order token is invalid' do+ let(:cookies_order_token) { build(:order).token }++ it 'redirects to the login page' do+ expect(response).to redirect_to('/login')+ end+ end++ context 'when there is no cookies order token' do+ let(:cookies_order_token) { nil }++ it 'redirects to the login page' do+ expect(response).to redirect_to('/login')+ end+ endendendend