@akinon/next 1.107.0-rc.86 → 1.108.0-rc.87

package/CHANGELOG.md

@@ -1,13 +1,11 @@
 # @akinon/next
 
-## 1.107.0-rc.86
+## 1.108.0-rc.87
 
 ### Minor Changes
 
-- 4ca44c78: ZERO-3634: add register_consumer_card
-- 5dfeea04: ZERO-2801: Revert ZERO-2801
+- 5dfeea04a: ZERO-2801: Revert ZERO-2801
 - 823d82f9: ZERO-3393: Enhance error handling in checkout middleware to ensure errors are checked for existence before processing
-- 28c7ea79: ZERO-3427: Refactor redirect utility to handle undefined URL and improve locale handling
 - e1aa030d: ZERO-3473: Refactor locale handling to prioritize cookie value for matched locale
 - 2d9b2b2c9: ZERO-2816: Add segment to headers
 - 5e1feca6: Revert "ZERO-3286: Add notFound handling for chunk URLs starting with \_next"
@@ -37,7 +35,6 @@
 - 65d3b862: ZERO-3054: Update headers in appFetch
 - bbe18b9ff: ZERO-2575: Fix build error
 - 4920742c2: Disable getCachedTranslations
-- b6e5b624: ZERO-3257: Enhance locale middleware to redirect using existing or default locale and support 303 status for POST requests
 - 7e56d6b6b: ZERO-2841: Update api tagTypes
 - d99a6a7d: ZERO-3457: Fixed the settings prop and made sure everything is customizable.
 - 33377cfd: ZERO-3267: Refactor import statement for ROUTES in error-page component
@@ -45,7 +42,6 @@
 - c480272c: ZERO-3531: Refactor checkoutApi: Remove unnecessary invalidatesTags property from POST request from sample products
 - facf1ada: ZERO-3445: Add SameSite and Secure attributes
 - eeb20bea: Revert "ZERO-3054: Refactor cache handler to use custom Redis handler and implement key hashing"
-- 5b500797: ZERO-3634: iyzico saved card
 - 3bf63c8a: ZERO-3286: Add notFound handling for chunk URLs starting with \_next
 - 9be2c081: ZERO-3243: Improve basket update query handling with optimistic updates
 - f7fd459b: ZERO-3445: Refactor setCookie function to include domain handling and improve cookie string construction
@@ -55,11 +51,20 @@
 - 7bd3d9928: ZERO-2801: Refactor locale middleware to handle single locale configuration
 - acd2afdf: ZERO-3431: Fix import statement for findBaseDir in next-config test
 - fdd255ee: ZERO-3054: Refactor cache handler to use custom Redis handler and implement key hashing
-- 49eeebfa: ZERO-2909: Add deleteCollectionItem query to wishlistApi
+- 49eeebfaa: ZERO-2909: Add deleteCollectionItem query to wishlistApi
 - 3f9b8d7e7: ZERO-2761: Update plugins.js for akinon-next
-- 33d4d0c: ZERO-3615: remove custom not found
+- 33d4d0c9: ZERO-3615: remove custom not found
 - 0e823010: ZERO-3531: Add saveSampleProducts endpoint
 
+## 1.107.0
+
+### Minor Changes
+
+- 4ca44c78: ZERO-3634: add register_consumer_card
+- 28c7ea79: ZERO-3427: Refactor redirect utility to handle undefined URL and improve locale handling
+- b6e5b624: ZERO-3257: Enhance locale middleware to redirect using existing or default locale and support 303 status for POST requests
+- 5b500797: ZERO-3634: iyzico saved card
+
 ## 1.106.0
 
 ### Minor Changes

package/components/plugin-module.tsx

@@ -48,6 +48,7 @@ export enum Component {
   AkifastCheckoutButton = 'CheckoutButton',
   MultiBasket = 'MultiBasket',
   SavedCard = 'SavedCardOption',
+  IyzicoSavedCard = 'IyzicoSavedCardOption',
   Hepsipay = 'Hepsipay',
   FlowPayment = 'FlowPayment'
 }
