@akinon/next 2.0.23-rc.0 → 2.0.24-beta.0

package/CHANGELOG.md

@@ -1,31 +1,25 @@
 # @akinon/next
 
-## 2.0.23-rc.0
+## 2.0.24-beta.0
 
 ### Patch Changes
 
-- 0cf9ea23: BRDG-16491: Prevent redirect when iframe payment is active
-- 324f97d5: ZERO-4219: replace masterpass-rest-complete with masterpass-rest-callback
-- 51ea0688: ZERO-4377: Fix checkout card type state being cleared after valid bin number responses.
-- ZERO-4160: Enhance oauth-login middleware with improved request handling and logging
-- b55acb768: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
-- 760258c1: ZERO-4160: Enhance oauth-login middleware to handle fetch errors and improve response handling
-- 143be2b9d: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
-- 7889b08f: ZERO-4276: Enhance route generation by adding .env loading and custom skip segments support
-- 9f8cd3bc5: ZERO-3449: AI Search Active Filters & Crop Style changes have been implemented
-- d51fa68e: ZERO-4399: add card rewards to pz-masterpass-rest
-- bfafa3f4: ZERO-4160: Refactor oauth-login middleware to use fetchCommerce for API calls and improve cookie handling
-- 57d7eb30: ZERO-4276: Refactor route generation logic by removing environment loading and simplifying skip segments handling
-- d99a6a7d5: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
-- 9db81a71: ZERO-4365: Remove brand `@theme/*` alias imports from library packages
-- 591e345e: ZERO-3855: Enhance credit card payment handling in checkout middlewares
-- 4de5303c5: ZERO-2504: add cookie filter to api client request
-- 95b139dc1: ZERO-3795: Remove duplicate entry for SavedCard in PluginComponents map
-- 1d00f2d0: BRDG-16664: Set secure flag for CSRF token cookies in useCaptcha and default middleware
-- 4ac7b2a1: ZERO-4219: fix masterpass-rest callback route format and double-encoded error cookie
-- 4998a963: ZERO-4168: Add server-side payload optimization
-- 3909d322: Edit the duplicate Plugin.SimilarProducts in the plugin-module.
-- e18836b2: ZERO-4160: Restore scope in Sentry addon configuration in akinon.json
+- cbbbfd75: ZERO-4376: Bootstrap beta cycle (next-main pre-release motor)
+
+## 2.0.23
+
+### Patch Changes
+
+- 079fc67: ZERO-4522: Normalize searchParams at the entry of server data functions so v2 brand SSR no longer drops query params and no longer collides on a single Redis cache entry.
+
+  `withSegmentDefaults` converts Next 16's plain searchParams into a `URLSearchParams` instance for v1 brand compatibility. The instance then flowed into `getProductData` / `getCategoryData` / `getListData` / `getSpecialPageData` and broke two things:
+
+  - `JSON.stringify(new URLSearchParams(...))` returns `"{}"`, so every cache key for the same `pk` collapsed onto one Redis entry. The first user's filtered/variant response was served to every subsequent visitor.
+  - `getProductData`'s outbound URL builder used `Object.keys(searchParams).map(...)`, which returns `[]` for `URLSearchParams`. The backend product fetch silently dropped every query param — variant/attribute selections on the PDP never reached the commerce backend, and the add-to-cart button stayed stuck in its loading state.
+
+  Add `normalizeSearchParams` (`packages/akinon-next/utils/normalize-search-params.ts`) and call it once at the entry of each public data function. Multi-value URLSearchParams keys (`?color=red&color=blue`) collapse to `string[]` so multi-select filters survive. v1 brand pages keep receiving `URLSearchParams` from the HOC — only the internal data layer canonicalizes. No public signature change.
+
+  Side note: v1 brand PDP requests will now actually forward `?` params to the commerce backend instead of silently dropping them. Any v1 brand that relied on PDP requests ignoring query strings should smoke-test variant fetches.
 
 ## 2.0.22
 

package/bin/pz-generate-routes.js

