@faststore/core 3.99.0-dev.2 → 3.99.0-dev.4

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @faststore/core@3.99.0-dev.1 prebuild /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.99.0-dev.3 prebuild /home/runner/work/faststore/faststore/packages/core
 > na run partytown && na run generate
 
 
-> @faststore/core@3.99.0-dev.1 partytown /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.99.0-dev.3 partytown /home/runner/work/faststore/faststore/packages/core
 > partytown copylib ./public/~partytown
 
 Partytown lib copied to: /home/runner/work/faststore/faststore/packages/core/public/~partytown
 
-> @faststore/core@3.99.0-dev.1 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.99.0-dev.3 generate /home/runner/work/faststore/faststore/packages/core
 > na run generate:schema && na run generate:codegen && na run format:generated
 
 
-> @faststore/core@3.99.0-dev.1 generate:schema /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.99.0-dev.3 generate:schema /home/runner/work/faststore/faststore/packages/core
 > tsx src/server/generator/generateGraphQLSchemaFile.ts
 
 Schema GraphQL file generated successfully
 
-> @faststore/core@3.99.0-dev.1 generate:codegen /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.99.0-dev.3 generate:codegen /home/runner/work/faststore/faststore/packages/core
 > graphql-codegen
 
 [STARTED] Parse Configuration
@@ -37,11 +37,11 @@ Running lifecycle hook "afterStart" scripts...
 [CLI] Loading Documents
 [CLI] Generating output
 
-> @faststore/core@3.99.0-dev.1 format:generated /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.99.0-dev.3 format:generated /home/runner/work/faststore/faststore/packages/core
 > prettier --write "@generated/**/*.{ts,js,tsx,jsx,json}" --loglevel error
 
 
-> @faststore/core@3.99.0-dev.1 build /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.99.0-dev.3 build /home/runner/work/faststore/faststore/packages/core
 > next build
 
 ⚠ No build cache found. Please configure build caching for faster rebuilds. Read more: https://nextjs.org/docs/messages/no-cache
@@ -67,15 +67,15 @@ Warning: Dynamic Content not found for the page: home. Refer to the Dynamic Cont
    Collecting build traces ...
 
 Route (pages)                              Size     First Load JS
-┌ ● /                                      7.39 kB         165 kB
+┌ ● /                                      7.39 kB         166 kB
 ├   └ css/02259c549b2179f2.css             3.1 kB
 ├   /_app                                  0 B             109 kB
 ├ ● /[...slug]                             2.55 kB         175 kB
 ├ ● /[slug]/p                              97.3 kB         255 kB
 ├   ├ css/e68c313e4ce2fd1b.css             6.34 kB
 ├   └ css/9b4c21dcd3bc4a17.css             16.7 kB
-├ ○ /404                                   1.58 kB         159 kB
-├ ● /500                                   1.57 kB         159 kB
+├ ○ /404                                   1.58 kB         160 kB
+├ ● /500                                   1.57 kB         160 kB
 ├ λ /api/fs/logout                         0 B             109 kB
 ├ λ /api/graphql                           0 B             109 kB
 ├ λ /api/health/live                       0 B             109 kB
@@ -85,13 +85,13 @@ Route (pages)                              Size     First Load JS
 ├ ● /login                                 1.7 kB          160 kB
 ├ λ /pvt/account                           245 B           109 kB
 ├ ● /pvt/account/[...unknown]              286 B           109 kB
-├ λ /pvt/account/403                       2.99 kB         161 kB
+├ λ /pvt/account/403                       2.98 kB         161 kB
 ├   └ css/094ad5cc00c74e64.css             4.82 kB
 ├ λ /pvt/account/404                       2.18 kB         160 kB
 ├   └ css/72f154a00f1cf621.css             4.88 kB
 ├ λ /pvt/account/orders                    9.89 kB         168 kB
 ├   └ css/4b2af1aaeb961465.css             14.4 kB
-├ λ /pvt/account/orders/[id]               13.6 kB         171 kB
+├ λ /pvt/account/orders/[id]               13.6 kB         172 kB
 ├   └ css/482e6fa149885bc2.css             13.9 kB
 ├ λ /pvt/account/profile                   1.99 kB         160 kB
 ├   └ css/5cd37b7508dd5190.css             4.56 kB
