@akinon/next 1.118.0-rc.8 → 1.118.0

package/CHANGELOG.md

@@ -1,60 +1,10 @@
 # @akinon/next
 
-## 1.118.0-rc.8
+## 1.118.0
 
 ### Minor Changes
 
-- 31b4a266: ZERO-4102: Add support for post-checkout redirect in middleware
-
-## 1.118.0-rc.7
-
-## 1.118.0-rc.6
-
-## 1.118.0-rc.5
-
-### Minor Changes
-
-- aef81c5d: ZERO-4034: Refactor checkout API to use dynamic store imports for improved performance
-- 49c82e1a: ZERO-4047: Remove Sentry configuration from default Next.js config
-
-## 1.118.0-rc.4
-
-### Minor Changes
-
-- 0754c835: ZERO-4063: Add support for optional Redis password in cache handlers
-
-## 1.118.0-rc.3
-
-### Minor Changes
-
-- 94a86fcc: ZERO-4065: Expand skipSegments array to include additional segments for route generation
-
-## 1.118.0-rc.2
-
-### Minor Changes
-
-- 8a7fd0f4: ZERO-4065: Add '[segment]' to skipSegments in route generation
-
-## 1.118.0-rc.1
-
-## 1.118.0-rc.0
-
-### Minor Changes
-
-- d2c0e759: ZERO-3684: Handle cross-origin iframe access in iframeURLChange function
-- b55acb76: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
-- 36143125: ZERO-3987: Add barcode scanner functionality with modal and button
-- f7e0f646: ZERO-4032: Add bfcache-headers middleware, integrate it into the default chain, and introduce a new environment variable for control.
-- 143be2b9: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
-- 9f8cd3bc: ZERO-3449: AI Search Active Filters & Crop Style changes have been implemented
 - 729fe756: ZERO-3895: improve non-3D payment handling and error display
-- d99a6a7d: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
-- d7e5178b: ZERO-3985: Add query string handling for orders redirection in middleware
-- 591e345e: ZERO-3855: Enhance credit card payment handling in checkout middlewares
-- 4de5303c: ZERO-2504: add cookie filter to api client request
-- b59fdd1c: ZERO-4009: Add password reset token validation
-- 95b139dc: ZERO-3795: Remove duplicate entry for SavedCard in PluginComponents map
-- 3909d322: Edit the duplicate Plugin.SimilarProducts in the plugin-module.
 
 ## 1.117.0
 

package/bin/pz-generate-routes.js

