@akinon/next 2.0.0-beta.12 → 2.0.0-beta.13

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,20 +61,13 @@ const withUrlRedirection =
 
         const setCookies = request.headers.getSetCookie();
 
-        if (settings.commerceRedirectionIgnoreList) {
-          const shouldIgnoreRedirect =
-            settings.commerceRedirectionIgnoreList.some((ignorePath) =>
-              redirectUrl.pathname.startsWith(
-                getUrlPathWithLocale(
-                  ignorePath,
-                  req.middlewareParams.rewrites.locale
-                )
-              )
-            );
-
-          if (shouldIgnoreRedirect) {
-            return middleware(req, event);
-          }
+        if (
+          shouldIgnoreRedirect(
+            url.pathname,
+            req.middlewareParams.rewrites.locale
+          )
+        ) {
+          return middleware(req, event);
         }
 
         const response = NextResponse.redirect(redirectUrl.toString(), {

package/middlewares/wallet-complete-redirection.ts

@@ -0,0 +1,207 @@
+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.headers.append(
+          'Set-Cookie',
+          `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.12",
+  "version": "2.0.0-beta.13",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -17,30 +17,39 @@
     "test": "jest"
   },
   "dependencies": {
-    "@neshca/cache-handler": "1.5.1",
+    "@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",
-    "@sentry/nextjs": "9.5.0",
+    "@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",
+    "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.12",
+    "@akinon/eslint-plugin-projectzero": "2.0.0-beta.13",
+    "@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.3.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"
   }
 }

package/plugins.d.ts

@@ -13,6 +13,7 @@ declare module '@akinon/pz-masterpass/src/redux/reducer' {
   export const setError: any;
   export const setOtpModalVisible: any;
   export const setCvcRequired: any;
+  export const resetMasterpassState: any;
 }
 
 declare module '@akinon/pz-otp' {
@@ -30,9 +31,23 @@ declare module '@akinon/pz-saved-card' {
   export const SavedCardOption: any;
 }
 
-declare module '@akinon/pz-iyzico-saved-card' {
-  export const iyzicoSavedCardReducer: any;
-  export const iyzicoSavedCardMiddleware: any;
+declare module '@akinon/pz-apple-pay' {}
+
+declare module '@akinon/pz-cybersource-uc/src/redux/middleware' {
+  export default middleware as any;
 }
 
-declare module '@akinon/pz-apple-pay' {}
+declare module '@akinon/pz-cybersource-uc/src/redux/reducer' {
+  export default reducer as any;
+}
+
+declare module '@akinon/pz-cybersource-uc' {
+  export const CyberSourceUcPaymentOption: any;
+}
+
+declare module '@akinon/pz-flow-payment' {}
+
+declare module '@akinon/pz-masterpass-rest' {
+  export const MasterpassRestOption: React.FC;
+  export const masterpassRestReducer: any;
+}

package/plugins.js

@@ -15,5 +15,13 @@ module.exports = [
   'pz-saved-card',
   'pz-tabby-extension',
   'pz-apple-pay',
-  'pz-tamara-extension'
+  'pz-tamara-extension',
+  'pz-cybersource-uc',
+  'pz-hepsipay',
+  'pz-flow-payment',
+  'pz-virtual-try-on',
+  'pz-masterpass-rest',
+  'pz-similar-products',
+  'pz-haso',
+  'pz-google-pay'
 ];

package/redux/actions.ts

@@ -0,0 +1,47 @@
+// Re-export all action creators from slice modules
+export * from './reducers/root';
+export * from './reducers/header';
+export * from './reducers/checkout';
+export * from './reducers/config';
+
+// Import RTK Query APIs
+import { basketApi } from '../data/client/basket';
+import { productApi } from '../data/client/product';
+import { miscApi } from '../data/client/misc';
+import { checkoutApi } from '../data/client/checkout';
+import { wishlistApi } from '../data/client/wishlist';
+
+// Create RTK Query action creators
+export const rtkApiActionCreators = {
+  // RTK Query API endpoints
+  ...Object.fromEntries(
+    Object.entries(basketApi.endpoints).map(([key, endpoint]) => [
+      `api_basket_${key}`,
+      endpoint.initiate
+    ])
+  ),
+  ...Object.fromEntries(
+    Object.entries(productApi.endpoints).map(([key, endpoint]) => [
+      `api_product_${key}`,
+      endpoint.initiate
+    ])
+  ),
+  ...Object.fromEntries(
+    Object.entries(miscApi.endpoints).map(([key, endpoint]) => [
+      `api_misc_${key}`,
+      endpoint.initiate
+    ])
+  ),
+  ...Object.fromEntries(
+    Object.entries(checkoutApi.endpoints).map(([key, endpoint]) => [
+      `api_checkout_${key}`,
+      endpoint.initiate
+    ])
+  ),
+  ...Object.fromEntries(
+    Object.entries(wishlistApi.endpoints).map(([key, endpoint]) => [
+      `api_wishlist_${key}`,
+      endpoint.initiate
+    ])
+  )
+} as any;

package/redux/middlewares/checkout.ts

@@ -20,7 +20,8 @@ import {
   setShippingOptions,
   setHepsipayAvailability,
   setWalletPaymentData,
-  setPayOnDeliveryOtpModalActive
+  setPayOnDeliveryOtpModalActive,
+  setUnavailablePaymentOptions
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
@@ -47,7 +48,7 @@ interface MiddlewareParams {
 
 export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const errors = result?.payload?.errors;
 
     if (errors) {
@@ -60,7 +61,7 @@ export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
 
 export const redirectUrlMiddleware: Middleware = () => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const redirectUrl = result?.payload?.redirect_url;
 
     if (redirectUrl) {
@@ -91,13 +92,13 @@ export const contextListMiddleware: Middleware = ({
 }: MiddlewareParams) => {
   return (next) => (action) => {
     const { isMobileApp, userPhoneNumber } = getState().root;
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
 
     if (result?.payload?.context_list) {
       result.payload.context_list.forEach((context) => {
         const redirectUrl = context.page_context.redirect_url;
-        const isIframe = context.page_context.is_frame ?? false;
+        const isIframe = context.page_context.is_iframe ?? false;
 
         if (redirectUrl) {
           const currentLocale = getCookie('pz-locale');
@@ -176,6 +177,14 @@ export const contextListMiddleware: Middleware = ({
           dispatch(setPaymentOptions(context.page_context.payment_options));
         }
 
+        if (context.page_context.unavailable_options) {
+          dispatch(
+            setUnavailablePaymentOptions(
+              context.page_context.unavailable_options
+            )
+          );
+        }
+
         if (context.page_context.credit_payment_options) {
           dispatch(
             setCreditPaymentOptions(context.page_context.credit_payment_options)
@@ -199,7 +208,10 @@ export const contextListMiddleware: Middleware = ({
             dispatch(setCardType(context.page_context.card_type));
           }
 
-          if (context.page_context.installments) {
+          if (
+            context.page_context.installments &&
+            preOrder?.payment_option?.payment_type !== 'masterpass_rest'
+          ) {
             dispatch(setInstallmentOptions(context.page_context.installments));
           }
         }
@@ -235,7 +247,7 @@ export const hepsiPayMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const { payload } = result;
     const preOrder = payload?.pre_order;
     const contextList = payload?.context_list;
@@ -289,7 +301,7 @@ export const walletPaymentMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const { payload } = result;
     const preOrder = payload?.pre_order;
     const contextList = payload?.context_list;

package/redux/middlewares/index.ts

@@ -3,6 +3,7 @@
 import { signOut } from 'next-auth/react';
 import { ROUTES } from 'routes';
 import type { Middleware } from '@reduxjs/toolkit';
+import type { MiddlewareAction } from '../../types';
 import {
   errorMiddleware,
   redirectUrlMiddleware,
@@ -18,17 +19,17 @@ import logger from '@akinon/next/utils/log';
 
 // Plugin middlewares
 import { savedCardMiddleware } from '@akinon/pz-saved-card';
+import cyberSourceUcMiddleware from '@akinon/pz-cybersource-uc/src/redux/middleware';
 
-export const rtkQueryResponseHandler: Middleware =
-  ({ dispatch }) =>
-  (next) =>
-  (action) => {
-    return next(action);
-  };
+export const rtkQueryResponseHandler: Middleware = () => (next) => (action) => {
+  return next(action);
+};
 
 export const rtkQueryErrorHandler: Middleware =
   () => (next) => async (action) => {
-    if (action?.payload?.status === 401) {
+    const act = action as MiddlewareAction;
+
+    if (act?.payload?.status === 401) {
       await signOut({
         callbackUrl: `${ROUTES.AUTH}?callbackUrl=${window.location.pathname}`
       });
@@ -37,9 +38,9 @@ export const rtkQueryErrorHandler: Middleware =
       return;
     }
 
-    if (action?.payload?.status === 404) {
+    if (act?.payload?.status === 404) {
       logger.warn(
-        `404 - Not Found. Endpoint: ${action.meta.arg.endpointName}, url: ${action.meta.baseQueryMeta.request.url}`
+        `404 - Not Found. Endpoint: ${act.meta.arg.endpointName}, url: ${act.meta.baseQueryMeta.request.url}`
       );
     }
 
@@ -56,7 +57,8 @@ const middlewares = [
   contextListMiddleware,
   hepsiPayMiddleware,
   walletPaymentMiddleware,
-  savedCardMiddleware
+  savedCardMiddleware,
+  cyberSourceUcMiddleware
 ];
 
 // Filter out any non-function middleware to ensure all middlewares are valid and executable

package/redux/middlewares/pre-order/address.ts

@@ -7,7 +7,7 @@ export const setAddressMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
 
     if (!preOrder) {

package/redux/middlewares/pre-order/attribute-based-shipping-option.ts

@@ -7,7 +7,7 @@ export const attributeBasedShippingOptionMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
 
     if (!preOrder) {

package/redux/middlewares/pre-order/data-source-shipping-option.ts

@@ -7,7 +7,7 @@ export const dataSourceShippingOptionMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
 
     if (!preOrder) {

package/redux/middlewares/pre-order/delivery-option.ts

@@ -7,7 +7,7 @@ export const deliveryOptionMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
 
     if (!preOrder) {

package/redux/middlewares/pre-order/index.ts

@@ -8,15 +8,17 @@ import { dataSourceShippingOptionMiddleware } from './data-source-shipping-optio
 import { attributeBasedShippingOptionMiddleware } from './attribute-based-shipping-option';
 import { paymentOptionMiddleware } from './payment-option';
 import { installmentOptionMiddleware } from './installment-option';
+import { paymentOptionResetMiddleware } from './payment-option-reset';
 import { shippingStepMiddleware } from './shipping-step';
 
 // ⚠️ WARNING: Redux Toolkit applies middlewares in reverse order (from last to first).
-// This list is written **in reverse execution order** to ensure they run in the correct sequence.  
+// This list is written **in reverse execution order** to ensure they run in the correct sequence.
 // If you add a new middleware, make sure to insert it **in reverse order** based on execution priority.
 
 export const preOrderMiddlewares = [
   shippingStepMiddleware,
   installmentOptionMiddleware,
+  paymentOptionResetMiddleware,
   paymentOptionMiddleware,
   attributeBasedShippingOptionMiddleware,
   dataSourceShippingOptionMiddleware,

package/redux/middlewares/pre-order/installment-option.ts

@@ -7,7 +7,7 @@ export const installmentOptionMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
 
     if (!preOrder) {
@@ -20,6 +20,7 @@ export const installmentOptionMiddleware: Middleware = ({
     if (
       !preOrder?.installment &&
       preOrder?.payment_option?.payment_type !== 'saved_card' &&
+      preOrder?.payment_option?.payment_type !== 'masterpass_rest' &&
       installmentOptions.length > 0
     ) {
       const firstInstallmentOptionPk = installmentOptions[0]?.pk;

package/redux/middlewares/pre-order/payment-option-reset.ts

@@ -0,0 +1,37 @@
+import { Middleware } from '@reduxjs/toolkit';
+import { CheckoutResult, MiddlewareAction, MiddlewareParams } from '../../../types';
+import {
+  setBankAccounts,
+  setCardType,
+  setInstallmentOptions,
+  setSelectedBankAccountPk
+} from '../../reducers/checkout';
+import { resetMasterpassState } from '@akinon/pz-masterpass/src/redux/reducer';
+
+export const paymentOptionResetMiddleware: Middleware = ({
+  dispatch
+}: MiddlewareParams) => {
+  return (next) => (action) => {
+    const result = next(action) as CheckoutResult;
+    const act = action as MiddlewareAction;
+
+    if (
+      act.type === 'api/executeMutation/fulfilled' &&
+      act.meta?.arg?.endpointName === 'setPaymentOption'
+    ) {
+      dispatch(setInstallmentOptions([]));
+      dispatch(setBankAccounts([]));
+      dispatch(setSelectedBankAccountPk(null));
+      dispatch(setCardType(null));
+      if(resetMasterpassState){
+        dispatch(resetMasterpassState());
+      }
+    }
+
+    return result;
+  };
+};
+
+Object.defineProperty(paymentOptionResetMiddleware, 'name', {
+  value: 'paymentOptionResetMiddleware'
+});

package/redux/middlewares/pre-order/payment-option.ts

@@ -7,7 +7,7 @@ export const paymentOptionMiddleware: Middleware = ({
   dispatch
 }: MiddlewareParams) => {
   return (next) => (action) => {
-    const result: CheckoutResult = next(action);
+    const result = next(action) as CheckoutResult;
     const preOrder = result?.payload?.pre_order;
 
     if (!preOrder) {