@akinon/next 1.98.0 → 1.99.0-rc.66

package/utils/redirect.ts

@@ -1,23 +1,48 @@
 import { redirect as nextRedirect, RedirectType } from 'next/navigation';
 import Settings from 'settings';
-import { headers } from 'next/headers';
-import { ServerVariables } from '@akinon/next/utils/server-variables';
+import { headers, cookies } from 'next/headers';
 import { getUrlPathWithLocale } from '@akinon/next/utils/localization';
+import { urlLocaleMatcherRegex } from '@akinon/next/utils';
 
 export const redirect = (path: string, type?: RedirectType) => {
   const nextHeaders = headers();
+  const nextCookies = cookies();
   const pageUrl = new URL(
-    nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL
+    nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL ?? ''
   );
 
+  let currentLocaleValue = Settings.localization.defaultLocaleValue;
+  const urlLocaleMatch = pageUrl.pathname.match(urlLocaleMatcherRegex);
+
+  if (urlLocaleMatch && urlLocaleMatch[0]) {
+    currentLocaleValue = urlLocaleMatch[0].replace('/', '');
+  } else {
+    const cookieLocale = nextCookies.get('pz-locale')?.value;
+    if (
+      cookieLocale &&
+      Settings.localization.locales.find((l) => l.value === cookieLocale)
+    ) {
+      currentLocaleValue = cookieLocale;
+    }
+  }
+
   const currentLocale = Settings.localization.locales.find(
-    (locale) => locale.value === ServerVariables.locale
+    (locale) => locale.value === currentLocaleValue
   );
 
-  const callbackUrl = pageUrl.pathname;
+  if (!currentLocale) {
+    currentLocaleValue = Settings.localization.defaultLocaleValue;
+  }
+
+  const searchParams = new URLSearchParams(pageUrl.search);
+
+  const callbackUrl =
+    pageUrl.pathname.replace(urlLocaleMatcherRegex, '') +
+    (searchParams.toString() ? `?${searchParams.toString()}` : '');
+
   const redirectUrlWithLocale = getUrlPathWithLocale(
     path,
-    currentLocale.localePath ?? currentLocale.value
+    currentLocale?.value
   );
 
   const redirectUrl = `${redirectUrlWithLocale}?callbackUrl=${callbackUrl}`;

package/with-pz-config.js

@@ -16,12 +16,8 @@ const defaultConfig = {
     remotePatterns: [
       {
         protocol: 'https',
-        hostname: '**.akinoncloud.com'
+        hostname: '**'
       },
-      {
-        protocol: 'https',
-        hostname: '**.akinoncdn.com'
-      }
     ]
   },
   modularizeImports: {