@faststore/core 3.90.1 → 3.91.1

package/.turbo/turbo-build.log

@@ -1,23 +1,23 @@
 
-> @faststore/core@3.90.0 prebuild /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.91.0 prebuild /home/runner/work/faststore/faststore/packages/core
 > na run partytown && na run generate
 
 
-> @faststore/core@3.90.0 partytown /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.91.0 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.90.0 generate /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.91.0 generate /home/runner/work/faststore/faststore/packages/core
 > na run generate:schema && na run generate:codegen && na run format:generated
 
 
-> @faststore/core@3.90.0 generate:schema /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.91.0 generate:schema /home/runner/work/faststore/faststore/packages/core
 > tsx src/server/generator/generateGraphQLSchemaFile.ts
 
 Schema GraphQL file generated successfully
 
-> @faststore/core@3.90.0 generate:codegen /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.91.0 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.90.0 format:generated /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.91.0 format:generated /home/runner/work/faststore/faststore/packages/core
 > prettier --write "@generated/**/*.{ts,js,tsx,jsx,json}" --loglevel error
 
 
-> @faststore/core@3.90.0 build /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.91.0 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
@@ -73,33 +73,33 @@ Warning: Dynamic Content not found for the page: home. Refer to the Dynamic Cont
    Collecting build traces ...
 
 Route (pages)                              Size     First Load JS
-┌ ● /                                      7.48 kB         146 kB
+┌ ● /                                      7.36 kB         146 kB
 ├   └ css/c29fee5b9f9d48d9.css             3.07 kB
-├   /_app                                  0 B             107 kB
+├   /_app                                  0 B             108 kB
 ├ ● /[...slug]                             2.49 kB         156 kB
-├ ● /[slug]/p                              97.6 kB         236 kB
+├ ● /[slug]/p                              97.5 kB         236 kB
 ├   └ css/a9328b56f3942b82.css             22 kB
 ├ ○ /404                                   1.57 kB         140 kB
 ├ ● /500                                   1.57 kB         140 kB
-├ λ /api/graphql                           0 B             107 kB
-├ λ /api/health/live                       0 B             107 kB
-├ λ /api/health/ready                      0 B             107 kB
-├ λ /api/preview                           0 B             107 kB
+├ λ /api/graphql                           0 B             108 kB
+├ λ /api/health/live                       0 B             108 kB
+├ λ /api/health/ready                      0 B             108 kB
+├ λ /api/preview                           0 B             108 kB
 ├ ● /checkout                              749 B           139 kB
 ├ ● /login                                 1.7 kB          140 kB
 ├ λ /pvt/account                           247 B           108 kB
 ├ ● /pvt/account/[...unknown]              287 B           108 kB
-├ λ /pvt/account/403                       2.49 kB         141 kB
+├ λ /pvt/account/403                       2.98 kB         142 kB
 ├   └ css/c53b17b6fa994508.css             4.66 kB
-├ λ /pvt/account/404                       2.18 kB         140 kB
+├ λ /pvt/account/404                       2.18 kB         141 kB
 ├   └ css/ceb410a7062740d1.css             4.72 kB
 ├ λ /pvt/account/orders                    10.6 kB         149 kB
 ├   └ css/244373752cfc52c7.css             13.9 kB
-├ λ /pvt/account/orders/[id]               12.1 kB         150 kB
+├ λ /pvt/account/orders/[id]               12 kB           151 kB
 ├   └ css/da5bfb1f39c54578.css             13.3 kB
-├ λ /pvt/account/profile                   1.98 kB         140 kB
+├ λ /pvt/account/profile                   1.98 kB         141 kB
 ├   └ css/b65e005fb943434c.css             4.4 kB
-├ λ /pvt/account/security                  3.96 kB         142 kB
+├ λ /pvt/account/security                  3.96 kB         143 kB
 ├   └ css/6bb0abee27fe0019.css             5.65 kB
 ├ λ /pvt/account/user-details              1.91 kB         140 kB
 ├   └ css/bd121d85d6ceed46.css             4.52 kB
@@ -107,8 +107,8 @@ Route (pages)                              Size     First Load JS
 + First Load JS shared by all              111 kB
   ├ chunks/framework-d514426edf885c68.js   45.4 kB
   ├ chunks/main-595f5e3b626b9fff.js        33.2 kB
