Return 404 when current locale isn't allowed (it's already the defaul…

…t behavior in production, but not in dev nor preview)
UnlyEd · May 28, 2021 · e715d46 · e715d46
1 parent a48b7f6
commit e715d46
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 0 deletions.
diff --git a/src/layouts/core/coreLayoutSSG.ts b/src/layouts/core/coreLayoutSSG.ts
@@ -31,6 +31,7 @@ import {
   ApolloQueryResult,
   NormalizedCacheObject,
 } from '@apollo/client';
+import includes from 'lodash.includes';
 import map from 'lodash.map';
 import {
   GetStaticPaths,
@@ -149,6 +150,15 @@ export const getCoreStaticProps: GetStaticProps<SSGPageProps, CommonServerSidePa
     customer,
   };
 
+  // Do not serve pages using locales the customer doesn't have enabled (useful during preview mode and in development env)
+  if (!includes(customer?.availableLanguages, locale)) {
+    logger.warn(`Locale "${locale}" not enabled for this customer (allowed: "${customer?.availableLanguages}"), returning 404 page.`);
+
+    return {
+      notFound: true,
+    };
+  }
+
   return {
     // Props returned here will be available as page properties (pageProps)
     props: {

diff --git a/src/layouts/demo/demoLayoutSSG.ts b/src/layouts/demo/demoLayoutSSG.ts
@@ -31,6 +31,7 @@ import {
   ApolloQueryResult,
   NormalizedCacheObject,
 } from '@apollo/client';
+import includes from 'lodash.includes';
 import map from 'lodash.map';
 import {
   GetStaticPaths,
@@ -149,6 +150,15 @@ export const getDemoStaticProps: GetStaticProps<SSGPageProps, CommonServerSidePa
     customer,
   };
 
+  // Do not serve pages using locales the customer doesn't have enabled (useful during preview mode and in development env)
+  if (!includes(customer?.availableLanguages, locale)) {
+    logger.warn(`Locale "${locale}" not enabled for this customer (allowed: "${customer?.availableLanguages}"), returning 404 page.`);
+
+    return {
+      notFound: true,
+    };
+  }
+
   return {
     // Props returned here will be available as page properties (pageProps)
     props: {