@akinon/next 1.92.0-rc.10 → 1.92.0-rc.12

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @akinon/next
 
+## 1.92.0-rc.12
+
+### Minor Changes
+
+- f7fd459: ZERO-3445: Refactor setCookie function to include domain handling and improve cookie string construction
+
+## 1.92.0-rc.11
+
+### Minor Changes
+
+- a8539c8: ZERO-3439: Enhance locale handling in middleware and redirect utility
+
 ## 1.92.0-rc.10
 
 ### Minor Changes

package/middlewares/locale.ts

@@ -23,7 +23,15 @@ const getMatchedLocale = (pathname: string, req: PzNextRequest) => {
       );
 
       if (subDomainLocaleMatched && subDomainLocaleMatched[0]) {
-        matchedLocale = subDomainLocaleMatched[0].slice(1);
+        const subdomainLocale = subDomainLocaleMatched[0].slice(1);
+
+        const isValidSubdomainLocale = settings.localization.locales.find(
+          (l) => l.value === subdomainLocale
+        );
+
+        if (isValidSubdomainLocale) {
+          matchedLocale = subdomainLocale;
+        }
       }
     }
   }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.92.0-rc.10",
+  "version": "1.92.0-rc.12",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -34,7 +34,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.92.0-rc.10",
+    "@akinon/eslint-plugin-projectzero": "1.92.0-rc.12",
     "@babel/core": "7.26.10",
     "@babel/preset-env": "7.26.9",
     "@babel/preset-typescript": "7.27.0",

package/utils/index.ts

@@ -1,6 +1,7 @@
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../localization';
 import { CDNOptions, ClientRequestOptions } from '../types';
+import getRootHostname from './get-root-hostname';
 
 export * from './get-currency';
 export * from './menu-generator';
@@ -20,14 +21,25 @@ export function getCookie(name: string) {
   }
 }
 
-export function setCookie(name: string, val: string) {
-  const date = new Date();
-  const value = val;
-
-  date.setTime(date.getTime() + 7 * 24 * 60 * 60 * 1000);
-
-  document.cookie =
-    name + '=' + value + '; expires=' + date.toUTCString() + '; path=/';
+export function setCookie(name: string, value: string) {
+  const WEEK_IN_MS = 7 * 24 * 60 * 60 * 1000;
+  const hostname = process.env.NEXT_PUBLIC_URL || '';
+  const domain =
+    localeUrlStrategy === LocaleUrlStrategy.Subdomain
+      ? getRootHostname(hostname)
+      : null;
+  const domainStr = domain ? `Domain=${domain};` : '';
+  const expiryDate = new Date();
+  expiryDate.setTime(expiryDate.getTime() + WEEK_IN_MS);
+
+  const cookieString = [
+    `${name}=${value}`,
+    `expires=${expiryDate.toUTCString()}`,
+    `path=/`,
+    domainStr
+  ].join('; ');
+
+  document.cookie = cookieString;
 }
 
 export function removeCookie(name: string) {

package/utils/redirect.ts

@@ -1,26 +1,42 @@
 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 ?? ''
   );
 
+  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
   );
 
+  if (!currentLocale) {
+    currentLocaleValue = Settings.localization.defaultLocaleValue;
+  }
+
   const callbackUrl = pageUrl.pathname.replace(urlLocaleMatcherRegex, '');
 
-  const redirectUrlWithLocale = getUrlPathWithLocale(
-    path,
-    currentLocale?.value
-  );
+  const redirectUrlWithLocale = getUrlPathWithLocale(path, currentLocaleValue);
 
   const redirectUrl = `${redirectUrlWithLocale}?callbackUrl=${callbackUrl}`;