-  ├ chunks/pages/_app-494fa821daae1608.js  25 kB
-  ├ chunks/webpack-7a160aaa24e51946.js     3.84 kB
+  ├ chunks/pages/_app-a0274d6a8f914190.js  25.2 kB
+  ├ chunks/webpack-bce37557948d4c09.js     3.84 kB
   └ css/24a5e8f6808266fe.css               3.53 kB
 
 λ  (Server)  server-side renders at runtime (uses getInitialProps or getServerSideProps)

package/.turbo/turbo-test.log

@@ -1,14 +1,14 @@
 
-> @faststore/core@3.90.0 test /home/runner/work/faststore/faststore/packages/core
+> @faststore/core@3.91.0 test /home/runner/work/faststore/faststore/packages/core
 > jest
 
-PASS test/server/cms/global.test.ts (27.025 s)
-PASS test/utils/multipleTemplates.test.ts (27.238 s)
+PASS test/utils/multipleTemplates.test.ts (28.701 s)
+PASS test/server/cms/global.test.ts (28.869 s)
 PASS test/server/cms/index.test.ts
-PASS test/server/index.test.ts (30.022 s)
+PASS test/server/index.test.ts (32.67 s)
 
 Test Suites: 4 passed, 4 total
 Tests:       22 passed, 22 total
 Snapshots:   0 total
-Time:        31.191 s
+Time:        34.049 s
 Ran all test suites.

package/@generated/schema.graphql

