@faststore/core 3.99.1 → 4.0.0-dev.4

package/src/pages/500.tsx

@@ -8,7 +8,6 @@ import {
 
 import { default as GLOBAL_COMPONENTS } from 'src/components/cms/global/Components'
 import RenderSections from 'src/components/cms/RenderSections'
-import { getComponentKey } from 'src/utils/cms'
 import { OverriddenDefaultEmptyState as EmptyState } from 'src/components/sections/EmptyState/OverriddenDefaultEmptyState'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import PLUGINS_COMPONENTS from 'src/plugins'
@@ -17,6 +16,7 @@ import type { PageContentType } from 'src/server/cms'
 import { injectGlobalSections } from 'src/server/cms/global'
 import { contentService } from 'src/server/content/service'
 import type { PreviewData } from 'src/server/content/types'
+import { getComponentKey } from 'src/utils/cms'
 
 /* A list of components that can be used in the CMS. */
 const COMPONENTS: Record<string, ComponentType<any>> = {
@@ -68,18 +68,19 @@ export const getStaticProps: GetStaticProps<
   Props,
   Record<string, string>,
   PreviewData
-> = async ({ previewData }) => {
+> = async ({ previewData, locale }) => {
+  const contentContext = { previewData, locale }
   const [
     globalSectionsPromise,
     globalSectionsHeaderPromise,
     globalSectionsFooterPromise,
-  ] = getGlobalSectionsData(previewData)
+  ] = getGlobalSectionsData(contentContext)
 
   const [page, globalSections, globalSectionsHeader, globalSectionsFooter] =
     await Promise.all([
       contentService.getSingleContent<PageContentType>({
+        ...contentContext,
         contentType: '500',
-        previewData,
       }),
       globalSectionsPromise,
       globalSectionsHeaderPromise,

package/src/pages/[...slug].tsx

@@ -114,17 +114,18 @@ export const getStaticProps: GetStaticProps<
   Props,
   { slug: string[] },
   PreviewData
-> = async ({ params, previewData }) => {
+> = async ({ params, previewData, locale }) => {
   const slug = params?.slug.join('/') ?? ''
   const rewrites = (await storeConfig.rewrites?.()) ?? []
+  const contentContext = { previewData, locale }
 
   const [
     globalSectionsPromise,
     globalSectionsHeaderPromise,
     globalSectionsFooterPromise,
-  ] = getGlobalSectionsData(previewData)
+  ] = getGlobalSectionsData(contentContext)
 
-  const landingPagePromise = getLandingPageBySlug(slug, previewData)
+  const landingPagePromise = getLandingPageBySlug(slug, contentContext)
 
   const landingPage = await landingPagePromise
 
@@ -174,8 +175,9 @@ export const getStaticProps: GetStaticProps<
     }),
     contentService.getPlpContent(
       {
-        previewData,
+        ...contentContext,
         slug,
+        locale,
       },
       rewrites
     ),
@@ -191,6 +193,7 @@ export const getStaticProps: GetStaticProps<
         ?.sortBySelection as SearchState['sort'],
       term: '',
       selectedFacets: data?.collection?.meta.selectedFacets,
+      locale,
     })
 
   const notFound = errors.find(isNotFoundError)

package/src/pages/[slug]/p.tsx

@@ -27,12 +27,14 @@ import { getRedirect } from 'src/sdk/redirects'
 import { useSession } from 'src/sdk/session'
 import { execute } from 'src/server'
 import { getComponentKey } from 'src/utils/cms'
+import { getChannelForLocale } from 'src/utils/localization/bindingPaths'
 
 import storeConfig from 'discovery.config'
 import {
   getGlobalSectionsData,
   type GlobalSectionsData,
 } from 'src/components/cms/GlobalSections'
+import { getStoreURL } from 'src/sdk/localization/useLocalizationConfig'
 import { getOfferUrl, useOffer } from 'src/sdk/offer'
 import PageProvider, { type PDPContext } from 'src/sdk/overrides/PageProvider'
 import { useProductQuery } from 'src/sdk/product/useProductQuery'
@@ -101,7 +103,10 @@ function Page({
 
   // SEO data
   const title = meta?.title ?? storeSeo.title
-  const titleTemplate = pdpSeo.titleTemplate ?? storeSeo?.titleTemplate
+  const titleTemplate =
+    settings?.seo?.titleTemplate ??
+    pdpSeo?.titleTemplate ??
+    storeSeo.titleTemplate
   const description =
     meta?.description ||
     pdpSeo.descriptionTemplate.replace(/%s/g, () => title) ||
@@ -122,7 +127,7 @@ function Page({
   if (itemListElements.length !== 0) {
     itemListElements = itemListElements.map(
       ({ item: pathname, name, position }) => {
-        const pageUrl = storeConfig.storeUrl + pathname
+        const pageUrl = getStoreURL() + pathname
 
         return { name, position, item: pageUrl }
       }
@@ -197,7 +202,12 @@ function Page({
         ]}
         titleTemplate={titleTemplate}
       />
-      <BreadcrumbJsonLd itemListElements={itemListElements} />
+
+      {/* TODO: when localized slugs are available remove this workaround */}
+      {!storeConfig.localization?.enabled && (
+        <BreadcrumbJsonLd itemListElements={itemListElements} />
+      )}
+
       <ProductJsonLd
         id={`${meta.canonical}${settings?.seo?.id ?? ''}`}
         mainEntityOfPage={`${meta.canonical}${
@@ -305,14 +315,15 @@ export const getStaticProps: GetStaticProps<
   Props,
   { slug: string },
   PreviewData
-> = async ({ params, previewData }) => {
+> = async ({ params, previewData, locale }) => {
   const slug = params?.slug ?? ''
+  const contentContext = { previewData, locale }
 
   const [
     globalSectionsPromise,
     globalSectionsHeaderPromise,
     globalSectionsFooterPromise,
-  ] = getGlobalSectionsData(previewData)
+  ] = getGlobalSectionsData(contentContext)
 
   const [
     searchResult,
@@ -321,7 +332,13 @@ export const getStaticProps: GetStaticProps<
     globalSectionsFooter,
   ] = await Promise.all([
     execute<ServerProductQueryQueryVariables, ServerProductQueryQuery>({
-      variables: { locator: [{ key: 'slug', value: slug }] },
+      variables: {
+        locator: [
+          { key: 'slug', value: slug },
+          { key: 'channel', value: getChannelForLocale(locale) },
+          { key: 'locale', value: locale },
+        ],
+      },
       operation: query,
     }),
     globalSectionsPromise,
@@ -357,15 +374,16 @@ export const getStaticProps: GetStaticProps<
   const cmsPage: PDPContentType = await contentService.getPdpContent(
     data.product,
     {
-      previewData,
+      ...contentContext,
       slug,
+      locale,
     }
   )
 
   const { seo } = data.product
   const title = seo.title
   const description = seo.description
-  const canonical = `${storeConfig.storeUrl}${seo.canonical}`
+  const canonical = `${getStoreURL()}${seo.canonical}`
 
   const meta = { title, description, canonical }
 

package/src/pages/_app.tsx

@@ -15,13 +15,20 @@ import ErrorBoundary from 'src/sdk/error/ErrorBoundary'
 import useGeolocation from 'src/sdk/geolocation/useGeolocation'
 import useScrollRestoration from 'src/sdk/ui/useScrollRestoration'
 
-import SEO from 'next-seo.config'
 import storeConfig from 'discovery.config'
+import SEO from 'next-seo.config'
 
 // FastStore UI's base styles
 import '../styles/main.scss'
 
 import { ITEMS_PER_PAGE } from 'src/constants'
+import { useLocalizationConfig } from 'src/sdk/localization/useLocalizationConfig'
+
+function LocalizationConfigUpdater() {
+  // Update session with localization config
+  useLocalizationConfig()
+  return null
+}
 
 function App({ Component, pageProps }: AppProps) {
   useGeolocation()
@@ -35,6 +42,7 @@ function App({ Component, pageProps }: AppProps) {
 
   return (
     <ErrorBoundary>
+      {storeConfig.localization?.enabled && <LocalizationConfigUpdater />}
       <Head> {!process.env.DISABLE_3P_SCRIPTS && <ThirdPartyScripts />}</Head>
       <DefaultSeo {...SEO} />
 

package/src/pages/api/fs/logout.ts

@@ -7,6 +7,7 @@ import {
   getCookieDomains,
   getVtexCookieNames,
 } from 'src/utils/clearCookies'
+import { getRequestHostname } from 'src/utils/getRequestHostname'
 
 const ADDITIONAL_COOKIES = ['CheckoutOrderFormOwnership'] as const
 
@@ -24,9 +25,9 @@ const handler: NextApiHandler = async (
   }
 
   try {
-    const hostname = request.headers.host?.split(':')[0] ?? ''
+    const hostname = getRequestHostname(request.headers.host)
     const cookies = parse(request.headers.cookie ?? '')
-    const domains = getCookieDomains(hostname)
+    const domains = hostname ? getCookieDomains(hostname) : [undefined]
     const clearedCookies: string[] = []
 
     const vtexCookieNames = getVtexCookieNames(Object.keys(cookies))

package/src/pages/api/graphql.ts

@@ -9,6 +9,7 @@ import type { NextApiHandler, NextApiRequest } from 'next'
 
 import discoveryConfig from 'discovery.config'
 import { getJWTAutCookie } from 'src/utils/getCookie'
+import { getRequestHostname } from 'src/utils/getRequestHostname'
 import { shouldForceRefreshTokenForValidateSession } from 'src/utils/validateSessionRefreshToken'
 import { execute } from '../../server'
 
@@ -19,26 +20,6 @@ const ALLOWED_HOST_SUFFIXES = ['localhost', '.vtex.app', '.localhost']
 // Example: "Set-Cookie: key=value; Domain=example.com; Path=/"
 const MATCH_DOMAIN_REGEXP = /(?:^|;\s*)(?:domain=)([^;]+)/i
 
-/**
- * Extracts hostname from the incoming request.
- */
-const getRequestHostname = ({
-  request,
-}: {
-  request: NextApiRequest
-}): string | null => {
-  const hostHeader = request.headers.host?.trim()
-  if (!hostHeader) {
-    return null
-  }
-
-  try {
-    return new URL(`https://${hostHeader}`).hostname
-  } catch {
-    return null
-  }
-}
-
 /**
  * Checks whether the cookie domain should be replaced by host.
  */
@@ -85,7 +66,7 @@ const normalizeSetCookieDomain = ({
     return setCookie
   }
 
-  const host = getRequestHostname({ request })
+  const host = getRequestHostname(request.headers.host)
   if (!host) {
     return setCookie
   }
@@ -209,7 +190,7 @@ const handler: NextApiHandler = async (request, response) => {
 
     if (hasErrors) {
       const error = errors.find(isFastStoreError)
-      console.error(error)
+      console.error('Graphql execution returned with error: ', error)
 
       response.status(error?.extensions.status ?? 500).end()
       return
@@ -264,7 +245,10 @@ const handler: NextApiHandler = async (request, response) => {
     response.setHeader('content-type', 'application/json')
     response.send(JSON.stringify({ data, errors }))
   } catch (err) {
-    console.error(err)
+    console.error(
+      'Something unexpected occurred querying Graphql endpoint: \n',
+      err
+    )
 
     if (err instanceof BadRequestError) {
       response.status(400).end()

package/src/pages/api/preview.ts

@@ -33,17 +33,20 @@ const pickParam = (req: NextApiRequest, parameter: string) => {
 const setPreviewAndRedirect = (
   res: NextApiResponse,
   previewData: Record<string, string>,
-  redirectPath: string
+  redirectPath: string,
+  locale?: string
 ) => {
+  const previewSessionData =
+    locale === undefined ? previewData : { ...previewData, locale }
   const options: { maxAge: number; path?: string } = {
     maxAge: 3600,
   }
 
-  if (!isBranchPreview(previewData as PreviewData)) {
+  if (!isBranchPreview(previewSessionData as PreviewData)) {
     options.path = redirectPath.split('?')[0]
   }
 
-  res.setPreviewData(previewData, options)
+  res.setPreviewData(previewSessionData, options)
   res.redirect(redirectPath)
 }
 
@@ -58,6 +61,7 @@ const handler: NextApiHandler = async (req, res) => {
     }
 
     let slug = pickParam(req, 'slug')
+    const locale = pickParam(req, 'locale')
     if (slug && !slug.startsWith('/')) {
       slug = `/${slug}`
     }
@@ -99,9 +103,13 @@ const handler: NextApiHandler = async (req, res) => {
     }
 
     // Fetch CMS to check if the provided `locator` exists
+    const contentContext = {
+      previewData: locator,
+      locale,
+    }
     const page = await contentService.getSingleContent({
+      ...contentContext,
       contentType: locator.contentType,
-      previewData: locator,
       slug,
       documentId: locator.documentId,
       versionId: locator.versionId,
@@ -121,21 +129,26 @@ const handler: NextApiHandler = async (req, res) => {
       slug &&
       ['landingPage', 'plp', 'pdp'].includes(locator.contentType)
     ) {
-      return setPreviewAndRedirect(res, locator, slug)
+      return setPreviewAndRedirect(res, locator, slug, locale)
     }
 
     // Redirect to the path from the fetched locator
     const redirects = previewRedirects as Record<string, string>
     if (redirects[locator.contentType]) {
-      return setPreviewAndRedirect(res, locator, redirects[locator.contentType])
+      return setPreviewAndRedirect(
+        res,
+        locator,
+        redirects[locator.contentType],
+        locale
+      )
     }
 
     if (locator.contentType === 'landingPage') {
       slug = (page.settings as Settings)?.seo?.slug
-      return setPreviewAndRedirect(res, locator, slug)
+      return setPreviewAndRedirect(res, locator, slug, locale)
     }
 
-    return setPreviewAndRedirect(res, locator, '/')
+    return setPreviewAndRedirect(res, locator, '/', locale)
   } catch (error) {
     if (error instanceof StatusError) {
       res.status(error.status).end(error.message)

package/src/pages/checkout.tsx

@@ -13,6 +13,7 @@ import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 
 import RenderSections from 'src/components/cms/RenderSections'
 import PageProvider from 'src/sdk/overrides/PageProvider'
+import { useLink } from 'src/sdk/ui/useLink'
 import { injectGlobalSections } from 'src/server/cms/global'
 import storeConfig from '../../discovery.config'
 
@@ -29,17 +30,25 @@ const COMPONENTS: Record<string, ComponentType<any>> = {
 function Page({ globalSections: globalSectionsProp }: Props) {
   const { sections: globalSections, settings: globalSettings } =
     globalSectionsProp ?? {}
+  const { resolveLink } = useLink()
 
   useEffect(() => {
-    window.location.href = storeConfig.checkoutUrl
-  }, [])
+    const href = resolveLink(storeConfig.checkoutUrl) ?? storeConfig.checkoutUrl
+    window.location.href = href
+  }, [resolveLink])
+
+  const globalSettingLoading = globalSettings?.loading as { label?: string }
+  const loadingLabel =
+    typeof globalSettingLoading?.label === 'string'
+      ? globalSettingLoading?.label
+      : ''
 
   return (
     <PageProvider context={{ globalSettings }}>
       <RenderSections globalSections={globalSections} components={COMPONENTS}>
         <NextSeo noindex nofollow />
 
-        <div>loading...</div>
+        <div>{loadingLabel}</div>
       </RenderSections>
     </PageProvider>
   )
@@ -49,12 +58,13 @@ export const getStaticProps: GetStaticProps<
   Props,
   Record<string, string>,
   Locator
-> = async ({ previewData }) => {
+> = async ({ previewData, locale }) => {
+  const contentContext = { previewData, locale }
   const [
     globalSectionsPromise,
     globalSectionsHeaderPromise,
     globalSectionsFooterPromise,
-  ] = getGlobalSectionsData(previewData)
+  ] = getGlobalSectionsData(contentContext)
 
   const [globalSections, globalSectionsHeader, globalSectionsFooter] =
     await Promise.all([

package/src/pages/index.tsx

@@ -9,10 +9,11 @@ import {
   getGlobalSectionsData,
 } from 'src/components/cms/GlobalSections'
 import COMPONENTS from 'src/components/cms/home/Components'
+import { getStoreURL } from 'src/sdk/localization/useLocalizationConfig'
 import PageProvider from 'src/sdk/overrides/PageProvider'
 import { injectGlobalSections } from 'src/server/cms/global'
-import { contentService } from 'src/server/content/service'
 import type { PreviewData } from 'src/server/content/types'
+import { contentService } from 'src/server/content/service'
 import { getDynamicContent } from 'src/utils/dynamicContent'
 import storeConfig from '../../discovery.config'
 
@@ -35,6 +36,10 @@ function Page({
   }
 
   const publisherId = settings?.seo?.publisherId ?? storeConfig.seo.publisherId
+  const titleTemplate =
+    settings?.seo?.titleTemplate ??
+    storeConfig.seo.titleTemplate ??
+    storeConfig.seo.title
 
   const organizationAddress = Object.entries(
     settings?.seo?.organization?.address ?? {}
@@ -48,17 +53,19 @@ function Page({
     {} as Record<string, string>
   )
 
+  const storeUrl = getStoreURL()
+
   return (
     <>
       {/* SEO */}
       <NextSeo
         title={settings?.seo?.title ?? storeConfig.seo.title}
         description={settings?.seo?.description ?? storeConfig.seo?.description}
-        titleTemplate={storeConfig.seo?.titleTemplate ?? storeConfig.seo?.title}
-        canonical={settings?.seo?.canonical ?? storeConfig.storeUrl}
+        titleTemplate={titleTemplate}
+        canonical={settings?.seo?.canonical ?? storeUrl}
         openGraph={{
           type: 'website',
-          url: storeConfig.storeUrl,
+          url: storeUrl,
           title: settings?.seo?.title ?? storeConfig.seo.title,
           description:
             settings?.seo?.description ?? storeConfig.seo.description,
@@ -67,10 +74,10 @@ function Page({
       <SiteLinksSearchBoxJsonLd
         type="WebSite"
         name={settings?.seo?.name ?? storeConfig.seo.name}
-        url={storeConfig.storeUrl}
+        url={storeUrl}
         potentialActions={[
           {
-            target: `${storeConfig.storeUrl}/s/?q`,
+            target: `${storeUrl}/s/?q`,
             queryInput: 'search_term_string',
           },
         ]}
@@ -150,12 +157,13 @@ export const getStaticProps: GetStaticProps<
   Props,
   Record<string, string>,
   PreviewData
-> = async ({ previewData }) => {
+> = async ({ previewData, locale }) => {
+  const contentContext = { previewData, locale }
   const [
     globalSectionsPromise,
     globalSectionsHeaderPromise,
     globalSectionsFooterPromise,
-  ] = getGlobalSectionsData(previewData)
+  ] = getGlobalSectionsData(contentContext)
   const serverDataPromise = getDynamicContent({ pageType: 'home' })
 
   let cmsPage = null
@@ -166,15 +174,16 @@ export const getStaticProps: GetStaticProps<
 
   const pagePromise = cmsPage
     ? contentService.getSingleContent<PageContentType>({
+        ...contentContext,
         contentType: 'home',
-        previewData,
         documentId: cmsPage.documentId,
         versionId: cmsPage.versionId,
         releaseId: cmsPage.releaseId,
+        locale,
       })
     : contentService.getSingleContent<PageContentType>({
+        ...contentContext,
         contentType: 'home',
-        previewData,
       })
 
   const [

package/src/pages/login.tsx

@@ -9,7 +9,6 @@ import {
   getGlobalSectionsData,
 } from 'src/components/cms/GlobalSections'
 import RenderSections from 'src/components/cms/RenderSections'
-import { getComponentKey } from 'src/utils/cms'
 import { OverriddenDefaultEmptyState as EmptyState } from 'src/components/sections/EmptyState/OverriddenDefaultEmptyState'
 import CUSTOM_COMPONENTS from 'src/customizations/src/components'
 import PLUGINS_COMPONENTS from 'src/plugins'
@@ -18,6 +17,7 @@ import type { PageContentType } from 'src/server/cms'
 import { injectGlobalSections } from 'src/server/cms/global'
 import { contentService } from 'src/server/content/service'
 import type { PreviewData } from 'src/server/content/types'
+import { getComponentKey } from 'src/utils/cms'
 import storeConfig from '../../discovery.config'
 
 /* A list of components that can be used in the CMS. */
@@ -80,18 +80,19 @@ export const getStaticProps: GetStaticProps<
   Props,
   Record<string, string>,
   PreviewData
-> = async ({ previewData }) => {
+> = async ({ previewData, locale }) => {
+  const contentContext = { previewData, locale }
   const [
     globalSectionsPromise,
     globalSectionsHeaderPromise,
     globalSectionsFooterPromise,
-  ] = getGlobalSectionsData(previewData)
+  ] = getGlobalSectionsData(contentContext)
 
   const [page, globalSections, globalSectionsHeader, globalSectionsFooter] =
     await Promise.all([
       contentService.getSingleContent<PageContentType>({
+        ...contentContext,
         contentType: 'login',
-        previewData,
       }),
       globalSectionsPromise,
       globalSectionsHeaderPromise,

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

@@ -23,6 +23,7 @@ import { useRefreshToken } from 'src/sdk/account/useRefreshToken'
 import PageProvider from 'src/sdk/overrides/PageProvider'
 import { execute } from 'src/server'
 import { injectGlobalSections } from 'src/server/cms/global'
+import { withLocaleValidationSSR } from 'src/utils/localization/withLocaleValidation'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 
 import storeConfig from 'discovery.config'
@@ -90,16 +91,20 @@ const query = gql(`
   }
 `)
 
-export const getServerSideProps: GetServerSideProps<
+const getServerSidePropsBase: GetServerSideProps<
   Props,
   Record<string, string>,
   Locator
 > = async (context) => {
+  const contentContext = {
+    previewData: context.previewData,
+    locale: context.locale,
+  }
   const [
     globalSectionsPromise,
     globalSectionsHeaderPromise,
     globalSectionsFooterPromise,
-  ] = getGlobalSectionsData(context.previewData)
+  ] = getGlobalSectionsData(contentContext)
 
   const [account, globalSections, globalSectionsHeader, globalSectionsFooter] =
     await Promise.all([
@@ -160,4 +165,8 @@ export const getServerSideProps: GetServerSideProps<
   }
 }
 
+export const getServerSideProps = withLocaleValidationSSR(
+  getServerSidePropsBase
+)
+
 export default Page

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

@@ -24,6 +24,7 @@ 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 { withLocaleValidationSSR } from 'src/utils/localization/withLocaleValidation'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
 
 /* A list of components that can be used in the CMS. */
@@ -71,11 +72,15 @@ const query = gql(`
   }
 `)
 
-export const getServerSideProps: GetServerSideProps<
+const getServerSidePropsBase: GetServerSideProps<
   Props,
   Record<string, string>,
   Locator
 > = async (context) => {
+  const contentContext = {
+    previewData: context.previewData,
+    locale: context.locale,
+  }
   const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
     query: context.query,
   })
@@ -88,7 +93,7 @@ export const getServerSideProps: GetServerSideProps<
     globalSectionsPromise,
     globalSectionsHeaderPromise,
     globalSectionsFooterPromise,
-  ] = getGlobalSectionsData(context.previewData)
+  ] = getGlobalSectionsData(contentContext)
 
   const [
     page,
@@ -98,7 +103,8 @@ export const getServerSideProps: GetServerSideProps<
     globalSectionsFooter,
   ] = await Promise.all([
     getPage<PageContentType>({
-      ...(context.previewData?.contentType === '404' && context.previewData),
+      ...(contentContext.previewData?.contentType === '404' &&
+        contentContext.previewData),
       contentType: '404',
     }),
     execute<ServerAccountPageQueryQueryVariables, ServerAccountPageQueryQuery>(
@@ -144,4 +150,8 @@ export const getServerSideProps: GetServerSideProps<
   }
 }
 
+export const getServerSideProps = withLocaleValidationSSR(
+  getServerSidePropsBase
+)
+
 export default Page

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

@@ -1,14 +1,12 @@
 import type { GetServerSideProps, NextPage } from 'next'
 import { getMyAccountRedirect } from 'src/utils/myAccountRedirect'
+import { withLocaleValidationSSR } from 'src/utils/localization/withLocaleValidation'
 
 const MyAccountRedirectPage: NextPage = () => {
   return null
 }
 
-export const getServerSideProps: GetServerSideProps = async ({
-  query,
-  req,
-}) => {
+const getServerSidePropsBase: GetServerSideProps = async ({ query, req }) => {
   const { isFaststoreMyAccountEnabled, redirect } = getMyAccountRedirect({
     query,
   })
@@ -25,4 +23,8 @@ export const getServerSideProps: GetServerSideProps = async ({
   }
 }
 
+export const getServerSideProps = withLocaleValidationSSR(
+  getServerSidePropsBase
+)
+
 export default MyAccountRedirectPage