@akinon/next 2.0.0-beta.2 → 2.0.0-beta.20

package/middlewares/redirection-payment.ts

@@ -4,6 +4,7 @@ import Settings from 'settings';
 import logger from '../utils/log';
 import { PzNextRequest } from '.';
 import { getUrlPathWithLocale } from '../utils/localization';
+import { getCheckoutPath } from '../utils';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -35,18 +36,22 @@ const withRedirectionPayment =
     const searchParams = new URLSearchParams(url.search);
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const sessionId = req.cookies.get('osessionid');
+    const currentLocale = req.middlewareParams?.rewrites?.locale;
 
     if (searchParams.get('page') !== 'RedirectionPageCompletePage') {
       return middleware(req, event);
     }
 
-    const requestUrl = `${Settings.commerceUrl}/orders/checkout/${url.search}`;
+    const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+    const requestUrl = `${Settings.commerceUrl}${getCheckoutPath(isPostCheckout)}${url.search}`;
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',
       Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      'Accept-Language':
+        currentLocale ?? req.cookies.get('pz-locale')?.value ?? ''
     };
 
     try {
@@ -60,17 +65,9 @@ const withRedirectionPayment =
             ip
           }
         );
-
-        return NextResponse.redirect(
-          `${url.origin}${getUrlPathWithLocale(
-            '/orders/checkout/',
-            req.cookies.get('pz-locale')?.value
-          )}`,
-          303
-        );
       }
 
-      const request = await fetch(requestUrl, {
+      const fetchResponse = await fetch(requestUrl, {
         method: 'POST',
         headers: requestHeaders,
         body
@@ -78,14 +75,14 @@ const withRedirectionPayment =
 
       logger.info('Complete redirection payment request', {
         requestUrl,
-        status: request.status,
+        status: fetchResponse.status,
         requestHeaders,
         ip
       });
 
-      const response = await request.json();
+      const responseData = await fetchResponse.json();
 
-      const { context_list: contextList, errors } = response;
+      const { context_list: contextList, errors } = responseData;
       const redirectionContext = contextList?.find(
         (context) => context.page_context?.redirect_url
       );
@@ -99,18 +96,26 @@ const withRedirectionPayment =
           ip
         });
 
-        return NextResponse.redirect(
+        const errorResponse = NextResponse.redirect(
           `${url.origin}${getUrlPathWithLocale(
             '/orders/checkout/',
             req.cookies.get('pz-locale')?.value
           )}`,
-          {
-            status: 303,
-            headers: {
-              'Set-Cookie': `pz-pos-error=${JSON.stringify(errors)}; path=/;`
-            }
-          }
+          303
         );
+
+        // Forward set-cookie headers from the upstream response
+        const setCookies = fetchResponse.headers.getSetCookie?.() ?? [];
+        setCookies.forEach((cookie) => {
+          errorResponse.headers.append('Set-Cookie', cookie);
+        });
+
+        // Add error cookie
+        errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
+          path: '/'
+        });
+
+        return errorResponse;
       }
 
       logger.info('Order success page context list', {
@@ -125,7 +130,7 @@ const withRedirectionPayment =
           {
             middleware: 'redirection-payment',
             requestHeaders,
-            response: JSON.stringify(response),
+            response: JSON.stringify(responseData),
             ip
           }
         );
@@ -153,10 +158,11 @@ const withRedirectionPayment =
       // So we use 303 status code to change the method to GET
       const nextResponse = NextResponse.redirect(redirectUrlWithLocale, 303);
 
-      nextResponse.headers.set(
-        'Set-Cookie',
-        request.headers.get('set-cookie') ?? ''
-      );
+      // Forward all set-cookie headers from the upstream response
+      const setCookies = fetchResponse.headers.getSetCookie?.() ?? [];
+      setCookies.forEach((cookie) => {
+        nextResponse.headers.append('Set-Cookie', cookie);
+      });
 
       return nextResponse;
     } catch (error) {

package/middlewares/saved-card-redirection.ts

@@ -4,6 +4,8 @@ import { Buffer } from 'buffer';
 import logger from '../utils/log';
 import { getUrlPathWithLocale } from '../utils/localization';
 import { PzNextRequest } from '.';
+import { ServerVariables } from '../utils/server-variables';
+import { getCheckoutPath } from '../utils';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -34,18 +36,22 @@ const withSavedCardRedirection =
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const sessionId = req.cookies.get('osessionid');
+    const currentLocale = req.middlewareParams?.rewrites?.locale;
 
     if (url.search.indexOf('SavedCardThreeDSecurePage') === -1) {
       return middleware(req, event);
     }
 
-    const requestUrl = `${Settings.commerceUrl}/orders/checkout/${url.search}`;
+    const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+    const requestUrl = `${Settings.commerceUrl}${getCheckoutPath(isPostCheckout)}${url.search}`;
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',
       Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      'Accept-Language':
+        currentLocale ?? req.cookies.get('pz-locale')?.value ?? ''
     };
 
     try {
@@ -59,17 +65,9 @@ const withSavedCardRedirection =
             ip
           }
         );