@@ -5,6 +5,8 @@ schema {
 
 directive @cacheControl(sMaxAge: Int, staleWhileRevalidate: Int, scope: String) on FIELD_DEFINITION
 
+directive @auth on FIELD_DEFINITION
+
 """Address information."""
 type Address {
   """Address postal code"""
@@ -948,12 +950,12 @@ type Query {
   product(
     """An array of selected search facets."""
     locator: [IStoreSelectedFacet!]!
-  ): StoreProduct! @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  ): StoreProduct! @cacheControl(scope: "public", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns the details of a collection based on the collection slug."""
   collection(
     """Collection slug."""
     slug: String!
-  ): StoreCollection! @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  ): StoreCollection! @cacheControl(scope: "public", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns the result of a product, facet, or suggestion search."""
   search(
     """Search pagination argument, indicating how many results should be returned from the complete result list."""
@@ -968,23 +970,23 @@ type Query {
     selectedFacets: [IStoreSelectedFacet!]
     """Search advertisement products return in result."""
     sponsoredCount: Int
-  ): StoreSearchResult! @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  ): StoreSearchResult! @cacheControl(scope: "public", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns information about all products."""
   allProducts(
     """Product pagination argument, indicating how many items should be returned from the complete result list."""
     first: Int!
     """Product pagination argument, indicating the cursor corresponding with the item after which the items should be fetched."""
     after: String
-  ): StoreProductConnection! @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  ): StoreProductConnection! @cacheControl(scope: "public", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns information about selected products."""
-  products(productIds: [String!]!): [StoreProduct!]! @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  products(productIds: [String!]!): [StoreProduct!]! @cacheControl(scope: "public", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns information about all collections."""
   allCollections(
     """Collection pagination argument, indicating how many items should be returned from the complete result list."""
     first: Int!
     """Collection pagination argument, indicating the cursor corresponding with the item after which the items should be fetched."""
     after: String
-  ): StoreCollectionConnection! @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  ): StoreCollectionConnection! @cacheControl(scope: "public", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns information about shipping simulation."""
   shipping(
     """List of SKU products"""
@@ -993,7 +995,7 @@ type Query {
     postalCode: String!
     """Country of postal code"""
     country: String!
-  ): ShippingData @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  ): ShippingData @cacheControl(scope: "public", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns if there's a redirect for a search."""
   redirect(
     """Search term."""
@@ -1011,22 +1013,22 @@ type Query {
     country: String!
     """Sales channel of the navigation"""
     salesChannel: String
-  ): SellersData @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  ): SellersData @cacheControl(scope: "public", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns information about the profile."""
   profile(
     """Identifier for user."""
     id: String!
-  ): Profile @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  ): Profile @cacheControl(scope: "public", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns the total product count information based on a specific location accessible through the VTEX segment cookie."""
   productCount(
     """Search term."""
     term: String
-  ): ProductCountResult @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  ): ProductCountResult @cacheControl(scope: "public", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns information about the Details of an User Order."""
   userOrder(
     """Identifier for the order."""
     orderId: String!
-  ): UserOrderResult @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  ): UserOrderResult @auth @cacheControl(scope: "private", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns information about the list of Orders that the User can view."""
   listUserOrders(
     """Page number of the list of orders."""
@@ -1043,18 +1045,18 @@ type Query {
     text: String
     """Client email used to filter of the list of orders."""
     clientEmail: String
-  ): UserOrderListMinimalResult @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  ): UserOrderListMinimalResult @auth @cacheControl(scope: "private", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns information about the current user details."""
-  userDetails: StoreUserDetails! @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  userDetails: StoreUserDetails! @auth @cacheControl(scope: "private", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns the account profile information for the current authenticated user (b2b or b2c user)."""
-  accountProfile: StoreAccountProfile! @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  accountProfile: StoreAccountProfile! @auth @cacheControl(scope: "private", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns information about the user validation."""
-  validateUser: ValidateUserData @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  validateUser: ValidateUserData @auth @cacheControl(scope: "private", sMaxAge: 300, staleWhileRevalidate: 3600)
   """Returns a list of pickup points near to the given geo coordinates."""
   pickupPoints(
     """Geo coordinates input."""
     geoCoordinates: IStoreGeoCoordinates
-  ): PickupPoints @cacheControl(scope: "public", sMaxAge: 120, staleWhileRevalidate: 3600)
+  ): PickupPoints @cacheControl(scope: "public", sMaxAge: 300, staleWhileRevalidate: 3600)
 }
 
 type ValidateUserData {

package/CHANGELOG.md

@@ -3,6 +3,18 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [3.91.1](https://github.com/vtex/faststore/compare/v3.91.0...v3.91.1) (2025-10-24)
+
+### Bug Fixes
+
+- signin button flickering - SFS-2862 ([#3078](https://github.com/vtex/faststore/issues/3078)) ([edd4ac0](https://github.com/vtex/faststore/commit/edd4ac084817467e6dcedc6cd5fe89923b0f55e3))
+
+# [3.91.0](https://github.com/vtex/faststore/compare/v3.90.1...v3.91.0) (2025-10-24)
+
+### Features
+
+- user validation improvements + refresh token SSR and api - SFS-2909 ([#3065](https://github.com/vtex/faststore/issues/3065)) ([97071ee](https://github.com/vtex/faststore/commit/97071ee21fcee0b038dfafa06633ef597136898e))
+
 ## [3.90.1](https://github.com/vtex/faststore/compare/v3.90.0...v3.90.1) (2025-10-20)
 
 ### Bug Fixes

package/discovery.config.default.js

@@ -149,7 +149,7 @@ module.exports = {
     enableVtexAssetsLoader: false,
     graphqlCacheControl: {
       maxAge: 0, // 0 disables cache, 5 * 60 enable cache control maxAge 5 minutes
-      staleWhileRevalidate: 60,
+      staleWhileRevalidate: 60 * 60, // 1 hour
     },
     refreshToken: false,
   },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faststore/core",
-  "version": "3.90.1",
+  "version": "3.91.1",
   "license": "MIT",
   "repository": "vtex/faststore",
   "browserslist": "supports es6-module and not dead",
@@ -44,10 +44,10 @@
     "@envelop/graphql-jit": "^8.0.3",
     "@envelop/parser-cache": "^6.0.2",
     "@envelop/validation-cache": "^6.0.2",
-    "@faststore/api": "^3.90.0",
+    "@faststore/api": "^3.91.0",
     "@faststore/graphql-utils": "^3.89.2",
     "@faststore/lighthouse": "^3.89.2",
-    "@faststore/sdk": "^3.90.0",
+    "@faststore/sdk": "^3.91.1",
     "@faststore/ui": "^3.89.2",
     "@graphql-codegen/cli": "5.0.2",
     "@graphql-codegen/client-preset": "4.2.6",
@@ -116,5 +116,5 @@
     "ts-jest": "29.1.1",
     "typescript": "5.3.2"
   },
-  "gitHead": "63c402037eecf654247a393ce446167169466558"
+  "gitHead": "118484d3785eb470f0dbac737843f3cfc340f32a"
 }

package/src/components/navigation/Navbar/Navbar.tsx

@@ -1,14 +1,15 @@
-import { useCallback, useRef, useState } from 'react'
 import dynamic from 'next/dynamic'
+import { useCallback, useRef, useState } from 'react'
 
 import { Icon as UIIcon, useScrollDirection, useUI } from '@faststore/ui'
 
+import { Skeleton as UISkeleton } from '@faststore/ui'
+import { OrganizationSignInButton } from 'src/components/account/MyAccountDrawer/OrganizationSignInButton'
+import CartToggle from 'src/components/cart/CartToggle'
 import type { SearchInputRef } from 'src/components/search/SearchInput'
 import SearchInput from 'src/components/search/SearchInput'
-import CartToggle from 'src/components/cart/CartToggle'
 import Link from 'src/components/ui/Link'
 import Logo from 'src/components/ui/Logo'
-import { OrganizationSignInButton } from 'src/components/account/MyAccountDrawer/OrganizationSignInButton'
 import { useOverrideComponents } from 'src/sdk/overrides/OverrideContext'
 import { useSession } from 'src/sdk/session'
 import useScreenResize from 'src/sdk/ui/useScreenResize'
@@ -99,8 +100,8 @@ function Navbar({
   } = useOverrideComponents<'Navbar'>()
   const scrollDirection = useScrollDirection()
   const { openNavbar, navbar: displayNavbar } = useUI()
-  const { isDesktop, isMobile } = useScreenResize()
-  const { b2b } = useSession()
+  const { isDesktop } = useScreenResize()
+  const { b2b, isSessionReady } = useSession()
 
   const searchMobileRef = useRef<SearchInputRef>(null)
   const [searchExpanded, setSearchExpanded] = useState(false)
@@ -185,14 +186,21 @@ function Navbar({
                 aria-hidden={!searchExpanded}
               />
             )}
-            {!isMobile &&
-              (isOrganizationEnabled ? (
-                <OrganizationSignInButton
-                  icon={signInButton.icon}
-                  isRepresentative={isRepresentative}
-                />
+            {isDesktop &&
+              (isSessionReady ? (
+                isOrganizationEnabled ? (
+                  <OrganizationSignInButton
+                    icon={signInButton.icon}
+                    isRepresentative={isRepresentative}
+                  />
+                ) : (
+                  <ButtonSignIn.Component {...signInButton} />
+                )
               ) : (
-                <ButtonSignIn.Component {...signInButton} />
+                <UISkeleton
+                  data-fs-navbar-signin-skeleton
+                  size={{ width: '140px', height: '2.5rem' }}
+                />
               ))}
 
             <CartToggle {...cart} />

package/src/components/navigation/NavbarSlider/NavbarSlider.tsx

@@ -1,4 +1,4 @@
-import { useFadeEffect, useUI } from '@faststore/ui'
+import { Skeleton as UISkeleton, useFadeEffect, useUI } from '@faststore/ui'
 import { Suspense } from 'react'
 
 import storeConfig from 'discovery.config'
@@ -39,7 +39,7 @@ function NavbarSlider({
 
   const { closeNavbar } = useUI()
   const { fade, fadeOut } = useFadeEffect()
-  const { b2b } = useSession()
+  const { b2b, isSessionReady } = useSession()
 
   const isFaststoreMyAccountEnabled =
     storeConfig.experimental?.enableFaststoreMyAccount
@@ -76,13 +76,20 @@ function NavbarSlider({
       </NavbarSliderContent.Component>
       <NavbarSliderFooter.Component {...NavbarSliderFooter.props}>
         <Suspense fallback={<ButtonSignInFallback />}>
-          {isOrganizationEnabled ? (
-            <OrganizationSignInButton
-              icon={signInButton.icon}
-              isRepresentative={isRepresentative}
-            />
+          {isSessionReady ? (
+            isOrganizationEnabled ? (
+              <OrganizationSignInButton
+                icon={signInButton.icon}
+                isRepresentative={isRepresentative}
+              />
+            ) : (
+              <ButtonSignIn.Component {...signInButton} />
+            )
           ) : (
-            <ButtonSignIn.Component {...signInButton} />
+            <UISkeleton
+              data-fs-navbar-slider-signin-skeleton
+              size={{ width: '140px', height: '2.5rem' }}
+            />
           )}
         </Suspense>
       </NavbarSliderFooter.Component>

package/src/experimental/{myAccountSeverSideProps.ts → myAccountServerSideProps.ts}

@@ -37,9 +37,10 @@ export const getServerSideProps: GetServerSideProps<
   Record<string, string>,
   Locator
 > = async (context) => {
-  const isValid = await validateUser(context)
+  const validationResult = await validateUser(context)
 
-  if (!isValid) {
+  // Guard clause: Early redirect to login if user is invalid and doesn't need refresh
+  if (!validationResult.isValid && !validationResult.needsRefresh) {
     return {
       redirect: {
         destination: '/login',
@@ -48,10 +49,16 @@ export const getServerSideProps: GetServerSideProps<
     }
   }
 
-  const isRepresentative = getIsRepresentative({
-    headers: context.req.headers as Record<string, string>,
-    account: storeConfig.api.storeId,
-  })
+  // Handle refresh token case with minimal props
+  if (!validationResult.isValid && validationResult.needsRefresh) {
+    const currentPath = context.req.url || '/pvt/account'
+    return {
+      redirect: {
+        destination: `/pvt/account/403?from=${encodeURIComponent(currentPath)}`,
+        permanent: false,
+      },
+    }
+  }
 
   const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
     query: context.query,
@@ -61,6 +68,11 @@ export const getServerSideProps: GetServerSideProps<
     return { redirect }
   }
 
+  const isRepresentative = getIsRepresentative({
+    headers: context.req.headers as Record<string, string>,
+    account: storeConfig.api.storeId,
+  })
+
   const [
     globalSectionsPromise,
     globalSectionsHeaderPromise,

package/src/pages/api/graphql.ts

@@ -10,7 +10,8 @@ import discoveryConfig from 'discovery.config'
 import { getJWTAutCookie, isExpired } from 'src/utils/getCookie'
 import { execute } from '../../server'
 
-const ONE_MINUTE = 60
+const DEFAULT_MAX_AGE = 5 * 60 // 5 minutes
+const DEFAULT_STALE_WHILE_REVALIDATE = 60 * 60 // 1 hour
 
 /**
  * This function replaces the setCookie domain so that we can use localhost in dev environment.
@@ -144,26 +145,34 @@ const handler: NextApiHandler = async (request, response) => {
       return
     }
 
-    const cacheControl =
-      !hasErrors && extensions.cacheControl
-        ? stringifyCacheControl(extensions.cacheControl)
-        : 'no-cache, no-store'
-
-    if (
+    if (extensions.cacheControl) {
+      const cacheControl = stringifyCacheControl(extensions.cacheControl)
+      response.setHeader('cache-control', cacheControl)
+    } else if (
       request.method === 'GET' &&
-      discoveryConfig?.experimental?.graphqlCacheControl?.maxAge
+      operation.__meta__.operationName?.toLowerCase()?.endsWith('query')
     ) {
-      const maxAge = discoveryConfig.experimental.graphqlCacheControl.maxAge
+      const maxAge =
+        discoveryConfig?.experimental?.graphqlCacheControl?.maxAge &&
+        discoveryConfig?.experimental?.graphqlCacheControl?.maxAge > 0
+          ? discoveryConfig.experimental.graphqlCacheControl.maxAge
+          : DEFAULT_MAX_AGE // 5 minutes
+
       const staleWhileRevalidate =
         discoveryConfig?.experimental?.graphqlCacheControl
-          ?.staleWhileRevalidate ?? ONE_MINUTE
+          ?.staleWhileRevalidate &&
+        discoveryConfig?.experimental?.graphqlCacheControl
+          ?.staleWhileRevalidate > 0
+          ? discoveryConfig.experimental.graphqlCacheControl
+              .staleWhileRevalidate
+          : DEFAULT_STALE_WHILE_REVALIDATE // 1 hour
 
       response.setHeader(
         'cache-control',
         `public, s-maxage=${maxAge}, stale-while-revalidate=${staleWhileRevalidate}`
       )
     } else {
-      response.setHeader('cache-control', cacheControl)
+      response.setHeader('cache-control', 'no-cache, no-store')
     }
 
     const setCookieValues = Array.from(extensions.cookies.values())

package/src/pages/pvt/account/403.tsx

@@ -19,13 +19,14 @@ import RenderSections from 'src/components/cms/RenderSections'
 import { OverriddenDefaultEmptyState as EmptyState } from 'src/components/sections/EmptyState/OverriddenDefaultEmptyState'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import PLUGINS_COMPONENTS from 'src/plugins'
-import { validateUser } from 'src/sdk/account/validateUser'
+import { useRefreshToken } from 'src/sdk/account/useRefreshToken'
 import PageProvider from 'src/sdk/overrides/PageProvider'
 import { execute } from 'src/server'
-import { type PageContentType, getPage } from 'src/server/cms'
 import { injectGlobalSections } from 'src/server/cms/global'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 
+import storeConfig from 'discovery.config'
+
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
   ...GLOBAL_COMPONENTS,
@@ -34,14 +35,31 @@ const COMPONENTS: Record<string, ComponentType<any>> = {
 }
 
 type Props = {
-  globalSections: GlobalSectionsData
-  accountName: ServerAccountPageQueryQuery['accountProfile']['name']
+  globalSections?: GlobalSectionsData
+  accountName?: ServerAccountPageQueryQuery['accountProfile']['name']
+  needsRefreshToken?: boolean
+  fromPage?: string
 }
 
-function Page({ globalSections: globalSectionsProp, accountName }: Props) {
+function Page({
+  globalSections: globalSectionsProp,
+  accountName,
+  needsRefreshToken,
+  fromPage,
+}: Props) {
   const { sections: globalSections, settings: globalSettings } =
-    globalSectionsProp ?? {}
+    globalSectionsProp ?? { sections: [], settings: {} }
+
+  // Use the new hook to handle refresh token with session management
+  const { shouldShow403 } = useRefreshToken(needsRefreshToken, fromPage)
 
+  // Handle refresh token case - show loading while attempting refresh
+  if (needsRefreshToken && !shouldShow403) {
+    console.info('Refreshing authentication...')
+    return <></>
+  }
+
+  // Show 403 page if refresh failed or if we don't need refresh token
   return (
     <PageProvider context={{ globalSettings }}>
       <RenderSections globalSections={globalSections} components={COMPONENTS}>
@@ -77,13 +95,50 @@ export const getServerSideProps: GetServerSideProps<
   Record<string, string>,
   Locator
 > = async (context) => {
-  const isValid = await validateUser(context)
+  const [
+    globalSectionsPromise,
+    globalSectionsHeaderPromise,
+    globalSectionsFooterPromise,
+  ] = getGlobalSectionsData(context.previewData)
+
+  const [account, globalSections, globalSectionsHeader, globalSectionsFooter] =
+    await Promise.all([
+      execute<
+        ServerAccountPageQueryQueryVariables,
+        ServerAccountPageQueryQuery
+      >(
+        {
+          variables: {},
+          operation: query,
+        },
+        { headers: { ...context.req.headers } }
+      ),
+      globalSectionsPromise,
+      globalSectionsHeaderPromise,
+      globalSectionsFooterPromise,
+    ])
+
+  const globalSectionsResult = injectGlobalSections({
+    globalSections,
+    globalSectionsHeader,
+    globalSectionsFooter,
+  })
+
+  if (account.errors) {
+    console.error(...account.errors)
+
+    const statusCode: number = (account.errors[0] as any)?.extensions?.status
+
+    const fromPage =
+      typeof context.query.from === 'string' ? context.query.from : ''
 
-  if (!isValid) {
     return {
-      redirect: {
-        destination: '/login',
-        permanent: false,
+      props: {
+        globalSections: globalSectionsResult,
+        needsRefreshToken:
+          (statusCode === 401 || statusCode === 403) &&
+          storeConfig.experimental?.refreshToken,
+        fromPage,
       },
     }
   }
@@ -96,47 +151,11 @@ export const getServerSideProps: GetServerSideProps<
     return { redirect }
   }
 
-  const [
-    globalSectionsPromise,
-    globalSectionsHeaderPromise,
-    globalSectionsFooterPromise,
-  ] = getGlobalSectionsData(context.previewData)
-
-  const [
-    page,
-    account,
-    globalSections,
-    globalSectionsHeader,
-    globalSectionsFooter,
-  ] = await Promise.all([
-    getPage<PageContentType>({
-      ...(context.previewData?.contentType === '403' && context.previewData),
-      contentType: '403',
-    }),
-    execute<ServerAccountPageQueryQueryVariables, ServerAccountPageQueryQuery>(
-      {
-        variables: {},
-        operation: query,
-      },
-      { headers: { ...context.req.headers } }
-    ),
-    globalSectionsPromise,
-    globalSectionsHeaderPromise,
-    globalSectionsFooterPromise,
-  ])
-
-  const globalSectionsResult = injectGlobalSections({
-    globalSections,
-    globalSectionsHeader,
-    globalSectionsFooter,
-  })
-
   return {
     props: {
       // The sections from the CMS page are not utilized here for the My Account page.
-      // page,
       globalSections: globalSectionsResult,
-      accountName: account.data.accountProfile.name,
+      accountName: account?.data?.accountProfile?.name ?? '',
     },
   }
 }