@akinon/next 1.89.0-snapshot-ZERO-3400-20250516071934 → 1.90.0

package/CHANGELOG.md

@@ -1,15 +1,12 @@
 # @akinon/next
 
-## 1.89.0-snapshot-ZERO-3400-20250516071934
+## 1.90.0
 
 ### Minor Changes
 
-- f8e4cac: ZERO-3343: restrict root hostname to only locale subdomains
-- 832bee3: ZERO-3343: add domain to cookie for subdomain locale strategy
-- 28a59d4: ZERO-3400: refactor cookie domain logic using fallback host
-- 8feabe9: ZERO-3343: add custom NextAuth options support
-- 068dc39: ZERO-3343: update get-root-hostname logic
-- b6d5bda: ZERO-3343: update changeset config
+- e68e120: ZERO-3398: Add redirectUrlMiddleware to handle redirection based on checkout results
+
+## 1.89.0
 
 ## 1.88.0
 

package/api/auth.ts

@@ -1,5 +1,5 @@
 import { NextApiRequest, NextApiResponse } from 'next';
-import NextAuth, { Session, NextAuthOptions } from 'next-auth';
+import NextAuth, { Session } from 'next-auth';
 import CredentialProvider from 'next-auth/providers/credentials';
 import { ROUTES } from 'routes';
 import { URLS, user } from '../data/urls';
@@ -7,8 +7,6 @@ import Settings from 'settings';
 import { urlLocaleMatcherRegex } from '../utils';
 import logger from '@akinon/next/utils/log';
 import { AuthError } from '../types';
