fix: pass in default channels in routes

bigcommerce · Oct 21, 2024 · ecff89e · ecff89e
1 parent d1853f7
commit ecff89e
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 14 deletions.
diff --git a/core/app/admin/route.ts b/core/app/admin/route.ts
@@ -1,24 +1,20 @@
-import { useLocale } from 'next-intl';
-
-import { redirect } from '~/i18n/routing';
+import { defaultLocale, redirect } from '~/i18n/routing';
 
 const canonicalDomain: string = process.env.BIGCOMMERCE_GRAPHQL_API_DOMAIN ?? 'mybigcommerce.com';
 const BIGCOMMERCE_STORE_HASH = process.env.BIGCOMMERCE_STORE_HASH;
 const ENABLE_ADMIN_ROUTE = process.env.ENABLE_ADMIN_ROUTE;
 
 export const GET = () => {
-  const locale = useLocale();
-
   // This route should not work unless explicitly enabled
   if (ENABLE_ADMIN_ROUTE !== 'true') {
-    return redirect({ href: '/', locale });
+    return redirect({ href: '/', locale: defaultLocale });
   }
 
   return redirect({
     href: BIGCOMMERCE_STORE_HASH
       ? `https://store-${BIGCOMMERCE_STORE_HASH}.${canonicalDomain}/admin`
       : 'https://login.bigcommerce.com',
-    locale,
+    locale: defaultLocale,
   });
 };
 

diff --git a/core/app/sitemap.xml/route.ts b/core/app/sitemap.xml/route.ts
@@ -3,10 +3,12 @@
  * Proxy to the existing BigCommerce sitemap index on the canonical URL
  */
 
+import { getChannelIdFromLocale } from '~/channels.config';
 import { client } from '~/client';
+import { defaultLocale } from '~/i18n/routing';
 
 export const GET = async () => {
-  const sitemapIndex = await client.fetchSitemapIndex();
+  const sitemapIndex = await client.fetchSitemapIndex(getChannelIdFromLocale(defaultLocale));
 
   return new Response(sitemapIndex, {
     headers: {

diff --git a/core/app/xmlsitemap.php/route.ts b/core/app/xmlsitemap.php/route.ts
@@ -1,7 +1,5 @@
 /* eslint-disable check-file/folder-naming-convention */
-import { useLocale } from 'next-intl';
-
-import { permanentRedirect } from '~/i18n/routing';
+import { defaultLocale, permanentRedirect } from '~/i18n/routing';
 
 /*
  * This route is used to redirect the legacy Stencil sitemap that lives on /xmlsitemap.php
@@ -11,9 +9,7 @@ import { permanentRedirect } from '~/i18n/routing';
  */
 
 export const GET = () => {
-  const locale = useLocale();
-
-  permanentRedirect({ href: '/sitemap.xml', locale });
+  permanentRedirect({ href: '/sitemap.xml', locale: defaultLocale });
 };
 
 export const runtime = 'edge';