@@ -82,6 +83,7 @@ const PluginComponents = new Map([
     [Component.AkifastQuickLoginButton, Component.AkifastCheckoutButton]
   ],
   [Plugin.MultiBasket, [Component.MultiBasket]],
+  [Plugin.SavedCard, [Component.SavedCard, Component.IyzicoSavedCard]],
   [Plugin.SavedCard, [Component.SavedCard]],
   [Plugin.Hepsipay, [Component.Hepsipay]],
   [Plugin.FlowPayment, [Component.FlowPayment]]

package/components/selected-payment-option-view.tsx

@@ -60,6 +60,15 @@ export default function SelectedPaymentOptionView({
             return typeof mod?.default === 'function'
               ? mod.default
               : fallbackView;
+          } else if (
+            payment_option?.payment_type === 'wallet' &&
+            wallet_method === 'cybersource_uc'
+          ) {
+            const mod = await import('@akinon/pz-cybersource-uc');
+
+            return typeof mod?.CyberSourceUcPaymentOption === 'function'
+              ? mod.CyberSourceUcPaymentOption
+              : fallbackView;
           }
 
           if (

package/middlewares/complete-wallet.ts

@@ -0,0 +1,179 @@
+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 '.';
+
+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: 'complete-wallet',
+        error
+      });
+    }
+
+    return result;
+  }
+  return null;
+};
+
+const withCompleteWallet =
+  (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('WalletRedirectCompletePage') === -1) {
+      return middleware(req, event);
+    }
+
+    const requestUrl = `${Settings.commerceUrl}/orders/checkout/${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 body = await streamToString(req.body);
+
+      if (!sessionId) {
+        logger.warn(
+          'Make sure that the SESSION_COOKIE_SAMESITE environment variable is set to None in Commerce.',
+          {
+            middleware: 'complete-wallet',
+            ip
+          }
+        );
+
+        return NextResponse.redirect(
+          `${url.origin}${getUrlPathWithLocale(
+            '/orders/checkout/',
+            req.cookies.get('pz-locale')?.value
+          )}`,
+          303
+        );
+      }
+
+      const request = await fetch(requestUrl, {
+        method: 'POST',
+        headers: requestHeaders,
+        body
+      });
+
+      logger.info('Complete Wallet payment request', {
+        requestUrl,
+        status: request.status,
+        requestHeaders,
+        ip
+      });
+
+      const response = await request.json();
+
+      const { context_list: contextList, errors } = response;
+      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: 'complete-wallet',
+          errors,
+          requestHeaders,
+          ip
+        });
+
+        return 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=/;`
+            }
+          }
+        );
+      }
+
+      logger.info('Order success page context list', {
+        middleware: 'complete-wallet',
+        contextList,
+        ip
+      });
+
+      if (!redirectUrl) {
+        logger.warn(
+          'No redirection url for order success page found in page_context. Redirecting to checkout page.',
+          {
+            middleware: 'complete-wallet',
+            requestHeaders,
+            response: JSON.stringify(response),
+            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: 'complete-wallet',
+        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);
+
+      nextResponse.headers.set(
+        'Set-Cookie',
+        request.headers.get('set-cookie') ?? ''
+      );
+
+      return nextResponse;
+    } catch (error) {
+      logger.error('Error while completing Wallet payment', {
+        middleware: 'complete-wallet',
+        error,
+        requestHeaders,
+        ip
+      });
+
+      return NextResponse.redirect(
+        `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`,
+        303
+      );
+    }
+  };
+
+export default withCompleteWallet;

package/middlewares/default.ts

@@ -12,6 +12,7 @@ import {
   withSavedCardRedirection,
   withThreeDRedirection,
   withUrlRedirection,
+  withCompleteWallet,
   withWalletCompleteRedirection
 } from '.';
 import { urlLocaleMatcherRegex } from '../utils';
@@ -228,6 +229,7 @@ const withPzDefault =
                     withCompleteGpay(
                       withCompleteMasterpass(
                         withSavedCardRedirection(
+                          withCompleteWallet(
                           withWalletCompleteRedirection(
                             async (
                               req: PzNextRequest,
@@ -459,6 +461,7 @@ const withPzDefault =
           )
         )
       )
+    )
     )(req, event);
   };
 

package/middlewares/index.ts

@@ -9,6 +9,7 @@ import withCompleteGpay from './complete-gpay';
 import withCompleteMasterpass from './complete-masterpass';
 import withCheckoutProvider from './checkout-provider';
 import withSavedCardRedirection from './saved-card-redirection';
+import withCompleteWallet from './complete-wallet';
 import withWalletCompleteRedirection from './wallet-complete-redirection';
 import { NextRequest } from 'next/server';
 
@@ -24,6 +25,7 @@ export {
   withCompleteMasterpass,
   withCheckoutProvider,
   withSavedCardRedirection,
+  withCompleteWallet,
   withWalletCompleteRedirection
 };
 

package/middlewares/locale.ts

@@ -77,7 +77,6 @@ const withLocale =
         req.method === 'GET'
       ) {
         // Redirect to existing or default locale
-
         url.pathname = getUrlPathWithLocale(
           url.pathname,
           req.cookies.get('pz-locale')?.value

package/package.json

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

package/plugins.d.ts

@@ -33,6 +33,18 @@ declare module '@akinon/pz-saved-card' {
 
 declare module '@akinon/pz-apple-pay' {}
 
+declare module '@akinon/pz-cybersource-uc/src/redux/middleware' {
+  export default middleware as any;
+}
+
+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-similar-products' {

package/plugins.js

@@ -16,6 +16,7 @@ module.exports = [
   'pz-tabby-extension',
   'pz-apple-pay',
   'pz-tamara-extension',
+  'pz-cybersource-uc',
   'pz-hepsipay',
   'pz-flow-payment'
 ];

package/redux/middlewares/index.ts

@@ -18,13 +18,11 @@ 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) => {
@@ -56,7 +54,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/reducers/index.ts

@@ -8,6 +8,7 @@ import { api } from '../../data/client/api';
 import { masterpassReducer } from '@akinon/pz-masterpass';
 import { otpReducer } from '@akinon/pz-otp';
 import { savedCardReducer } from '@akinon/pz-saved-card';
+import cyberSourceUcReducer from '@akinon/pz-cybersource-uc/src/redux/reducer';
 
 const fallbackReducer = (state = {}) => state;
 
@@ -19,7 +20,8 @@ const reducers = {
   header: headerReducer,
   masterpass: masterpassReducer || fallbackReducer,
   otp: otpReducer || fallbackReducer,
-  savedCard: savedCardReducer || fallbackReducer
+  savedCard: savedCardReducer || fallbackReducer,
+  cybersource_uc: cyberSourceUcReducer || fallbackReducer
 };
 
 export default reducers;

package/utils/redirect.ts

@@ -30,10 +30,6 @@ export const redirect = (path: string, type?: RedirectType) => {
     (locale) => locale.value === currentLocaleValue
   );
 
-  if (!currentLocale) {
-    currentLocaleValue = Settings.localization.defaultLocaleValue;
-  }
-
   const searchParams = new URLSearchParams(pageUrl.search);
 
   const callbackUrl =