@@ -103,8 +103,8 @@ Route (pages)                              Size     First Load JS
 + First Load JS shared by all              118 kB
   ├ chunks/framework-d514426edf885c68.js   45.4 kB
   ├ chunks/main-edeb2c6a5c48bb3f.js        33.2 kB
-  ├ chunks/pages/_app-be3fecd37c6b273c.js  26.3 kB
-  ├ chunks/webpack-fc37ce1526507eaf.js     3.88 kB
+  ├ chunks/pages/_app-87b58cddac61876b.js  26.6 kB
+  ├ chunks/webpack-da79ff7bed51ca28.js     3.88 kB
   └ css/8a513f4b536b0ab0.css               9.18 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,16 +1,17 @@
 
-> @faststore/core@3.99.0-dev.1 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.99.0-dev.3 test /home/runner/work/faststore/faststore/packages/core
 > jest
 
-PASS test/utils/multipleTemplates.test.ts (12.866 s)
-PASS test/utils/clearCookies.test.ts (12.663 s)
-PASS test/utils/cookieCacheBusting.test.ts (15.452 s)
+PASS test/utils/multipleTemplates.test.ts (13.623 s)
+PASS test/utils/clearCookies.test.ts (13.117 s)
+PASS test/utils/cookieCacheBusting.test.ts (15.41 s)
 PASS test/server/cms/global.test.ts
-PASS test/server/cms/index.test.ts (6.552 s)
-PASS test/server/index.test.ts (13.304 s)
+PASS test/utils/validateSessionRefreshToken.test.ts
+PASS test/server/cms/index.test.ts (5.883 s)
+PASS test/server/index.test.ts (12.391 s)
 
-Test Suites: 6 passed, 6 total
-Tests:       52 passed, 52 total
+Test Suites: 7 passed, 7 total
+Tests:       58 passed, 58 total
 Snapshots:   0 total
-Time:        27.288 s
+Time:        27.436 s
 Ran all test suites.

package/@generated/gql.ts