-import getRootHostname from '../utils/get-root-hostname';
-import { LocaleUrlStrategy } from '../localization';
 
 async function getCurrentUser(sessionId: string, currency = '') {
   const headers = {
@@ -42,15 +40,7 @@ async function getCurrentUser(sessionId: string, currency = '') {
   };
 }
 
-type CustomNextAuthOptions = (
-  req: NextApiRequest,
-  res: NextApiResponse
-) => Partial<NextAuthOptions>;
-
-const defaultNextAuthOptions = (
-  req: NextApiRequest,
-  res: NextApiResponse
-): NextAuthOptions => {
+const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
   return {
     providers: [
       CredentialProvider({
@@ -160,19 +150,7 @@ const defaultNextAuthOptions = (
 
           if (sessionId) {
             const maxAge = 30 * 24 * 60 * 60; // 30 days in seconds
-            const { localeUrlStrategy } = Settings.localization;
-
-            const fallbackHost =
-              req.headers['x-forwarded-host']?.toString() ||
-              req.headers.host?.toString();
-            const hostname =
-              process.env.NEXT_PUBLIC_URL || `https://${fallbackHost}`;
-            const rootHostname =
-              localeUrlStrategy === LocaleUrlStrategy.Subdomain
-                ? getRootHostname(hostname)
-                : null;
-            const domainOption = rootHostname ? `Domain=${rootHostname};` : '';
-            const cookieOptions = `Path=/; HttpOnly; Secure; Max-Age=${maxAge}; ${domainOption}`;
+            const cookieOptions = `Path=/; HttpOnly; Secure; Max-Age=${maxAge}`;
 
             res.setHeader('Set-Cookie', [
               `osessionid=${sessionId}; ${cookieOptions}`,
@@ -275,36 +253,8 @@ const defaultNextAuthOptions = (
   };
 };
 
-const Auth = (
-  req: NextApiRequest,
-  res: NextApiResponse,
-  customOptions?: CustomNextAuthOptions
-) => {
-  const baseOptions = defaultNextAuthOptions(req, res);
-  const customOptionsResult = customOptions ? customOptions(req, res) : {};
-
-  const mergedOptions = {
-    ...baseOptions,
-    ...customOptionsResult,
-    providers: [
-      ...baseOptions.providers,
-      ...(customOptionsResult.providers || [])
-    ],
-    callbacks: {
-      ...baseOptions.callbacks,
-      ...customOptionsResult.callbacks
-    },
-    events: {
-      ...baseOptions.events,
-      ...customOptionsResult.events
-    },
-    pages: {
-      ...baseOptions.pages,
-      ...customOptionsResult.pages
-    }
-  };
-
-  return NextAuth(req, res, mergedOptions);
+const Auth = (req, res) => {
+  return NextAuth(req, res, nextAuthOptions(req, res));
 };
 
 export default Auth;

package/api/client.ts

@@ -5,8 +5,6 @@ import logger from '../utils/log';
 import formatCookieString from '../utils/format-cookie-string';
 import cookieParser from 'set-cookie-parser';
 import { cookies } from 'next/headers';
-import getRootHostname from '../utils/get-root-hostname';
-import { LocaleUrlStrategy } from '../localization';
 
 interface RouteParams {
   params: {
@@ -192,23 +190,8 @@ async function proxyRequest(...args) {
     const responseHeaders: any = {};
 
     if (filteredCookies.length > 0) {
-      const { localeUrlStrategy } = settings.localization;
-
-      const fallbackHost =
-        req.headers.get('x-forwarded-host') || req.headers.get('host');
-      const hostname = process.env.NEXT_PUBLIC_URL || `https://${fallbackHost}`;
-      const rootHostname =
-        localeUrlStrategy === LocaleUrlStrategy.Subdomain
-          ? getRootHostname(hostname)
-          : null;
-
       responseHeaders['set-cookie'] = filteredCookies
-        .map((cookie) => {
-          if (!cookie.domain && rootHostname) {
-            cookie.domain = rootHostname;
-          }
-          return formatCookieString(cookie);
-        })
+        .map(formatCookieString)
         .join(', ');
     }
 

package/components/price.tsx

@@ -55,8 +55,8 @@ export const Price = (props: NumericFormatProps & PriceProps) => {
       : formattedValue;
 
   const currentCurrencyDecimalScale = Settings.localization.currencies.find(
-    (currency) => currency.code === currencyCode_
-  ).decimalScale;
+    (currency) => currency?.code === currencyCode_
+  )?.decimalScale;
 
   return (
     <NumericFormat

package/middlewares/default.ts

@@ -19,8 +19,6 @@ import withLocale from './locale';
 import logger from '../utils/log';
 import { user } from '../data/urls';
 import { getUrlPathWithLocale } from '../utils/localization';
-import getRootHostname from '../utils/get-root-hostname';
-import { LocaleUrlStrategy } from '../localization';
 
 const withPzDefault =
   (middleware: NextMiddleware) =>
@@ -298,7 +296,7 @@ const withPzDefault =
                                 !req.middlewareParams.found &&
                                 Settings.customNotFoundEnabled
                               ) {
-                                const pathname = url.pathname
+                                let pathname = url.pathname
                                   .replace(/\/+$/, '')
                                   .split('/');
                                 url.pathname = url.pathname.replace(
@@ -343,21 +341,6 @@ const withPzDefault =
                                 middlewareResult = NextResponse.rewrite(url);
                               }
 
-                              const { localeUrlStrategy } =
-                                Settings.localization;
-
-                              const fallbackHost =
-                                req.headers.get('x-forwarded-host') ||
-                                req.headers.get('host');
-                              const hostname =
-                                process.env.NEXT_PUBLIC_URL ||
-                                `https://${fallbackHost}`;
-                              const rootHostname =
-                                localeUrlStrategy ===
-                                LocaleUrlStrategy.Subdomain
-                                  ? getRootHostname(hostname)
-                                  : null;
-
                               if (
                                 !url.pathname.startsWith(`/${currency}/orders`)
                               ) {
@@ -367,7 +350,6 @@ const withPzDefault =
                                     ? locale
                                     : defaultLocaleValue,
                                   {
-                                    domain: rootHostname,
                                     sameSite: 'none',
                                     secure: true,
                                     expires: new Date(
@@ -376,12 +358,10 @@ const withPzDefault =
                                   }
                                 );
                               }
-
                               middlewareResult.cookies.set(
                                 'pz-currency',
                                 currency,
                                 {
-                                  domain: rootHostname,
                                   sameSite: 'none',
                                   secure: true,
                                   expires: new Date(
@@ -430,10 +410,7 @@ const withPzDefault =
                                   ).json();
                                   middlewareResult.cookies.set(
                                     'csrftoken',
-                                    csrf_token,
-                                    {
-                                      domain: rootHostname
-                                    }
+                                    csrf_token
                                   );
                                 }
                               } catch (error) {

package/middlewares/locale.ts

@@ -13,8 +13,7 @@ const getMatchedLocale = (pathname: string, req: PzNextRequest) => {
   const { localeUrlStrategy, defaultLocaleValue } = settings.localization;
 
   if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
-    const host =
-      req.headers.get('x-forwarded-host') || req.headers.get('host') || '';
+    const host = req.headers.get('x-forwarded-host');
 
     if (host) {
       const subDomain = host.split('.')[0] || '';
@@ -45,9 +44,7 @@ const withLocale =
     try {
       const url = req.nextUrl.clone();
       const matchedLocale = getMatchedLocale(url.pathname, req);
-      let { localeUrlStrategy } = settings.localization;
-
-      const { defaultLocaleValue, redirectToDefaultLocale } =
+      let { localeUrlStrategy, defaultLocaleValue, redirectToDefaultLocale } =
         settings.localization;
 
       localeUrlStrategy =

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.89.0-snapshot-ZERO-3400-20250516071934",
+  "version": "1.90.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -31,7 +31,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.89.0-snapshot-ZERO-3400-20250516071934",
+    "@akinon/eslint-plugin-projectzero": "1.90.0",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/redux/middlewares/checkout.ts

@@ -36,6 +36,7 @@ interface CheckoutResult {
     errors?: Record<string, string[]>;
     pre_order?: PreOrder;
     context_list?: CheckoutContext[];
+    redirect_url?: string;
   };
 }
 
@@ -57,6 +58,33 @@ export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
   };
 };
 
+export const redirectUrlMiddleware: Middleware = () => {
+  return (next) => (action) => {
+    const result: CheckoutResult = next(action);
+    const redirectUrl = result?.payload?.redirect_url;
+
+    if (redirectUrl) {
+      const currentLocale = getCookie('pz-locale');
+
+      let url = redirectUrl;
+
+      if (currentLocale && !redirectUrl.includes('/orders/redirection')) {
+        const { defaultLocaleValue, localeUrlStrategy } = settings.localization;
+
+        url =
+          currentLocale === defaultLocaleValue &&
+          localeUrlStrategy !== LocaleUrlStrategy.ShowAllLocales
+            ? redirectUrl
+            : `/${currentLocale}${redirectUrl}`;
+      }
+
+      window.location.href = url;
+    }
+
+    return result;
+  };
+};
+
 export const contextListMiddleware: Middleware = ({
   dispatch,
   getState

package/redux/middlewares/index.ts

@@ -5,6 +5,7 @@ import { ROUTES } from 'routes';
 import type { Middleware } from '@reduxjs/toolkit';
 import {
   errorMiddleware,
+  redirectUrlMiddleware,
   contextListMiddleware,
   hepsiPayMiddleware,
   walletPaymentMiddleware
@@ -50,6 +51,7 @@ const middlewares = [
   rtkQueryResponseHandler,
   rtkQueryErrorHandler,
   errorMiddleware,
+  redirectUrlMiddleware,
   ...preOrderMiddlewares,
   contextListMiddleware,
   hepsiPayMiddleware,

package/utils/get-root-hostname.ts

@@ -1,28 +0,0 @@
-import Settings from 'settings';
-
-export default function getRootHostname(
-  url: string | undefined
-): string | null {
-  if (!url) return null;
-
-  try {
-    const urlObj = new URL(url);
-    const hostname = urlObj.hostname;
-    const parts = hostname.split('.');
-
-    const firstPart = parts[0];
-
-    const isLocale = Settings.localization.locales.some(
-      (locale) => locale.value === firstPart
-    );
-
-    if (isLocale) {
-      const hostnameAfterLocale = parts.slice(1).join('.');
-      return `.${hostnameAfterLocale}`;
-    }
-
-    return `.${hostname}`;
-  } catch {
-    return null;
-  }
-}