-
-        return NextResponse.redirect(
-          `${url.origin}${getUrlPathWithLocale(
-            '/orders/checkout/',
-            req.cookies.get('pz-locale')?.value
-          )}`,
-          303
-        );
       }
 
-      const request = await fetch(requestUrl, {
+      const fetchResponse = await fetch(requestUrl, {
         method: 'POST',
         headers: requestHeaders,
         body
@@ -77,14 +75,14 @@ const withSavedCardRedirection =
 
       logger.info('Complete 3D payment request', {
         requestUrl,
-        status: request.status,
+        status: fetchResponse.status,
         requestHeaders,
         ip
       });
 
-      const response = await request.json();
+      const responseData = await fetchResponse.json();
 
-      const { context_list: contextList, errors } = response;
+      const { context_list: contextList, errors } = responseData;
       const redirectionContext = contextList?.find(
         (context) => context.page_context?.redirect_url
       );
@@ -98,18 +96,26 @@ const withSavedCardRedirection =
           ip
         });
 
-        return NextResponse.redirect(
+        const errorResponse = NextResponse.redirect(
           `${url.origin}${getUrlPathWithLocale(
             '/orders/checkout/',
             req.cookies.get('pz-locale')?.value
           )}`,
-          {
-            status: 303,
-            headers: {
-              'Set-Cookie': `pz-pos-error=${JSON.stringify(errors)}; path=/;`
-            }
-          }
+          303
         );
+
+        // Forward set-cookie headers from the upstream response
+        const setCookies = fetchResponse.headers.getSetCookie?.() ?? [];
+        setCookies.forEach((cookie) => {
+          errorResponse.headers.append('Set-Cookie', cookie);
+        });
+
+        // Add error cookie
+        errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
+          path: '/'
+        });
+
+        return errorResponse;
       }
 
       logger.info('Order success page context list', {
@@ -124,7 +130,7 @@ const withSavedCardRedirection =
           {
             middleware: 'saved-card-redirection',
             requestHeaders,
-            response: JSON.stringify(response),
+            response: JSON.stringify(responseData),
             ip
           }
         );
@@ -152,10 +158,11 @@ const withSavedCardRedirection =
       // So we use 303 status code to change the method to GET
       const nextResponse = NextResponse.redirect(redirectUrlWithLocale, 303);
 
-      nextResponse.headers.set(
-        'Set-Cookie',
-        request.headers.get('set-cookie') ?? ''
-      );
+      // Forward all set-cookie headers from the upstream response
+      const setCookies = fetchResponse.headers.getSetCookie?.() ?? [];
+      setCookies.forEach((cookie) => {
+        nextResponse.headers.append('Set-Cookie', cookie);
+      });
 
       return nextResponse;
     } catch (error) {

package/middlewares/three-d-redirection.ts

@@ -4,6 +4,7 @@ import { Buffer } from 'buffer';
 import logger from '../utils/log';
 import { getUrlPathWithLocale } from '../utils/localization';
 import { PzNextRequest } from '.';
+import { getCheckoutPath } from '../utils';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -34,18 +35,22 @@ const withThreeDRedirection =
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const sessionId = req.cookies.get('osessionid');
+    const currentLocale = req.middlewareParams?.rewrites?.locale;
 
     if (url.search.indexOf('CreditCardThreeDSecurePage') === -1) {
       return middleware(req, event);
     }
 
-    const requestUrl = `${Settings.commerceUrl}/orders/checkout/${url.search}`;
+    const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+    const requestUrl = `${Settings.commerceUrl}${getCheckoutPath(isPostCheckout)}${url.search}`;
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',
       Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      'Accept-Language':
+        currentLocale ?? req.cookies.get('pz-locale')?.value ?? ''
     };
 
     try {
@@ -59,17 +64,9 @@ const withThreeDRedirection =
             ip
           }
         );