@@ -62,7 +62,7 @@ const documents = {
     types.ProcessOrderAuthorizationMutationDocument,
   '\n  query ValidateUser {\n    validateUser {\n      isValid\n    }\n  }\n':
     types.ValidateUserDocument,
-  '\n  mutation ValidateCartMutation($cart: IStoreCart!, $session: IStoreSession!) {\n    validateCart(cart: $cart, session: $session) {\n      order {\n        orderNumber\n        acceptedOffer {\n          ...CartItem\n        }\n        shouldSplitItem\n      }\n      messages {\n        ...CartMessage\n      }\n    }\n  }\n\n  fragment CartMessage on StoreCartMessage {\n    text\n    status\n  }\n\n  fragment CartItem on StoreOffer {\n    seller {\n      identifier\n    }\n    quantity\n    price\n    priceWithTaxes\n    listPrice\n    listPriceWithTaxes\n    itemOffered {\n      ...CartProductItem\n    }\n  }\n\n  fragment CartProductItem on StoreProduct {\n    sku\n    name\n    unitMultiplier\n    image {\n      url\n      alternateName\n    }\n    brand {\n      name\n    }\n    isVariantOf {\n      productGroupID\n      name\n      skuVariants {\n        activeVariations\n        slugsMap\n        availableVariations\n      }\n    }\n    gtin\n    additionalProperty {\n      propertyID\n      name\n      value\n      valueReference\n    }\n  }\n':
+  '\n  mutation ValidateCartMutation($cart: IStoreCart!, $session: IStoreSession!) {\n    validateCart(cart: $cart, session: $session) {\n      order {\n        orderNumber\n        acceptedOffer {\n          ...CartItem\n        }\n        shouldSplitItem\n      }\n      messages {\n        ...CartMessage\n      }\n    }\n  }\n\n  fragment CartMessage on StoreCartMessage {\n    text\n    status\n  }\n\n  fragment CartItem on StoreOffer {\n    seller {\n      identifier\n    }\n    quantity\n    price\n    priceWithTaxes\n    listPrice\n    listPriceWithTaxes\n    isGift\n    itemOffered {\n      ...CartProductItem\n    }\n  }\n\n  fragment CartProductItem on StoreProduct {\n    sku\n    name\n    unitMultiplier\n    image {\n      url\n      alternateName\n    }\n    brand {\n      name\n    }\n    isVariantOf {\n      productGroupID\n      name\n      skuVariants {\n        activeVariations\n        slugsMap\n        availableVariations\n      }\n    }\n    gtin\n    additionalProperty {\n      propertyID\n      name\n      value\n      valueReference\n    }\n  }\n':
     types.ValidateCartMutationDocument,
   '\n  query ClientPickupPointsQuery(\n    $geoCoordinates: IStoreGeoCoordinates\n  ) {\n    pickupPoints(geoCoordinates: $geoCoordinates) {\n      pickupPointDistances {\n        pickupId\n        distance\n        pickupName\n        isActive\n        address {\n          city\n          state\n          number\n          postalCode\n          street\n        }\n      }\n    }\n  }\n':
     types.ClientPickupPointsQueryDocument,
@@ -250,7 +250,7 @@ export function gql(
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.
  */
 export function gql(
-  source: '\n  mutation ValidateCartMutation($cart: IStoreCart!, $session: IStoreSession!) {\n    validateCart(cart: $cart, session: $session) {\n      order {\n        orderNumber\n        acceptedOffer {\n          ...CartItem\n        }\n        shouldSplitItem\n      }\n      messages {\n        ...CartMessage\n      }\n    }\n  }\n\n  fragment CartMessage on StoreCartMessage {\n    text\n    status\n  }\n\n  fragment CartItem on StoreOffer {\n    seller {\n      identifier\n    }\n    quantity\n    price\n    priceWithTaxes\n    listPrice\n    listPriceWithTaxes\n    itemOffered {\n      ...CartProductItem\n    }\n  }\n\n  fragment CartProductItem on StoreProduct {\n    sku\n    name\n    unitMultiplier\n    image {\n      url\n      alternateName\n    }\n    brand {\n      name\n    }\n    isVariantOf {\n      productGroupID\n      name\n      skuVariants {\n        activeVariations\n        slugsMap\n        availableVariations\n      }\n    }\n    gtin\n    additionalProperty {\n      propertyID\n      name\n      value\n      valueReference\n    }\n  }\n'
+  source: '\n  mutation ValidateCartMutation($cart: IStoreCart!, $session: IStoreSession!) {\n    validateCart(cart: $cart, session: $session) {\n      order {\n        orderNumber\n        acceptedOffer {\n          ...CartItem\n        }\n        shouldSplitItem\n      }\n      messages {\n        ...CartMessage\n      }\n    }\n  }\n\n  fragment CartMessage on StoreCartMessage {\n    text\n    status\n  }\n\n  fragment CartItem on StoreOffer {\n    seller {\n      identifier\n    }\n    quantity\n    price\n    priceWithTaxes\n    listPrice\n    listPriceWithTaxes\n    isGift\n    itemOffered {\n      ...CartProductItem\n    }\n  }\n\n  fragment CartProductItem on StoreProduct {\n    sku\n    name\n    unitMultiplier\n    image {\n      url\n      alternateName\n    }\n    brand {\n      name\n    }\n    isVariantOf {\n      productGroupID\n      name\n      skuVariants {\n        activeVariations\n        slugsMap\n        availableVariations\n      }\n    }\n    gtin\n    additionalProperty {\n      propertyID\n      name\n      value\n      valueReference\n    }\n  }\n'
 ): typeof import('./graphql').ValidateCartMutationDocument
 /**
  * The gql function is used to parse GraphQL queries into a document that can be used by GraphQL clients.

package/@generated/graphql.ts

@@ -1348,6 +1348,8 @@ export type StoreMarketingData = {
 export type StoreOffer = {
   /** Offer item availability. */
   availability: Scalars['String']['output']
+  /** Whether this offer is a gift (e.g. free promotional item). */
+  isGift: Maybe<Scalars['Boolean']['output']>
   /** Offer item condition. */
   itemCondition: Scalars['String']['output']
   /** Information on the item being offered. */
@@ -3143,6 +3145,7 @@ export type ValidateCartMutationMutation = {
         priceWithTaxes: number
         listPrice: number
         listPriceWithTaxes: number
+        isGift: boolean | null
         seller: { identifier: string }
         itemOffered: {
           sku: string
@@ -3181,6 +3184,7 @@ export type CartItemFragment = {
   priceWithTaxes: number
   listPrice: number
   listPriceWithTaxes: number
+  isGift: boolean | null
   seller: { identifier: string }
   itemOffered: {
     sku: string
@@ -4390,6 +4394,7 @@ export const CartItemFragmentDoc = new TypedDocumentString(
   priceWithTaxes
   listPrice
   listPriceWithTaxes
+  isGift
   itemOffered {
     ...CartProductItem
   }
@@ -4536,7 +4541,7 @@ export const ValidateUserDocument = {
 export const ValidateCartMutationDocument = {
   __meta__: {
     operationName: 'ValidateCartMutation',
-    operationHash: 'c2b3f8bff73ebf6ac79d758c66cabbc21ba9fcc0',
+    operationHash: '32c15f8888ca34f223def7972b7f19090808435a',
   },
 } as unknown as TypedDocumentString<
   ValidateCartMutationMutation,

package/@generated/persisted-documents.json

@@ -10,7 +10,7 @@
   "e2b06da6840614d3c72768e56579b9d3b8e80802": "mutation CancelOrderMutation($data: IUserOrderCancel!) { cancelOrder(data: $data) { data } }",
   "8c25d37c8d6e7c20ab21bb8a4f4e6a2fe320ea8d": "mutation ProcessOrderAuthorizationMutation($data: IProcessOrderAuthorization!) { processOrderAuthorization(data: $data) { isPendingForOtherAuthorizer ruleForAuthorization { dimensionId orderAuthorizationId rule { authorizationData { authorizers { authorizationDate email id type } requireAllApprovals } authorizedEmails doId id isUserAuthorized isUserNextAuthorizer name notification priority scoreInterval { accept deny } status timeout trigger { condition { conditionType description expression greatherThan lessThan } effect { description effectType funcPath } } } } } }",
   "32f99c73c3de958b64d6bece1afe800469f54548": "query ValidateUser { validateUser { isValid } }",
-  "c2b3f8bff73ebf6ac79d758c66cabbc21ba9fcc0": "fragment CartItem on StoreOffer { itemOffered { ...CartProductItem } listPrice listPriceWithTaxes price priceWithTaxes quantity seller { identifier } } fragment CartMessage on StoreCartMessage { status text } fragment CartProductItem on StoreProduct { additionalProperty { name propertyID value valueReference } brand { name } gtin image { alternateName url } isVariantOf { name productGroupID skuVariants { activeVariations availableVariations slugsMap } } name sku unitMultiplier } mutation ValidateCartMutation($cart: IStoreCart!, $session: IStoreSession!) { validateCart(cart: $cart, session: $session) { messages { ...CartMessage } order { acceptedOffer { ...CartItem } orderNumber shouldSplitItem } } }",
+  "32c15f8888ca34f223def7972b7f19090808435a": "fragment CartItem on StoreOffer { isGift itemOffered { ...CartProductItem } listPrice listPriceWithTaxes price priceWithTaxes quantity seller { identifier } } fragment CartMessage on StoreCartMessage { status text } fragment CartProductItem on StoreProduct { additionalProperty { name propertyID value valueReference } brand { name } gtin image { alternateName url } isVariantOf { name productGroupID skuVariants { activeVariations availableVariations slugsMap } } name sku unitMultiplier } mutation ValidateCartMutation($cart: IStoreCart!, $session: IStoreSession!) { validateCart(cart: $cart, session: $session) { messages { ...CartMessage } order { acceptedOffer { ...CartItem } orderNumber shouldSplitItem } } }",
   "3fa04e88c811fcb5ece7206fd5aa745bdbc143a8": "query ClientPickupPointsQuery($geoCoordinates: IStoreGeoCoordinates) { pickupPoints(geoCoordinates: $geoCoordinates) { pickupPointDistances { address { city number postalCode state street } distance isActive pickupId pickupName } } }",
   "feb7005103a859e2bc8cf2360d568806fd88deba": "mutation SubscribeToNewsletter($data: IPersonNewsletter!) { subscribeToNewsletter(data: $data) { id } }",
   "dc912e7272e3d9f5ced206837df87f544d39d0a5": "query ClientProductCountQuery($term: String) { productCount(term: $term) { total } }",

package/@generated/schema.graphql

@@ -288,6 +288,8 @@ type StoreOffer {
   itemOffered: StoreProduct!
   """Number of items offered."""
   quantity: Int!
+  """Whether this offer is a gift (e.g. free promotional item)."""
+  isGift: Boolean
 }
 
 """Offer input."""

package/CHANGELOG.md

@@ -3,6 +3,19 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# 3.99.0-dev.4 (2026-04-28)
+
+### Bug Fixes
+
+- Refactor token refresh logic in GraphQL API handler - SFS-3104 ([#3263](https://github.com/vtex/faststore/issues/3263)) ([695ab6a](https://github.com/vtex/faststore/commit/695ab6a9413eb53ef457cfc890c74e41c29c1ab8))
+
+# 3.99.0-dev.3 (2026-04-23)
+
+### Features
+
+- add isGift field to StoreOffer type and resolvers - SFS-3040 ([#3220](https://github.com/vtex/faststore/issues/3220)) ([e10fc92](https://github.com/vtex/faststore/commit/e10fc92633a5296a5b03286028d31d9c280561c6))
+- Enhance session management with logout - SFS-3105 ([#3268](https://github.com/vtex/faststore/issues/3268)) ([9468e32](https://github.com/vtex/faststore/commit/9468e32a3531ca3c91c7f82a34ac1c750c6a26ef))
+
 # [3.99.0-dev.2](https://github.com/vtex/faststore/compare/v3.99.0-dev.1...v3.99.0-dev.2) (2026-04-21)
 
 **Note:** Version bump only for package @faststore/core

package/discovery.config.default.js

@@ -148,6 +148,7 @@ module.exports = {
     enableRedirects: false,
     enableSearchSSR: false,
     enableFaststoreMyAccount: false,
+    useIsGiftFromOrderForm: false,
     graphqlCacheControl: {
       maxAge: 0, // 0 disables cache, 5 * 60 enable cache control maxAge 5 minutes
       staleWhileRevalidate: 60 * 60, // 1 hour

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.99.0-dev.2",
+  "version": "3.99.0-dev.4",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -51,11 +51,11 @@
     "@envelop/graphql-jit": "^8.0.3",
     "@envelop/parser-cache": "^6.0.2",
     "@envelop/validation-cache": "^6.0.2",
-    "@faststore/api": "3.98.1-dev.0",
-    "@faststore/graphql-utils": "^3.98.1-dev.0",
-    "@faststore/lighthouse": "3.98.1-dev.0",
-    "@faststore/sdk": "3.99.0-dev.2",
-    "@faststore/ui": "3.99.0-dev.1",
+    "@faststore/api": "3.99.0-dev.4",
+    "@faststore/graphql-utils": "^3.99.0-dev.4",
+    "@faststore/lighthouse": "3.99.0-dev.4",
+    "@faststore/sdk": "3.99.0-dev.4",
+    "@faststore/ui": "3.99.0-dev.4",
     "@graphql-codegen/cli": "5.0.2",
     "@graphql-codegen/client-preset": "4.2.6",
     "@graphql-codegen/typescript": "4.0.7",
@@ -124,5 +124,5 @@
     "ts-jest": "29.1.1",
     "typescript": "5.3.2"
   },
-  "gitHead": "21f24e9d59e24647024710ae8c1b0273eec018b9"
+  "gitHead": "3069a16c7894cfe1f1da44e4dd812080e074d616"
 }

package/src/components/account/MyAccountDrawer/OrganizationDrawer/useReloadAfterLogoutReturn.ts

@@ -12,7 +12,10 @@ import { useEffect } from 'react'
  * We handle both: check the flag on mount (fresh load) and on pageshow (bfcache).
  */
 
-export const RELOAD_AFTER_LOGOUT_KEY = 'faststore_reload_after_logout_return'
+import {
+  RELOAD_AFTER_LOGOUT_KEY,
+  SESSION_READY_KEY,
+} from '../../../../sdk/session/storageKeys'
 
 /**
  * Call before redirecting to logout. When the user returns to the store, the app
@@ -43,6 +46,8 @@ const checkAndReloadIfReturnedFromLogout = (): void => {
   try {
     if (sessionStorage.getItem(RELOAD_AFTER_LOGOUT_KEY)) {
       sessionStorage.removeItem(RELOAD_AFTER_LOGOUT_KEY)
+      // Pre-set session ready so the reloaded page starts without a skeleton.
+      sessionStorage.setItem(SESSION_READY_KEY, 'true')
       setTimeout(forceRefreshWithoutCache, RELOAD_DELAY_MS)
     }
   } catch {

package/src/pages/api/graphql.ts

@@ -8,7 +8,8 @@ import { parse } from 'cookie'
 import type { NextApiHandler, NextApiRequest } from 'next'
 
 import discoveryConfig from 'discovery.config'
-import { getJWTAutCookie, isExpired } from 'src/utils/getCookie'
+import { getJWTAutCookie } from 'src/utils/getCookie'
+import { shouldForceRefreshTokenForValidateSession } from 'src/utils/validateSessionRefreshToken'
 import { execute } from '../../server'
 
 const DEFAULT_MAX_AGE = 5 * 60 // 5 minutes
@@ -169,27 +170,10 @@ const handler: NextApiHandler = async (request, response) => {
         account: discoveryConfig.api.storeId,
       })
 
-      const tokenExpired = Boolean(jwt && isExpired(Number(jwt?.exp)))
-
-      const refreshAfterExist = !!variables?.session?.refreshAfter
-
-      const refreshAfterExpired =
-        refreshAfterExist && isExpired(Number(variables.session.refreshAfter))
-
-      const tokenExistAndIsFirstRefreshTokenRequest =
-        !!jwt && !refreshAfterExist
-
-      // when token expired, browser clears the cookie, but we still have the refreshAfter in session and the refresh token cookie
-      const tokenNotExistAndRefreshAfterExistAndIsExpired =
-        !jwt && !!refreshAfterExist && refreshAfterExpired
-
-      const tokenExpiredAndRefreshAfterIsNullOrExpired =
-        tokenExpired && (!refreshAfterExist || refreshAfterExpired)
-
-      const shouldRefreshToken =
-        tokenExistAndIsFirstRefreshTokenRequest ||
-        tokenNotExistAndRefreshAfterExistAndIsExpired ||
-        tokenExpiredAndRefreshAfterIsNullOrExpired
+      const shouldRefreshToken = shouldForceRefreshTokenForValidateSession({
+        jwt,
+        sessionRefreshAfter: variables?.session?.refreshAfter,
+      })
 
       if (shouldRefreshToken) {
         throw new UnauthorizedError(

package/src/sdk/account/useRefreshToken.ts

@@ -1,5 +1,5 @@
 import { useEffect, useState } from 'react'
-import { sessionStore } from '../session'
+import { logoutAndClearSession, sessionStore } from '../session'
 import { isRefreshTokenSuccessful, refreshTokenRequest } from './refreshToken'
 
 export const useRefreshToken = (
@@ -37,23 +37,12 @@ export const useRefreshToken = (
           url.searchParams.set('_refresh', Date.now().toString())
           window.location.href = url.toString()
         } else {
-          // If refresh token failed, set refreshAfter to now + 1 hour
-          sessionStore.set({
-            ...currentSession,
-            refreshAfter: String(Math.floor(Date.now() / 1000) + 1 * 60 * 60), // now + 1 hour
-          })
-
+          await logoutAndClearSession(currentSession)
           setShouldShow403(true)
         }
       } catch (error) {
         console.error('Error during refresh token process:', error)
-
-        // Set refreshAfter to postpone future requests and redirect to login
-        sessionStore.set({
-          ...currentSession,
-          refreshAfter: String(Math.floor(Date.now() / 1000) + 1 * 60 * 60), // now + 1 hour
-        })
-
+        await logoutAndClearSession(currentSession)
         setShouldShow403(true)
       }
     }

package/src/sdk/cart/index.ts

@@ -16,7 +16,11 @@ import { request } from '../graphql/request'
 import { sessionStore } from '../session'
 import { createValidationStore, useStore } from '../useStore'
 
-export interface CartItem extends SDKCartItem, CartItemFragment {}
+export interface CartItem
+  extends SDKCartItem,
+    Omit<CartItemFragment, 'isGift'> {
+  isGift?: boolean | null
+}
 
 export interface Cart extends SDKCart<CartItem> {
   messages?: CartMessageFragment[]
@@ -53,6 +57,7 @@ export const ValidateCartMutation = gql(`
     priceWithTaxes
     listPrice
     listPriceWithTaxes
+    isGift
     itemOffered {
       ...CartProductItem
     }
@@ -88,7 +93,12 @@ export const ValidateCartMutation = gql(`
   }
 `)
 
-const isGift = (item: CartItem) => item.price === 0
+const isGift = (item: CartItem) => {
+  if (storeConfig.experimental?.useIsGiftFromOrderForm) {
+    return item?.isGift ?? false
+  }
+  return item.price === 0
+}
 
 const getItemId = (item: Pick<CartItem, 'itemOffered' | 'seller' | 'price'>) =>
   [

package/src/sdk/session/index.ts

@@ -1,6 +1,6 @@
 import type { Session } from '@faststore/sdk'
 import { createSessionStore } from '@faststore/sdk'
-import { useEffect, useMemo, useRef, useState } from 'react'
+import { useEffect, useMemo, useState } from 'react'
 
 import { gql } from '@generated'
 import type {
@@ -17,8 +17,18 @@ import { cartStore } from '../cart'
 import { request } from '../graphql/request'
 import { createValidationStore, useStore } from '../useStore'
 import { getPostalCode } from '../userLocation/index'
+import { RELOAD_AFTER_LOGOUT_KEY, SESSION_READY_KEY } from './storageKeys'
 
-const SESSION_READY_KEY = 'faststore_session_ready'
+const isReloadAfterLogoutPending = (): boolean => {
+  try {
+    return (
+      typeof sessionStorage !== 'undefined' &&
+      !!sessionStorage.getItem(RELOAD_AFTER_LOGOUT_KEY)
+    )
+  } catch {
+    return false
+  }
+}
 
 export const mutation = gql(`
   mutation ValidateSession($session: IStoreSession!, $search: String!) {
@@ -77,7 +87,50 @@ export const mutation = gql(`
   }
 `)
 
+async function handleRefreshToken(session: Session): Promise<Session | null> {
+  const result = await refreshTokenRequest()
+
+  if (isRefreshTokenSuccessful(result)) {
+    return {
+      ...session,
+      refreshAfter: String(
+        Math.floor(new Date(result?.refreshAfter).getTime() / 1000)
+      ),
+    }
+  }
+
+  await logoutAndClearSession(session)
+  return null
+}
+
+function isRefreshAfterExpired(session: Session): boolean {
+  return (
+    !!session.refreshAfter &&
+    Math.floor(Date.now() / 1000) > Number(session.refreshAfter)
+  )
+}
+
 export const validateSession = async (session: Session) => {
+  // Skip validation if the page is about to reload after logout — avoids an
+  // aborted-fetch TypeError when the forced reload navigates the page away.
+  if (isReloadAfterLogoutPending()) {
+    return null
+  }
+
+  // If the refreshToken is enabled and the refreshAfter is expired, refresh the token.
+  // On success, continue to the validation flow with the refreshed session.
+  // On failure (logoutAndClearSession already triggered), bail out.
+  if (
+    storeConfig.experimental?.refreshToken &&
+    isRefreshAfterExpired(session)
+  ) {
+    const refreshed = await handleRefreshToken(session)
+    if (!refreshed) {
+      return null
+    }
+    session = refreshed
+  }
+
   // If deliveryPromise is enabled and there is no postalCode in the session
   if (
     storeConfig.deliveryPromise?.enabled &&
@@ -123,30 +176,16 @@ export const validateSession = async (session: Session) => {
       error?.status === 401 && storeConfig.experimental?.refreshToken
 
     if (shouldRefreshToken) {
-      const result = await refreshTokenRequest()
-
-      if (isRefreshTokenSuccessful(result)) {
-        const refreshAfter = String(
-          Math.floor(new Date(result?.refreshAfter).getTime() / 1000)
-        )
-
-        sessionStore.set({
-          ...session,
-          refreshAfter,
-        })
-      } else {
-        // If the refresh token fails 3x, set the refreshAfter to now + 1 hour
-        // so that we can postpone refreshToken request and continue the ValidateSession request
-        sessionStore.set({
-          ...session,
-          refreshAfter: String(Math.floor(Date.now() / 1000) + 1 * 60 * 60), // now + 1 hour
-        })
+      const refreshed = await handleRefreshToken(session)
+      if (refreshed) {
+        sessionStore.set(refreshed)
       }
     }
   }
 }
 
-const [validationStore, onValidate] = createValidationStore(validateSession)
+const [validationStore, onValidate, hasValidatedStore] =
+  createValidationStore(validateSession)
 
 const defaultStore = createSessionStore(storeConfig.session, onValidate)
 
@@ -162,6 +201,21 @@ export const sessionStore = {
   },
 }
 
+export async function logoutAndClearSession(session: Session) {
+  try {
+    await fetch('/api/fs/logout', { method: 'POST' })
+  } catch (logoutError) {
+    console.error('Failed to call logout endpoint:', logoutError)
+  }
+
+  sessionStore.set({
+    ...session,
+    person: null,
+    b2b: null,
+    refreshAfter: null,
+  })
+}
+
 interface SessionOptions {
   filter?: boolean
 }
@@ -184,7 +238,8 @@ export const useSession = ({ filter }: SessionOptions = { filter: true }) => {
   const currentSessionStore = sessionStore.read() ?? sessionStore.readInitial()
   const resultSessionStore = useStore(sessionStore)
   const isValidating = useStore(validationStore)
-  const { isSessionReady } = useSessionReady({ isValidating })
+  const hasValidated = useStore(hasValidatedStore)
+  const { isSessionReady } = useSessionReady({ isValidating, hasValidated })
 
   let { channel, ...session } = resultSessionStore ?? currentSessionStore
 
@@ -211,12 +266,21 @@ export const useSession = ({ filter }: SessionOptions = { filter: true }) => {
  * The session ready state is persisted in sessionStorage to maintain consistency across page navigations
  * and provide faster loading times on subsequent page visits.
  *
+ * Uses `hasValidated` (a reactive store value) instead of a ref-based transition tracker to avoid
+ * a React 18 automatic batching race condition where `isValidating` goes true→false so fast that
+ * the effect never observes the `true` state, leaving `isSessionReady` stuck at false.
+ *
  * @param isValidating - Whether the session is currently being validated
+ * @param hasValidated - Whether at least one validation cycle has ever completed
  * @returns An object containing the session readiness status
  */
 export const useSessionReady = ({
   isValidating,
-}: { isValidating: boolean }) => {
+  hasValidated,
+}: {
+  isValidating: boolean
+  hasValidated: boolean
+}) => {
   // Initialize with persisted state from sessionStorage
   const [isSessionReady, setIsSessionReady] = useState(() => {
     if (typeof window === 'undefined') return false
@@ -227,44 +291,18 @@ export const useSessionReady = ({
     }
   })
 
-  // Wait for session to be stable (not validating and has consistent data)
-  const hasValidatedRef = useRef(false)
-
   useEffect(() => {
-    // Only run the effect if there has already been a change in isValidating (that is, validateSession has already been called at least once)
-    if (!hasValidatedRef.current && isValidating) {
-      hasValidatedRef.current = true
-      return
-    }
-
-    if (!hasValidatedRef.current) {
-      return
-    }
-
-    if (!isValidating) {
-      setIsSessionReady(true)
-      // Persist the ready state in sessionStorage
-      try {
-        sessionStorage.setItem(SESSION_READY_KEY, 'true')
-      } catch {
-        // Ignore storage errors
-      }
-      return
-    }
+    // Only mark ready once at least one full validation cycle has completed
+    // and validation is not currently in flight.
+    if (isValidating || !hasValidated) return
 
-    // Only set to false if we don't have a persisted ready state
-    if (typeof window !== 'undefined') {
-      try {
-        const persistedReady =
-          sessionStorage.getItem(SESSION_READY_KEY) === 'true'
-        if (!persistedReady) {
-          setIsSessionReady(false)
-        }
-      } catch {
-        setIsSessionReady(false)
-      }
+    setIsSessionReady(true)
+    try {
+      sessionStorage.setItem(SESSION_READY_KEY, 'true')
+    } catch {
+      // Ignore storage errors
     }
-  }, [isValidating])
+  }, [isValidating, hasValidated])
 
   return { isSessionReady }
 }

package/src/sdk/session/storageKeys.ts

@@ -0,0 +1,2 @@
+export const RELOAD_AFTER_LOGOUT_KEY = 'faststore_reload_after_logout_return'
+export const SESSION_READY_KEY = 'faststore_session_ready'

package/src/sdk/useStore.ts

@@ -9,6 +9,7 @@ type CB<T> = (val: T) => Promise<T | null>
 
 export const createValidationStore = <T>(cb: CB<T>) => {
   const store = createBaseStore(false)
+  const hasValidatedStore = createBaseStore(false)
 
   const onValidate = async (val: T) => {
     try {
@@ -17,8 +18,13 @@ export const createValidationStore = <T>(cb: CB<T>) => {
       return await cb(val)
     } finally {
       store.set(false)
+      hasValidatedStore.set(true)
     }
   }
 
-  return [store, onValidate] as [Store<boolean>, CB<T>]
+  return [store, onValidate, hasValidatedStore] as [
+    Store<boolean>,
+    CB<T>,
+    Store<boolean>,
+  ]
 }