@@ -25,16 +25,7 @@ const generateRoutes = () => {
   const routes = [];
   const excludedDirs = ['api', 'pz-not-found'];
 
-  const skipSegments = [
-    '[commerce]',
-    '[locale]',
-    '[currency]',
-    '[session]',
-    '[segment]',
-    '[url]',
-    '[theme]',
-    '[member_type]'
-  ];
+  const skipSegments = ['[commerce]', '[locale]', '[currency]'];
   const skipCatchAllRoutes = ['[...prettyurl]', '[...not_found]'];
 
   const walkDirectory = (dir, basePath = '') => {

package/components/plugin-module.tsx

@@ -55,7 +55,6 @@ export enum Component {
   SavedCard = 'SavedCardOption',
   VirtualTryOnPlugin = 'VirtualTryOnPlugin',
   BasketVirtualTryOn = 'BasketVirtualTryOn',
-  BarcodeScannerPlugin = 'BarcodeScannerPlugin',
   IyzicoSavedCard = 'IyzicoSavedCardOption',
   Hepsipay = 'Hepsipay',
   FlowPayment = 'FlowPayment',
@@ -114,10 +113,11 @@ const PluginComponents = new Map([
     ]
   ],
   [Plugin.SavedCard, [Component.SavedCard, Component.IyzicoSavedCard]],
+  [Plugin.SavedCard, [Component.SavedCard]],
   [Plugin.FlowPayment, [Component.FlowPayment]],
   [
     Plugin.VirtualTryOn,
-    [Component.VirtualTryOnPlugin, Component.BasketVirtualTryOn, Component.BarcodeScannerPlugin]
+    [Component.VirtualTryOnPlugin, Component.BasketVirtualTryOn]
   ],
   [Plugin.Hepsipay, [Component.Hepsipay]],
   [Plugin.MasterpassRest, [Component.MasterpassRest]],

package/data/client/account.ts

@@ -77,10 +77,6 @@ interface LoyaltyTransactions {
   }[];
 }
 
-interface PasswordResetValidateResponse {
-  validlink: boolean;
-}
-
 const accountApi = api.injectEndpoints({
   endpoints: (builder) => ({
     updatePassword: builder.mutation<void, AccountChangePasswordFormType>({
@@ -225,12 +221,6 @@ const accountApi = api.injectEndpoints({
     }),
     getLoyaltyTransactions: builder.query<LoyaltyTransactions, void>({
       query: () => buildClientRequestUrl(account.loyaltyTransactions)
-    }),
-    getValidatePasswordResetToken: builder.query<
-      PasswordResetValidateResponse,
-      string
-    >({
-      query: (slug) => buildClientRequestUrl(account.passwordReset(slug))
     })
   }),
   overrideExisting: true
@@ -257,6 +247,5 @@ export const {
   usePasswordResetMutation,
   useAnonymizeMutation,
   useGetLoyaltyBalanceQuery,
-  useGetLoyaltyTransactionsQuery,
-  useGetValidatePasswordResetTokenQuery
+  useGetLoyaltyTransactionsQuery
 } = accountApi;

package/data/client/checkout.ts

@@ -20,7 +20,7 @@ import {
 import { buildClientRequestUrl } from '../../utils';
 import { api } from './api';
 import { checkout } from '../urls';
-import type { AppDispatch, AppStore } from 'redux/store';
+import { AppDispatch, AppStore, store } from 'redux/store';
 import settings from 'settings';
 import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
 import {
@@ -33,11 +33,6 @@ import {
   buildPurchaseForm
 } from '@akinon/pz-masterpass/src/utils';
 
-const getStore = async (): Promise<AppStore> => {
-  const { store } = await import('redux/store');
-  return store;
-};
-
 interface CheckoutResponse {
   pre_order?: PreOrder;
   errors: {
@@ -236,32 +231,25 @@ export const checkoutApi = api.injectEndpoints({
       CheckoutResponse,
       CompleteCreditCardParams
     >({
-      async queryFn(
-        {
-          card_holder,
-          card_cvv,
-          card_number,
-          card_month,
-          card_year,
-          use_three_d = true,
-          save = undefined
-        },
-        _queryApi,
-        _extraOptions,
-        baseQuery
-      ) {
-        const reduxStore = await getStore();
+      query: ({
+        card_holder,
+        card_cvv,
+        card_number,
+        card_month,
+        card_year,
+        use_three_d = true,
+        save = undefined
+      }) => {
         const paymentOption =
-          reduxStore.getState().checkout?.preOrder?.payment_option;
+          store.getState().checkout?.preOrder?.payment_option;
 
         if (paymentOption?.payment_type === 'masterpass') {
-          const result = await baseQuery({
+          return {
             url: buildClientRequestUrl(checkout.getMasterpassOrderNo, {
               useFormData: true
             }),
             method: 'POST'
-          });
-          return result as { data: CheckoutResponse } | { error: any };
+          };
         }
 
         const body: Record<string, string> = {
@@ -278,19 +266,18 @@ export const checkoutApi = api.injectEndpoints({
           body.save = save ? '1' : '0';
         }
 
-        const result = await baseQuery({
+        return {
           url: buildClientRequestUrl(checkout.completeCreditCardPayment, {
             useFormData: true
           }),
           method: 'POST',
           body
-        });
-        return result as { data: CheckoutResponse } | { error: any };
+        };
       },
       async onQueryStarted(args, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));
         const { data } = await queryFulfilled;
-        const reduxStore = await getStore();
+        const reduxStore = (await import('redux/store')).store;
         const completePaymentContext = data?.context_list?.find(
           (context) => context?.page_name === 'MasterpassCompletePage'
         );
@@ -535,16 +522,15 @@ export const checkoutApi = api.injectEndpoints({
       }
     }),
     setBinNumber: build.mutation<CheckoutResponse, string>({
-      async queryFn(binNumber, _queryApi, _extraOptions, baseQuery) {
-        const reduxStore = await getStore();
+      query: (binNumber: string) => {
         const paymentOption =
-          reduxStore.getState().checkout?.preOrder?.payment_option;
+          store.getState().checkout?.preOrder?.payment_option;
         const binNumberUrl =
           paymentOption?.payment_type === 'masterpass'
             ? checkout.setMasterpassBinNumber
             : checkout.setBinNumber;
 
-        const result = await baseQuery({
+        return {
           url: buildClientRequestUrl(binNumberUrl, {
             useFormData: true
           }),
@@ -552,8 +538,7 @@ export const checkoutApi = api.injectEndpoints({
           body: {
             bin_number: binNumber
           }
-        });
-        return result as { data: CheckoutResponse } | { error: any };
+        };
       },
       async onQueryStarted(arg, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));
@@ -563,16 +548,14 @@ export const checkoutApi = api.injectEndpoints({
       }
     }),
     setInstallmentOption: build.mutation<CheckoutResponse, number>({
-      async queryFn(pk, _queryApi, _extraOptions, baseQuery) {
-        const reduxStore = await getStore();
+      query: (pk: number) => {
         const paymentOption =
-          reduxStore.getState().checkout?.preOrder?.payment_option;
+          store.getState().checkout?.preOrder?.payment_option;
         const installmentOption =
           paymentOption?.payment_type === 'masterpass'
             ? checkout.setMasterPassInstallmentOption
             : checkout.setInstallmentOption;
-
-        const result = await baseQuery({
+        return {
           url: buildClientRequestUrl(installmentOption, {
             useFormData: true
           }),
@@ -580,8 +563,7 @@ export const checkoutApi = api.injectEndpoints({
           body: {
             installment: String(pk)
           }
-        });
-        return result as { data: CheckoutResponse } | { error: any };
+        };
       },
       async onQueryStarted(arg, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));

package/data/urls.ts

@@ -183,11 +183,7 @@ export const product = {
   breadcrumbUrl: (menuitemmodel: string) =>
     `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
   bundleProduct: (productPk: string, queryString: string) =>
-    `/bundle-product/${productPk}/?${queryString}`,
-  similarProducts: (params?: string) =>
-    `/similar-products${params ? `?${params}` : ''}`,
-  similarProductsList: (params?: string) =>
-    `/similar-product-list${params ? `?${params}` : ''}`
+    `/bundle-product/${productPk}/?${queryString}`
 };
 
 export const wishlist = {

package/lib/cache-handler.mjs

@@ -364,17 +364,11 @@ CacheHandler.onCreation(async () => {
     };
   }
 
-  const redisOptions = {
+  const redisHandler = createRedisHandler({
     client,
     timeoutMs: CACHE_CONFIG.redis.timeoutMs,
     keyExpirationStrategy: 'EXPIREAT'
-  };
-
-  if (process.env.CACHE_PASSWORD) {
-    redisOptions.password = process.env.CACHE_PASSWORD;
-  }
-
-  const redisHandler = createRedisHandler(redisOptions);
+  });
 
   const localHandler = createLruHandler(CACHE_CONFIG.lru);
 

package/lib/cache.ts

@@ -155,14 +155,9 @@ export class Cache {
           process.env.CACHE_PORT
         }/${process.env.CACHE_BUCKET ?? '0'}`;
 
-        const options = {
-          url: redisUrl,
-          ...(process.env.CACHE_PASSWORD && {
-            password: process.env.CACHE_PASSWORD
-          })
-        };
-
-        const client: RedisClientType = createClient(options);
+        const client: RedisClientType = createClient({
+          url: redisUrl
+        });
 
         client.on('error', (error) => {
           logger.error('Redis client error', { redisUrl, error });

package/middlewares/default.ts

@@ -14,8 +14,7 @@ import {
   withUrlRedirection,
   withCompleteWallet,
   withWalletCompleteRedirection,
-  withMasterpassRestCallback,
-  withBfcacheHeaders
+  withMasterpassRestCallback
 } from '.';
 import { urlLocaleMatcherRegex } from '../utils';
 import withCurrency from './currency';
@@ -102,7 +101,6 @@ const withPzDefault =
     if (
       req.nextUrl.pathname.includes('/orders/hooks/') ||
       req.nextUrl.pathname.includes('/orders/checkout-with-token/') ||
-      req.nextUrl.pathname.includes('/orders/post-checkout') ||
       req.nextUrl.pathname.includes('/hooks/cash_register/complete/') ||
       req.nextUrl.pathname.includes('/hooks/cash_register/pre_order/')
     ) {
@@ -130,13 +128,8 @@ const withPzDefault =
     }
 
     if (req.nextUrl.pathname.startsWith('/orders/redirection/')) {
-      const queryString = searchParams.toString();
       return NextResponse.rewrite(
-        new URL(
-          `${encodeURI(Settings.commerceUrl)}/orders/redirection/${
-            queryString ? `?${queryString}` : ''
-          }`
-        )
+        new URL(`${encodeURI(Settings.commerceUrl)}/orders/redirection/`)
       );
     }
 
@@ -240,11 +233,10 @@ const withPzDefault =
                           withCompleteWallet(
                             withWalletCompleteRedirection(
                               withMasterpassRestCallback(
-                                withBfcacheHeaders(
-                                  async (
-                                    req: PzNextRequest,
-                                    event: NextFetchEvent
-                                  ) => {
+                                async (
+                                  req: PzNextRequest,
+                                  event: NextFetchEvent
+                                ) => {
                                   let middlewareResult: NextResponse | void =
                                     NextResponse.next();
 
@@ -465,7 +457,7 @@ const withPzDefault =
                                   }
 
                                   return middlewareResult;
-                                })
+                                }
                               )
                             )
                           )

package/middlewares/index.ts

@@ -12,7 +12,6 @@ import withSavedCardRedirection from './saved-card-redirection';
 import withCompleteWallet from './complete-wallet';
 import withWalletCompleteRedirection from './wallet-complete-redirection';
 import withMasterpassRestCallback from './masterpass-rest-callback';
-import withBfcacheHeaders from './bfcache-headers';
 import { NextRequest } from 'next/server';
 
 export {
@@ -29,8 +28,7 @@ export {
   withSavedCardRedirection,
   withCompleteWallet,
   withWalletCompleteRedirection,
-  withMasterpassRestCallback,
-  withBfcacheHeaders
+  withMasterpassRestCallback
 };
 
 export interface PzNextRequest extends NextRequest {

package/package.json

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

package/plugins.d.ts

@@ -37,16 +37,6 @@ declare module '@akinon/pz-cybersource-uc/src/redux/middleware' {
   export default middleware as any;
 }
 
-declare module '@akinon/pz-apple-pay' {}
-
-declare module '@akinon/pz-similar-products' {
-  export const SimilarProductsModal: any;
-  export const SimilarProductsFilterSidebar: any;
-  export const SimilarProductsResultsGrid: any;
-  export const SimilarProductsPlugin: any;
-  export const SimilarProductsButtonPlugin: any;
-}
-
 declare module '@akinon/pz-cybersource-uc/src/redux/reducer' {
   export default reducer as any;
 }

package/plugins.js

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

package/redux/middlewares/checkout.ts

@@ -204,25 +204,15 @@ export const contextListMiddleware: Middleware = ({
             (ctx) => ctx.page_name === 'DeliveryOptionSelectionPage'
           )
         ) {
-          const isCreditCardPayment =
-            preOrder?.payment_option?.payment_type === 'credit_card' ||
-            preOrder?.payment_option?.payment_type === 'masterpass';
-
           if (context.page_context.card_type) {
             dispatch(setCardType(context.page_context.card_type));
-          } else if (isCreditCardPayment) {
-            dispatch(setCardType(null));
           }
 
           if (
             context.page_context.installments &&
             preOrder?.payment_option?.payment_type !== 'masterpass_rest'
           ) {
-            if (!isCreditCardPayment || context.page_context.card_type) {
-              dispatch(
-                setInstallmentOptions(context.page_context.installments)
-              );
-            }
+            dispatch(setInstallmentOptions(context.page_context.installments));
           }
         }
 

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

@@ -14,17 +14,9 @@ export const installmentOptionMiddleware: Middleware = ({
       return result;
     }
 
-    const { installmentOptions, cardType } = getState().checkout;
+    const { installmentOptions } = getState().checkout;
     const { endpoints: apiEndpoints } = checkoutApi;
 
-    const isCreditCardPayment =
-      preOrder?.payment_option?.payment_type === 'credit_card' ||
-      preOrder?.payment_option?.payment_type === 'masterpass';
-
-    if (isCreditCardPayment && !cardType) {
-      return result;
-    }
-
     if (
       !preOrder?.installment &&
       preOrder?.payment_option?.payment_type !== 'saved_card' &&

package/types/index.ts

@@ -83,12 +83,6 @@ export interface Settings {
   };
   usePrettyUrlRoute?: boolean;
   commerceUrl: string;
-  /**
-   * This option allows you to track Sentry events on the client side, in addition to server and edge environments.
-   *
-   * It overrides process.env.NEXT_PUBLIC_SENTRY_DSN and process.env.SENTRY_DSN.
-   */
-  sentryDsn?: string;
   redis: {
     defaultExpirationTime: number;
   };

package/utils/index.ts

@@ -204,23 +204,6 @@ export const getPosError = () => {
   return error;
 };
 
-export const checkPaymentWillRedirect = (response: {
-  context_list?: Array<{
-    page_name: string;
-    page_context?: { context_data?: { redirect_url?: string } };
-  }>;
-  redirect_url?: string;
-  errors?: unknown;
-}): boolean => {
-  if (!response) return false;
-
-  const hasThankYouPage = response.context_list?.some(
-    (c) => c.page_name === 'ThankYouPage'
-  );
-
-  return Boolean(hasThankYouPage || response.redirect_url);
-};
-
 export const urlSchemes = [
   'http',
   'tel:',

package/utils/mobile-3d-iframe.ts

@@ -1,14 +1,8 @@
 const iframeURLChange = (iframe, callback) => {
   iframe.addEventListener('load', () => {
     setTimeout(() => {
-      try {
-        if (iframe?.contentWindow?.location) {
-          const iframeLocation = iframe.contentWindow.location;
-
-          callback(iframeLocation);
-        }
-      } catch (error) {
-        // Expected: browser blocks cross-origin iframe access for security
+      if (iframe?.contentWindow?.location) {
+        callback(iframe.contentWindow.location);
       }
     }, 0);
   });

package/utils/redirection-iframe.ts

@@ -1,14 +1,8 @@
 const iframeURLChange = (iframe, callback) => {
   iframe.addEventListener('load', () => {
     setTimeout(() => {
-      try {
-        if (iframe?.contentWindow?.location) {
-          const iframeLocation = iframe.contentWindow.location;
-
-          callback(iframeLocation);
-        }
-      } catch (error) {
-        // Expected: browser blocks cross-origin iframe access for security
+      if (iframe?.contentWindow?.location) {
+        callback(iframe.contentWindow.location);
       }
     }, 0);
   });

package/with-pz-config.js

@@ -65,7 +65,10 @@ const defaultConfig = {
       translations: false
     };
     return config;
-  }
+  },
+  sentry: {
+    hideSourceMaps: true
+  } // TODO: This section will be reviewed again in the Sentry 8 update.
 };
 
 const withPzConfig = (

package/api/barcode-search.ts

@@ -1,59 +0,0 @@
-import { NextRequest, NextResponse } from 'next/server';
-import Settings from 'settings';
-
-export async function GET(request: NextRequest) {
-  try {
-    const { searchParams } = new URL(request.url);
-    const barcode = searchParams.get('search_text');
-
-    if (!barcode) {
-      return NextResponse.json(
-        { error: 'Missing search_text parameter (barcode)' },
-        { status: 400 }
-      );
-    }
-
-    if (Settings.commerceUrl === 'default') {
-      return NextResponse.json(
-        { error: 'Commerce URL is not configured' },
-        { status: 500 }
-      );
-    }
-
-    const queryParams = new URLSearchParams();
-    queryParams.append('search_text', barcode);
-
-    searchParams.forEach((value, key) => {
-      if (key !== 'search_text') {
-        queryParams.append(key, value);
-      }
-    });
-
-    const apiUrl = `${Settings.commerceUrl}/list/?${queryParams.toString()}`;
-
-    const headers: Record<string, string> = {
-      Accept: 'application/json',
-      'Content-Type': 'application/json'
-    };
-
-    const response = await fetch(apiUrl, {
-      method: 'GET',
-      headers
-    });
-
-    if (!response.ok) {
-      return NextResponse.json(
-        { error: `API request failed with status: ${response.status}` },
-        { status: response.status }
-      );
-    }
-
-    const data = await response.json();
-    return NextResponse.json(data);
-  } catch (error) {
-    return NextResponse.json(
-      { error: (error as Error).message },
-      { status: 500 }
-    );
-  }
-}

package/middlewares/bfcache-headers.ts

@@ -1,18 +0,0 @@
-import { NextMiddleware } from 'next/server';
-
-const withBfcacheHeaders = (middleware: NextMiddleware): NextMiddleware => {
-  return async (req, event) => {
-    const response = await middleware(req, event);
-
-    if (process.env.BF_CACHE === 'true' && response) {
-      response.headers.set(
-        'Cache-Control',
-        'private, no-cache, max-age=0, must-revalidate'
-      );
-    }
-
-    return response;
-  };
-};
-
-export default withBfcacheHeaders;