-
-        return NextResponse.redirect(
-          `${url.origin}${getUrlPathWithLocale(
-            '/orders/checkout/',
-            req.cookies.get('pz-locale')?.value
-          )}`,
-          303
-        );
       }
 
-      const request = await fetch(requestUrl, {
+      const fetchResponse = await fetch(requestUrl, {
         method: 'POST',
         headers: requestHeaders,
         body
@@ -77,14 +74,14 @@ const withThreeDRedirection =
 
       logger.info('Complete 3D payment request', {
         requestUrl,
-        status: request.status,
+        status: fetchResponse.status,
         requestHeaders,
         ip
       });
 
-      const response = await request.json();
+      const responseData = await fetchResponse.json();
 
-      const { context_list: contextList, errors } = response;
+      const { context_list: contextList, errors } = responseData;
       const redirectionContext = contextList?.find(
         (context) => context.page_context?.redirect_url
       );
@@ -98,18 +95,26 @@ const withThreeDRedirection =
           ip
         });
 
-        return NextResponse.redirect(
+        const errorResponse = NextResponse.redirect(
           `${url.origin}${getUrlPathWithLocale(
             '/orders/checkout/',
             req.cookies.get('pz-locale')?.value
           )}`,
-          {
-            status: 303,
-            headers: {
-              'Set-Cookie': `pz-pos-error=${JSON.stringify(errors)}; path=/;`
-            }
-          }
+          303
         );
+
+        // Forward set-cookie headers from the upstream response
+        const setCookies = fetchResponse.headers.getSetCookie?.() ?? [];
+        setCookies.forEach((cookie) => {
+          errorResponse.headers.append('Set-Cookie', cookie);
+        });
+
+        // Add error cookie
+        errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
+          path: '/'
+        });
+
+        return errorResponse;
       }
 
       logger.info('Order success page context list', {
@@ -124,7 +129,7 @@ const withThreeDRedirection =
           {
             middleware: 'three-d-redirection',
             requestHeaders,
-            response: JSON.stringify(response),
+            response: JSON.stringify(responseData),
             ip
           }
         );
@@ -152,10 +157,11 @@ const withThreeDRedirection =
       // So we use 303 status code to change the method to GET
       const nextResponse = NextResponse.redirect(redirectUrlWithLocale, 303);
 
-      nextResponse.headers.set(
-        'Set-Cookie',
-        request.headers.get('set-cookie') ?? ''
-      );
+      // Forward all set-cookie headers from the upstream response
+      const setCookies = fetchResponse.headers.getSetCookie?.() ?? [];
+      setCookies.forEach((cookie) => {
+        nextResponse.headers.append('Set-Cookie', cookie);
+      });
 
       return nextResponse;
     } catch (error) {

package/middlewares/url-redirection.ts

@@ -4,6 +4,7 @@ import { PzNextRequest } from '.';
 import logger from '../utils/log';
 import { urlLocaleMatcherRegex } from '../utils';
 import { getUrlPathWithLocale } from '../utils/localization';
+import { shouldIgnoreRedirect } from '../utils/redirect-ignore';
 import { ROUTES } from 'routes';
 
 // This middleware is used to handle url redirections set in Omnitron
@@ -50,7 +51,7 @@ const withUrlRedirection =
         const location = request.headers.get('location');
         const redirectUrl = new URL(
           request.headers.get('location'),
-          location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
+          location.startsWith('http') ? '' : url.origin
         );
 
         redirectUrl.pathname = getUrlPathWithLocale(
@@ -60,6 +61,15 @@ const withUrlRedirection =
 
         const setCookies = request.headers.getSetCookie();
 
+        if (
+          shouldIgnoreRedirect(
+            url.pathname,
+            req.middlewareParams.rewrites.locale
+          )
+        ) {
+          return middleware(req, event);
+        }
+
         const response = NextResponse.redirect(redirectUrl.toString(), {
           status: request.status
         });

package/middlewares/wallet-complete-redirection.ts

@@ -0,0 +1,206 @@
+import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
+import Settings from 'settings';
+import { Buffer } from 'buffer';
+import logger from '../utils/log';
+import { getUrlPathWithLocale } from '../utils/localization';
+import { PzNextRequest } from '.';
+import { getCheckoutPath } from '../utils';
+
+const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
+  if (stream) {
+    const chunks = [];
+    let result = '';
+
+    try {
+      for await (const chunk of stream as any) {
+        chunks.push(Buffer.from(chunk));
+      }
+
+      result = Buffer.concat(chunks).toString('utf-8');
+    } catch (error) {
+      logger.error('Error while reading body stream', {
+        middleware: 'wallet-complete-redirection',
+        error
+      });
+    }
+
+    return result;
+  }
+  return null;
+};
+
+const withWalletCompleteRedirection =
+  (middleware: NextMiddleware) =>
+  async (req: PzNextRequest, event: NextFetchEvent) => {
+    const url = req.nextUrl.clone();
+    const ip = req.headers.get('x-forwarded-for') ?? '';
+    const sessionId = req.cookies.get('osessionid');
+
+    if (url.search.indexOf('WalletCompletePage') === -1) {
+      return middleware(req, event);
+    }
+
+    const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+    const requestUrl = `${Settings.commerceUrl}${getCheckoutPath(isPostCheckout)}${url.search}`;
+    const requestHeaders = {
+      'X-Requested-With': 'XMLHttpRequest',
+      'Content-Type': 'application/x-www-form-urlencoded',
+      Cookie: req.headers.get('cookie') ?? '',
+      'x-currency': req.cookies.get('pz-currency')?.value ?? '',
+      'x-forwarded-for': ip
+    };
+
+    try {
+      const existingBody = await streamToString(req.body);
+      const queryParams = new URLSearchParams(url.search);
+      const bodyParams = new URLSearchParams();
+
+      if (existingBody) {
+        try {
+          const existingParams = new URLSearchParams(existingBody);
+
+          existingParams.forEach((value, key) => {
+            bodyParams.append(key, value);
+          });
+        } catch {
+          logger.error('Error parsing existing body as URL-encoded data', {
+            middleware: 'wallet-complete-redirection',
+            existingBody,
+            ip
+          });
+        }
+      }
+
+      queryParams.forEach((value, key) => {
+        bodyParams.append(key, value);
+      });
+
+      const body = bodyParams.toString();
+
+      if (!sessionId) {
+        logger.warn(
+          'Make sure that the SESSION_COOKIE_SAMESITE environment variable is set to None in Commerce.',
+          {
+            middleware: 'wallet-complete-redirection',
+            ip
+          }
+        );
+      }
+
+      const fetchResponse = await fetch(requestUrl, {
+        method: 'POST',
+        headers: requestHeaders,
+        body
+      });
+
+      logger.info('Complete wallet payment request', {
+        requestUrl,
+        status: fetchResponse.status,
+        requestHeaders,
+        ip
+      });
+
+      const responseData = await fetchResponse.json();
+
+      const { context_list: contextList, errors } = responseData;
+      const redirectionContext = contextList?.find(
+        (context) => context.page_context?.redirect_url
+      );
+      const redirectUrl = redirectionContext?.page_context?.redirect_url;
+
+      if (errors && Object.keys(errors).length) {
+        logger.error('Error while completing wallet payment', {
+          middleware: 'wallet-complete-redirection',
+          errors,
+          requestHeaders,
+          ip
+        });
+
+        const errorResponse = NextResponse.redirect(
+          `${url.origin}${getUrlPathWithLocale(
+            '/orders/checkout/',
+            req.cookies.get('pz-locale')?.value
+          )}`,
+          303
+        );
+
+        // Forward set-cookie headers from the upstream response
+        const setCookies = fetchResponse.headers.getSetCookie?.() ?? [];
+        setCookies.forEach((cookie) => {
+          errorResponse.headers.append('Set-Cookie', cookie);
+        });
+
+        // Add error cookie
+        errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
+          path: '/'
+        });
+
+        return errorResponse;
+      }
+
+      logger.info('Order success page context list', {
+        middleware: 'wallet-complete-redirection',
+        contextList,
+        ip
+      });
+
+      if (!redirectUrl) {
+        logger.warn(
+          'No redirection url for order success page found in page_context. Redirecting to checkout page.',
+          {
+            middleware: 'wallet-complete-redirection',
+            requestHeaders,
+            response: JSON.stringify(responseData),
+            ip
+          }
+        );
+
+        const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`;
+
+        return NextResponse.redirect(redirectUrlWithLocale, 303);
+      }
+
+      const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
+        redirectUrl,
+        req.cookies.get('pz-locale')?.value
+      )}`;
+
+      logger.info('Redirecting to order success page', {
+        middleware: 'wallet-complete-redirection',
+        redirectUrlWithLocale,
+        ip
+      });
+
+      // Using POST method while redirecting causes an error,
+      // So we use 303 status code to change the method to GET
+      const nextResponse = NextResponse.redirect(redirectUrlWithLocale, 303);
+
+      // Forward all set-cookie headers from the upstream response
+      const setCookies = fetchResponse.headers.getSetCookie?.() ?? [];
+      setCookies.forEach((cookie) => {
+        nextResponse.headers.append('Set-Cookie', cookie);
+      });
+
+      return nextResponse;
+    } catch (error) {
+      logger.error('Error while completing wallet payment', {
+        middleware: 'wallet-complete-redirection',
+        error,
+        requestHeaders,
+        ip
+      });
+
+      return NextResponse.redirect(
+        `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`,
+        303
+      );
+    }
+  };
+
+export default withWalletCompleteRedirection;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "2.0.0-beta.2",
+  "version": "2.0.0-beta.20",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -13,30 +13,45 @@
     "pz-predev": "bin/pz-predev.js",
     "pz-postdev": "bin/pz-postdev.js"
   },
