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.

Checkout flow fixes (#13771)

Damian Legawiecc29b5ba2f3d6
diff --git a/packages/next/CHANGELOG.md b/packages/next/CHANGELOG.md
index fbf6b588fc..8fee7cf243 100644
--- a/packages/next/CHANGELOG.md
+++ b/packages/next/CHANGELOG.md
@@ -1,5 +1,13 @@
# @spree/next
+## 0.10.2
+
+### Patch Changes
+
+- Fix `logout()` to clear cart cookies alongside JWT. Previously, logging out only cleared the access token, leaving cart token and cart ID cookies intact — allowing the next guest session to see and interact with the previous user's cart.
+- Fix `requireCartId()` to resolve cart via JWT for authenticated users who don't have the cart ID cookie yet.
+- Unified `setCartToken`/`setCartId` into `setCartCookies()` and `clearCartToken`/`clearCartId` into `clearCartCookies()` since they are always managed as a pair.
+
## 0.10.1
### Patch Changes
diff --git a/packages/next/package.json b/packages/next/package.json
index 48dcf463c5..552da57730 100644
--- a/packages/next/package.json
+++ b/packages/next/package.json
@@ -1,6 +1,6 @@
{
"name": "@spree/next",
- "version": "0.10.1",
+ "version": "0.10.2",
"description": "Next.js integration for Spree Commerce — server actions, caching, and cookie-based auth",
"type": "module",
"main": "./dist/index.js",
diff --git a/packages/next/src/actions/auth.ts b/packages/next/src/actions/auth.ts
index 2c2b7c3649..60a4fea99a 100644
--- a/packages/next/src/actions/auth.ts
+++ b/packages/next/src/actions/auth.ts
@@ -3,7 +3,7 @@
import { revalidateTag } from 'next/cache';
import type { Customer } from '@spree/sdk';
import { getClient } from '../config';
-import { setAccessToken, clearAccessToken, getAccessToken, getCartToken, getCartId } from '../cookies';
+import { setAccessToken, clearAccessToken, getAccessToken, getCartToken, getCartId, clearCartCookies } from '../cookies';
import { withAuthRefresh } from '../auth-helpers';
/**
@@ -90,9 +90,12 @@ export async function register(
/**
* Logout the current user.
+ * Clears all auth and cart cookies to prevent the next guest session
+ * from seeing/modifying the previous user's cart.
*/
export async function logout(): Promise<void> {
await clearAccessToken();
+ await clearCartCookies();
revalidateTag('customer');
revalidateTag('cart');
revalidateTag('addresses');
diff --git a/packages/next/src/actions/cart.ts b/packages/next/src/actions/cart.ts
index f53375481a..178190c8e6 100644
--- a/packages/next/src/actions/cart.ts
+++ b/packages/next/src/actions/cart.ts
@@ -4,8 +4,8 @@ import { revalidateTag } from 'next/cache';
import type { Cart, Order, Shipment, CreateCartParams, UpdateCartParams, ListResponse } from '@spree/sdk';
import { getClient } from '../config';
import {
- getCartToken, setCartToken, clearCartToken,
- getCartId, setCartId, clearCartId,
+ getCartToken, getCartId,
+ setCartCookies, clearCartCookies,
getAccessToken,
getCartOptions, requireCartId,
} from '../cookies';
@@ -30,8 +30,7 @@ export async function getCart(): Promise<Cart | null> {
const response = await getClient().carts.list({ token });
if (response.data.length > 0) {
const cart = response.data[0];
- await setCartId(cart.id);
- if (cart.token) await setCartToken(cart.token);
+ await setCartCookies(cart.id, cart.token);
return cart;
}
}
@@ -39,8 +38,7 @@ export async function getCart(): Promise<Cart | null> {
return null;
} catch {
// Cart not found (e.g., order was completed) — clear stale cookies
- await clearCartToken();
- await clearCartId();
+ await clearCartCookies();
return null;
}
}
@@ -59,10 +57,7 @@ export async function getOrCreateCart(
const cartParams = params && Object.keys(params).length > 0 ? params : undefined;
const cart = await getClient().carts.create(cartParams, token ? { token } : undefined);
- if (cart.token) {
- await setCartToken(cart.token);
- }
- await setCartId(cart.id);
+ await setCartCookies(cart.id, cart.token);
revalidateTag('cart');
return cart;
@@ -131,8 +126,7 @@ export async function removeItem(lineItemId: string): Promise<Cart> {
* Clear the cart (abandons the current cart).
*/
export async function clearCart(): Promise<void> {
- await clearCartToken();
- await clearCartId();
+ await clearCartCookies();
revalidateTag('cart');
}
@@ -152,8 +146,7 @@ export async function associateCart(): Promise<Cart | null> {
return result;
} catch {
// Cart might already belong to another user — clear it
- await clearCartToken();
- await clearCartId();
+ await clearCartCookies();
revalidateTag('cart');
return null;
}
diff --git a/packages/next/src/cookies.ts b/packages/next/src/cookies.ts
index aa3071f06b..8e639c9708 100644
--- a/packages/next/src/cookies.ts
+++ b/packages/next/src/cookies.ts
@@ -26,56 +26,39 @@ function getAccessTokenCookieName(): string {
}
}
-// --- Cart Token ---
+// --- Cart Cookies (token + ID always managed together) ---
export async function getCartToken(): Promise<string | undefined> {
const cookieStore = await cookies();
return cookieStore.get(getCartCookieName())?.value;
}
-export async function setCartToken(token: string): Promise<void> {
- const cookieStore = await cookies();
- cookieStore.set(getCartCookieName(), token, {
- httpOnly: true,
- secure: process.env.NODE_ENV === 'production',
- sameSite: 'lax',
- path: '/',
- maxAge: CART_TOKEN_MAX_AGE,
- });
-}
-
-export async function clearCartToken(): Promise<void> {
- const cookieStore = await cookies();
- cookieStore.set(getCartCookieName(), '', {
- maxAge: -1,
- path: '/',
- });
-}
-
-// --- Cart ID (prefixed ID stored alongside token for REST API) ---
-
export async function getCartId(): Promise<string | undefined> {
const cookieStore = await cookies();
return cookieStore.get(getCartIdCookieName())?.value;
}
-export async function setCartId(id: string): Promise<void> {
+export async function setCartCookies(id: string, token?: string): Promise<void> {
const cookieStore = await cookies();
- cookieStore.set(getCartIdCookieName(), id, {
+ const opts = {
httpOnly: true,
secure: process.env.NODE_ENV === 'production',
- sameSite: 'lax',
+ sameSite: 'lax' as const,
path: '/',
maxAge: CART_TOKEN_MAX_AGE,
- });
+ };
+
+ cookieStore.set(getCartIdCookieName(), id, opts);
+ if (token) {
+ cookieStore.set(getCartCookieName(), token, opts);
+ }
}
-export async function clearCartId(): Promise<void> {
+export async function clearCartCookies(): Promise<void> {
const cookieStore = await cookies();
- cookieStore.set(getCartIdCookieName(), '', {
- maxAge: -1,
- path: '/',
- });
+ const opts = { maxAge: -1, path: '/' };
+ cookieStore.set(getCartCookieName(), '', opts);
+ cookieStore.set(getCartIdCookieName(), '', opts);
}
// --- Access Token (JWT) ---
@@ -119,6 +102,19 @@ export async function getCartOptions(): Promise<{
export async function requireCartId(): Promise<string> {
const cartId = await getCartId();
- if (!cartId) throw new Error('No cart found');
- return cartId;
+ if (cartId) return cartId;
+
+ // Authenticated user without cart ID cookie — resolve via carts.list()
+ const token = await getAccessToken();
+ if (token) {
+ const { getClient } = await import('./config');
+ const response = await getClient().carts.list({ token });
+ if (response.data.length > 0) {
+ const cart = response.data[0];
+ await setCartCookies(cart.id, cart.token);
+ return cart.id;
+ }
+ }
+
+ throw new Error('No cart found');
}
diff --git a/packages/next/tests/actions/auth.test.ts b/packages/next/tests/actions/auth.test.ts
index e29dcd4610..ac319e6189 100644
--- a/packages/next/tests/actions/auth.test.ts
+++ b/packages/next/tests/actions/auth.test.ts
@@ -98,12 +98,18 @@ describe('auth actions', () => {
});
describe('logout', () => {
- it('clears access token and invalidates caches', async () => {
+ it('clears all auth and cart cookies and invalidates caches', async () => {
await logout();
+ // JWT cleared
expect(mockCookieStore.set).toHaveBeenCalledWith(
- '_spree_jwt',
- '',
- expect.objectContaining({ maxAge: -1 })
+ '_spree_jwt', '', expect.objectContaining({ maxAge: -1 })
+ );
+ // Cart cookies cleared
+ expect(mockCookieStore.set).toHaveBeenCalledWith(
+ '_spree_cart_token', '', expect.objectContaining({ maxAge: -1 })
+ );
+ expect(mockCookieStore.set).toHaveBeenCalledWith(
+ '_spree_cart_token_id', '', expect.objectContaining({ maxAge: -1 })
);
expect(revalidateTag).toHaveBeenCalledWith('customer');
expect(revalidateTag).toHaveBeenCalledWith('cart');
diff --git a/packages/next/tests/cookies.test.ts b/packages/next/tests/cookies.test.ts
index e10a842bc9..b420fca9d8 100644
--- a/packages/next/tests/cookies.test.ts
+++ b/packages/next/tests/cookies.test.ts
@@ -2,8 +2,9 @@ import { describe, it, expect, beforeEach, vi } from 'vitest';
import { mockCookieStore } from './setup';
import {
getCartToken,
- setCartToken,
- clearCartToken,
+ getCartId,
+ setCartCookies,
+ clearCartCookies,
getAccessToken,
setAccessToken,
clearAccessToken,
@@ -14,7 +15,7 @@ describe('cookies', () => {
vi.clearAllMocks();
});
- describe('cart token', () => {
+ describe('cart cookies', () => {
it('reads cart token from cookies', async () => {
mockCookieStore.get.mockReturnValue({ value: 'cart_abc123' });
const token = await getCartToken();
@@ -22,17 +23,34 @@ describe('cookies', () => {
expect(mockCookieStore.get).toHaveBeenCalledWith('_spree_cart_token');
});
+ it('reads cart ID from cookies', async () => {
+ mockCookieStore.get.mockReturnValue({ value: 'or_xyz' });
+ const id = await getCartId();
+ expect(id).toBe('or_xyz');
+ expect(mockCookieStore.get).toHaveBeenCalledWith('_spree_cart_token_id');
+ });
+
it('returns undefined when no cart token', async () => {
mockCookieStore.get.mockReturnValue(undefined);
const token = await getCartToken();
expect(token).toBeUndefined();
});
- it('sets cart token with httpOnly cookie', async () => {
- await setCartToken('cart_new');
+ it('sets both cart ID and token cookies', async () => {
+ await setCartCookies('or_123', 'cart_token_abc');
+ expect(mockCookieStore.set).toHaveBeenCalledWith(
+ '_spree_cart_token_id',
+ 'or_123',
+ expect.objectContaining({
+ httpOnly: true,
+ sameSite: 'lax',
+ path: '/',
+ maxAge: 60 * 60 * 24 * 30,
+ })
+ );
expect(mockCookieStore.set).toHaveBeenCalledWith(
'_spree_cart_token',
- 'cart_new',
+ 'cart_token_abc',
expect.objectContaining({
httpOnly: true,
sameSite: 'lax',
@@ -42,13 +60,28 @@ describe('cookies', () => {
);
});
- it('clears cart token', async () => {
- await clearCartToken();
+ it('sets only cart ID when token is undefined', async () => {
+ await setCartCookies('or_123');
+ expect(mockCookieStore.set).toHaveBeenCalledTimes(1);
+ expect(mockCookieStore.set).toHaveBeenCalledWith(
+ '_spree_cart_token_id',
+ 'or_123',
+ expect.objectContaining({ httpOnly: true })
+ );
+ });
+
+ it('clears both cart cookies', async () => {
+ await clearCartCookies();
expect(mockCookieStore.set).toHaveBeenCalledWith(
'_spree_cart_token',
'',
expect.objectContaining({ maxAge: -1 })
);
+ expect(mockCookieStore.set).toHaveBeenCalledWith(
+ '_spree_cart_token_id',
+ '',
+ expect.objectContaining({ maxAge: -1 })
+ );
});
});
diff --git a/spree/core/app/services/spree/carts/update.rb b/spree/core/app/services/spree/carts/update.rb
index 38285f84a1..aaed081c85 100644
--- a/spree/core/app/services/spree/carts/update.rb
+++ b/spree/core/app/services/spree/carts/update.rb
@@ -56,7 +56,10 @@ module Spree
address_id = resolve_address_id(address_params[:id])
cart.public_send(:"#{address_type}_id=", address_id) if address_id
else
- revert_to_address_state if cart.has_checkout_step?('address')
+ # Only revert to address state when shipping address changes.
+ # Billing address updates (e.g. during payment) should not
+ # destroy shipments and reset the checkout flow.
+ revert_to_address_state if address_type == :ship_address && cart.has_checkout_step?('address')
cart.public_send(:"#{address_type}_attributes=", address_params)
end
end
diff --git a/spree/core/spec/services/spree/carts/update_spec.rb b/spree/core/spec/services/spree/carts/update_spec.rb
index 47b02f3160..6ad63f3207 100644
--- a/spree/core/spec/services/spree/carts/update_spec.rb
+++ b/spree/core/spec/services/spree/carts/update_spec.rb
@@ -158,6 +158,40 @@ module Spree
end
end
+ describe 'billing address does not reset checkout state' do
+ let(:country) { Spree::Country.find_by(iso: 'US') || create(:country, iso: 'US') }
+ let!(:state) { country.states.find_by(abbr: 'NY') || create(:state, country: country, abbr: 'NY', name: 'New York') }
+ let(:order) { create(:order_with_line_items, user: user, store: store, state: 'delivery') }
+
+ let(:params) do
+ {
+ bill_address: {
+ firstname: 'Jane',
+ lastname: 'Doe',
+ address1: '456 Oak Ave',
+ city: 'New York',
+ zipcode: '10002',
+ country_iso: 'US',
+ state_abbr: 'NY',
+ phone: '555-9999'
+ }
+ }
+ end
+
+ it 'does not revert order state to address' do
+ # Capture shipments before the update
+ order.reload
+ shipment_ids = order.shipments.pluck(:id)
+ expect(shipment_ids).not_to be_empty
+
+ expect(subject).to be_success
+
+ order.reload
+ # Shipments should be preserved (not recreated)
+ expect(order.shipments.pluck(:id)).to eq(shipment_ids)
+ end
+ end
+
describe 'address ownership' do
let(:other_user) { create(:user) }
let(:other_users_address) { create(:address, user: other_user) }