@@ -6,7 +6,6 @@ const findBaseDir = require('../utils/find-base-dir');
 
 const generateRoutes = () => {
   const baseDir = findBaseDir();
-
   const srcDir = path.join(baseDir, 'src');
   const appDir = path.join(srcDir, 'app');
 
@@ -35,10 +34,8 @@ const generateRoutes = () => {
     '[segment]',
     '[url]',
     '[theme]',
-    '[member_type]',
-    '[clienttype]'
+    '[member_type]'
   ];
-
   const skipCatchAllRoutes = ['[...prettyurl]', '[...not_found]'];
 
   const walkDirectory = (dir, basePath = '') => {

package/components/plugin-module.tsx

@@ -116,6 +116,7 @@ const PluginComponents = new Map([
     ]
   ],
   [Plugin.SavedCard, [Component.SavedCard, Component.IyzicoSavedCard]],
+  [Plugin.SavedCard, [Component.SavedCard]],
   [Plugin.FlowPayment, [Component.FlowPayment]],
   [
     Plugin.VirtualTryOn,

package/data/client/checkout.ts

@@ -738,6 +738,7 @@ export const checkoutApi = api.injectEndpoints({
       },
       async onQueryStarted(arg, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));
+        dispatch(setCardType(arg));
         await queryFulfilled;
         dispatch(setPaymentStepBusy(false));
       }

package/data/server/category.ts

@@ -1,5 +1,6 @@
 import { GetCategoryResponse, SearchParams } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
+import { normalizeSearchParams } from '../../utils/normalize-search-params';
 import appFetch, { FetchResponseType } from '../../utils/app-fetch';
 import { category, product } from '../urls';
 import { Cache, CacheKey } from '../../lib/cache';
@@ -7,8 +8,6 @@ import { parse } from 'lossless-json';
 import logger from '../../utils/log';
 import { headers as nHeaders } from 'next/headers';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
-import settings from 'settings';
 
 function getCategoryDataHandler(
   pk: number,
@@ -82,7 +81,7 @@ function getCategoryDataHandler(
   };
 }
 
-export const getCategoryData = async ({
+export const getCategoryData = ({
   pk,
   searchParams,
   headers,
@@ -95,7 +94,9 @@ export const getCategoryData = async ({
   searchParams?: SearchParams;
   headers?: Record<string, string>;
 }) => {
-  const result = await Cache.wrap(
+  searchParams = normalizeSearchParams(searchParams);
+
+  return Cache.wrap(
     CacheKey.Category(pk, searchParams, headers),
     locale,
     getCategoryDataHandler(pk, locale, currency, searchParams, headers),
@@ -104,16 +105,6 @@ export const getCategoryData = async ({
       compressed: true
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result?.data) {
-    try {
-      return { ...result, data: optimizeCategoryResponse(result.data, settings.payloadOptimization) };
-    } catch (e) {
-      logger.error('Payload optimization failed for category', { pk, error: (e as Error).message });
-    }
-  }
-
-  return result;
 };
 
 function getCategoryBySlugDataHandler(

package/data/server/list.ts

@@ -2,12 +2,11 @@ import { Cache, CacheKey } from '../../lib/cache';
 import { category } from '../urls';
 import { GetCategoryResponse, SearchParams } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
+import { normalizeSearchParams } from '../../utils/normalize-search-params';
 import appFetch, { FetchResponseType } from '../../utils/app-fetch';
 import { parse } from 'lossless-json';
 import logger from '../../utils/log';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
-import settings from 'settings';
 
 const getListDataHandler = (
   locale,
@@ -68,7 +67,9 @@ export const getListData = async ({
   searchParams: SearchParams;
   headers?: Record<string, string>;
 }) => {
-  const result = await Cache.wrap(
+  searchParams = normalizeSearchParams(searchParams);
+
+  return Cache.wrap(
     CacheKey.List(searchParams, headers),
     locale,
     getListDataHandler(locale, currency, searchParams, headers),
@@ -77,14 +78,4 @@ export const getListData = async ({
       compressed: true
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result) {
-    try {
-      return optimizeCategoryResponse(result, settings.payloadOptimization);
-    } catch (e) {
-      logger.error('Payload optimization failed for list', { error: (e as Error).message });
-    }
-  }
-
-  return result;
 };

package/data/server/product.ts

@@ -2,10 +2,9 @@ import { Cache, CacheKey } from '../../lib/cache';
 import { product } from '../urls';
 import { ProductCategoryResult, ProductResult, SearchParams } from '../../types';
 import appFetch from '../../utils/app-fetch';
+import { normalizeSearchParams } from '../../utils/normalize-search-params';
 import { ServerVariables } from '../../utils/server-variables';
 import logger from '../../utils/log';
-import { optimizeProductResponse } from '../../utils/payload-optimizer';
-import settings from 'settings';
 
 type GetProduct = {
   pk: number | string;
@@ -135,13 +134,15 @@ export const getProductData = async ({
   groupProduct,
   headers
 }: GetProduct) => {
+  searchParams = normalizeSearchParams(searchParams);
+
   // Convert pk to number for cache key if it's a string
   const numericPkForCache = typeof pk === 'string' ? parseInt(pk, 10) : pk;
 
   const result = await Cache.wrap(
     CacheKey[groupProduct ? 'GroupProduct' : 'Product'](
       numericPkForCache,
-      searchParams ?? new URLSearchParams()
+      searchParams ?? {}
     ),
     locale,
     getProductDataHandler({
@@ -165,13 +166,5 @@ export const getProductData = async ({
     throw error;
   }
 
-  if (settings.payloadOptimization?.enabled && result?.data) {
-    try {
-      return { ...result, data: optimizeProductResponse(result.data, settings.payloadOptimization) };
-    } catch (e) {
-      logger.error('Payload optimization failed for product', { pk, error: (e as Error).message });
-    }
-  }
-
   return result;
 };

package/data/server/special-page.ts

@@ -2,11 +2,9 @@ import { Cache, CacheKey } from '../../lib/cache';
 import { category } from '../urls';
 import { GetCategoryResponse, SearchParams } from '../../types';
 import { generateCommerceSearchParams } from '../../utils';
+import { normalizeSearchParams } from '../../utils/normalize-search-params';
 import appFetch from '../../utils/app-fetch';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
-import logger from '../../utils/log';
-import settings from 'settings';
 
 const getSpecialPageDataHandler = (
   pk: number,
@@ -48,7 +46,9 @@ export const getSpecialPageData = async ({
   searchParams: SearchParams;
   headers?: Record<string, string>;
 }) => {
-  const result = await Cache.wrap(
+  searchParams = normalizeSearchParams(searchParams);
+
+  return Cache.wrap(
     CacheKey.SpecialPage(pk, searchParams, headers),
     locale,
     getSpecialPageDataHandler(pk, locale, currency, searchParams, headers),
@@ -57,14 +57,4 @@ export const getSpecialPageData = async ({
       compressed: true
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result) {
-    try {
-      return optimizeCategoryResponse(result, settings.payloadOptimization);
-    } catch (e) {
-      logger.error('Payload optimization failed for special-page', { pk, error: (e as Error).message });
-    }
-  }
-
-  return result;
 };

package/data/server/widget.ts

@@ -4,9 +4,6 @@ import { CacheOptions, WidgetResultType, WidgetSchemaType } from '../../types';
 import appFetch from '../../utils/app-fetch';
 import { widgets } from '../urls';
 import { ServerVariables } from '../../utils/server-variables';
-import { optimizeWidgetResponse } from '../../utils/payload-optimizer';
-import logger from '../../utils/log';
-import settings from 'settings';
 
 const getWidgetDataHandler =
   (
@@ -56,7 +53,7 @@ export const getWidgetData = async <T>({
   cacheOptions?: CacheOptions;
   headers?: Record<string, string>;
 }): Promise<WidgetResultType<T>> => {
-  const result = await Cache.wrap(
+  return Cache.wrap(
     CacheKey.Widget(slug),
     locale,
     getWidgetDataHandler(slug, locale, currency, headers),
@@ -65,16 +62,6 @@ export const getWidgetData = async <T>({
       ...cacheOptions
     }
   );
-
-  if (settings.payloadOptimization?.enabled && result) {
-    try {
-      return optimizeWidgetResponse(result, settings.payloadOptimization) as WidgetResultType<T>;
-    } catch (e) {
-      logger.error('Payload optimization failed for widget', { slug, error: (e as Error).message });
-    }
-  }
-
-  return result as WidgetResultType<T>;
 };
 
 const getCollectionWidgetDataHandler =

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/hooks/use-captcha.tsx

@@ -39,7 +39,7 @@ export const useCaptcha = () => {
   };
 
   if (csrfToken) {
-    setCookie('csrftoken', csrfToken, { secure: true });
+    setCookie('csrftoken', csrfToken);
   }
 
   const onCaptchaChange = useCallback(async (response) => {