+  "scripts": {
+    "test": "jest"
+  },
   "dependencies": {
+    "@mongodb-js/zstd": "^2.0.1",
+    "@neshca/cache-handler": "1.9.0",
     "@opentelemetry/exporter-trace-otlp-http": "0.46.0",
     "@opentelemetry/resources": "1.19.0",
     "@opentelemetry/sdk-node": "0.46.0",
     "@opentelemetry/sdk-trace-node": "1.19.0",
     "@opentelemetry/semantic-conventions": "1.19.0",
-    "@reduxjs/toolkit": "1.9.7",
-    "@neshca/cache-handler": "1.5.1",
+    "@reduxjs/toolkit": "2.11.2",
+    "@sentry/nextjs": "10.39.0",
     "cross-spawn": "7.0.3",
     "generic-pool": "3.9.0",
-    "react-redux": "8.1.3",
+    "lottie-web": "^5.13.0",
+    "react-multi-carousel": "2.8.4",
+    "react-redux": "9.2.0",
     "react-string-replace": "1.1.1",
     "redis": "4.6.13",
     "semver": "7.6.2",
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.2",
+    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.20",
+    "@babel/core": "7.26.10",
+    "@babel/preset-env": "7.26.9",
+    "@babel/preset-typescript": "7.27.0",
+    "@types/jest": "29.5.14",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
-    "@typescript-eslint/eslint-plugin": "8.18.2",
-    "@typescript-eslint/parser": "8.18.2",
-    "eslint": "9.17.0",
-    "eslint-config-next": "15.1.2",
-    "eslint-config-prettier": "9.1.0"
+    "@typescript-eslint/eslint-plugin": "6.7.4",
+    "@typescript-eslint/parser": "6.7.4",
+    "babel-jest": "29.7.0",
+    "eslint": "8.56.0",
+    "eslint-config-next": "16.1.6",
+    "eslint-config-prettier": "8.5.0",
+    "jest": "29.7.0",
+    "ts-jest": "29.3.2",
+    "typescript": "5.9.3"
   }
 }