@akinon/next 1.102.0-rc.79 → 1.102.0

package/data/server/product.ts

@@ -6,7 +6,7 @@ import { ServerVariables } from '../../utils/server-variables';
 import logger from '../../utils/log';
 
 type GetProduct = {
-  pk: number;
+  pk: number | string;
   locale?: string;
   currency?: string;
   searchParams?: URLSearchParams;
@@ -23,9 +23,21 @@ const getProductDataHandler = ({
   headers
 }: GetProduct) => {
   return async function () {
+    // Convert pk to number if it's a string and validate
+    const numericPk = typeof pk === 'string' ? parseInt(pk, 10) : pk;
+
+    if (isNaN(numericPk)) {
+      logger.warn('Invalid product pk provided', {
+        handler: 'getProductDataHandler',
+        pk,
+        numericPk
+      });
+      return null;
+    }
+
     let url = groupProduct
-      ? product.getGroupProductByPk(pk)
-      : product.getProductByPk(pk);
+      ? product.getGroupProductByPk(numericPk)
+      : product.getProductByPk(numericPk);
 
     if (searchParams) {
       url +=
@@ -35,10 +47,8 @@ const getProductDataHandler = ({
           .join('&');
     }
 
-    let data: ProductResult;
-
     try {
-      data = await appFetch<ProductResult>({
+      const data = await appFetch<ProductResult>({
         url,
         locale,
         currency,
@@ -50,23 +60,21 @@ const getProductDataHandler = ({
           }
         }
       });
-    } catch (error) {
-      logger.error('Failed to fetch product data', {
-        handler: 'getProductDataHandler',
-        pk,
-        error: error.message,
-        url
-      });
-      return null;
-    }
 
-    const categoryUrl = product.categoryUrl(data.product.pk);
+      // If product data is not found, return null to trigger 404
+      if (!data?.product?.pk) {
+        logger.warn('Product not found', {
+          handler: 'getProductDataHandler',
+          pk: numericPk,
+          hasData: !!data,
+          hasProduct: !!data?.product
+        });
+        return null;
+      }
 
-    let productCategoryData: ProductCategoryResult;
-    let breadcrumbData: { menu?: unknown } = {};
+      const categoryUrl = product.categoryUrl(data.product.pk);
 
-    try {
-      productCategoryData = await appFetch<ProductCategoryResult>({
+      const productCategoryData = await appFetch<ProductCategoryResult>({
         url: categoryUrl,
         locale,
         currency,
@@ -81,19 +89,16 @@ const getProductDataHandler = ({
       const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
 
       if (!menuItemModel) {
-        logger.warn(
-          'menuItemModel is undefined, skipping breadcrumbData fetch',
-          {
-            handler: 'getProductDataHandler',
-            pk
-          }
-        );
+        logger.warn('menuItemModel is undefined, skipping breadcrumbData fetch', {
+          handler: 'getProductDataHandler',
+          pk: numericPk
+        });
         return { data, breadcrumbData: undefined };
       }
 
       const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
 
-      breadcrumbData = await appFetch<{ menu?: unknown }>({
+      const breadcrumbData = await appFetch<any>({
         url: breadcrumbUrl,
         locale,
         currency,
@@ -104,19 +109,19 @@ const getProductDataHandler = ({
           }
         }
       });
+
+      return {
+        data,
+        breadcrumbData: breadcrumbData?.menu
+      };
     } catch (error) {
-      logger.warn('Failed to fetch breadcrumb data', {
+      logger.error('Error in getProductDataHandler', {
         handler: 'getProductDataHandler',
-        pk,
+        pk: numericPk,
         error: error.message
       });
-      // Continue without breadcrumb data
+      return null;
     }
-
-    return {
-      data,
-      breadcrumbData: breadcrumbData?.menu
-    };
   };
 };
 
@@ -128,9 +133,12 @@ export const getProductData = async ({
   groupProduct,
   headers
 }: GetProduct) => {
-  return Cache.wrap(
+  // 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'](
-      pk,
+      numericPkForCache,
       searchParams ?? new URLSearchParams()
     ),
     locale,
@@ -147,4 +155,13 @@ export const getProductData = async ({
       compressed: true
     }
   );
+
+  // If product data is not found, throw 404 error
+  if (!result) {
+    const error = new Error('Product not found') as Error & { status: number };
+    error.status = 404;
+    throw error;
+  }
+
+  return result;
 };

package/data/server/special-page.ts

@@ -15,24 +15,20 @@ const getSpecialPageDataHandler = (
   return async function () {
     const params = generateCommerceSearchParams(searchParams);
 
-    try {
-      const data: GetCategoryResponse = await appFetch({
-        url: `${category.getSpecialPageByPk(pk)}${params}`,
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json',
-            ...(headers ?? {})
-          }
+    const data: GetCategoryResponse = await appFetch({
+      url: `${category.getSpecialPageByPk(pk)}${params}`,
+      locale,
+      currency,
+      init: {
+        headers: {
+          Accept: 'application/json',
+          'Content-Type': 'application/json',
+          ...(headers ?? {})
         }
-      });
+      }
+    });
 
-      return data;
-    } catch (error) {
-      return null;
-    }
+    return data;
   };
 };
 

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 = {
@@ -251,7 +247,7 @@ export const widgets = {
 };
 
 export const form = {
-  getForm: (pk: number) => `/forms/${pk}/generate`
+  getForm: (pk: number) => `/forms/${pk}/generate/`
 };
 
 const URLS = {

package/hocs/server/with-segment-defaults.tsx

@@ -72,13 +72,10 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
 const checkRedisVariables = () => {
   const requiredVariableValues = [
     process.env.CACHE_HOST,
-    process.env.CACHE_PORT
+    process.env.CACHE_PORT,
+    process.env.CACHE_SECRET
   ];
 
-  if (!settings.usePrettyUrlRoute) {
-    requiredVariableValues.push(process.env.CACHE_SECRET);
-  }
-
   if (
     !requiredVariableValues.every((v) => v) &&
     process.env.NODE_ENV === 'production'

package/hooks/use-localization.ts

@@ -4,6 +4,7 @@ import { LocalizationContext } from '../localization/provider';
 import { useContext } from 'react';
 import { setCookie, urlLocaleMatcherRegex } from '../utils';
 import { LocaleUrlStrategy } from '../localization';
+import { useRouter } from 'next/navigation';
 
 export const useLocalization = () => {
   const {
@@ -17,6 +18,8 @@ export const useLocalization = () => {
     localeUrlStrategy
   } = useContext(LocalizationContext);
 
+  const router = useRouter();
+
   /**
    * Sets the locale in the URL.
    * @param locale Locale value defined in the settings.
@@ -27,8 +30,6 @@ export const useLocalization = () => {
 
     let targetUrl;
 
-    setCookie('pz-locale', locale);
-
     if (localeUrlStrategy === LocaleUrlStrategy.Subdomain) {
       const hostParts = hostname.split('.');
       const subDomain = hostParts[0];

package/middlewares/complete-gpay.ts

@@ -148,8 +148,7 @@ const withCompleteGpay =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-gpay',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/complete-masterpass.ts

@@ -149,8 +149,7 @@ const withCompleteMasterpass =
       logger.info('Redirecting to order success page', {
         middleware: 'complete-masterpass',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/default.ts

@@ -214,7 +214,6 @@ const withPzDefault =
 
     req.middlewareParams = {
       commerceUrl,
-      found: true,
       rewrites: {}
     };
 
@@ -339,24 +338,6 @@ const withPzDefault =
                                   middlewareResult = NextResponse.rewrite(url);
                                 }
 
-                                if (
-                                  !req.middlewareParams.found &&
-                                  Settings.customNotFoundEnabled
-                                ) {
-                                  const pathSegments = url.pathname
-                                    .replace(/\/+$/, '')
-                                    .split('/');
-                                  if (pathSegments.length >= 3) {
-                                    url.pathname = `/${pathSegments[1]}/${pathSegments[2]}/pz-not-found`;
-                                  } else {
-                                    url.pathname = '/pz-not-found';
-                                  }
-
-                                  middlewareResult = NextResponse.rewrite(url, {
-                                    status: 404
-                                  });
-                                }
-
                                 const { localeUrlStrategy } =
                                   Settings.localization;
 
@@ -406,38 +387,6 @@ const withPzDefault =
                                   }
                                 );
 
-                                if (
-                                  !url.pathname.startsWith(
-                                    `/${currency}/orders`
-                                  )
-                                ) {
-                                  const currentCookieLocale =
-                                    req.cookies.get('pz-locale')?.value;
-
-                                  const urlHasExplicitLocale =
-                                    url.pathname.match(urlLocaleMatcherRegex);
-                                  const shouldUpdateCookie =
-                                    !currentCookieLocale ||
-                                    urlHasExplicitLocale;
-
-                                  if (shouldUpdateCookie) {
-                                    middlewareResult.cookies.set(
-                                      'pz-locale',
-                                      locale?.length > 0
-                                        ? locale
-                                        : defaultLocaleValue,
-                                      {
-                                        domain: rootHostname,
-                                        sameSite: 'none',
-                                        secure: true,
-                                        expires: new Date(
-                                          Date.now() + 1000 * 60 * 60 * 24 * 7
-                                        ) // 7 days
-                                      }
-                                    );
-                                  }
-                                }
-
                                 if (
                                   req.cookies.get('pz-locale') &&
                                   req.cookies.get('pz-locale').value !== locale

package/middlewares/index.ts

@@ -30,7 +30,6 @@ export {
 export interface PzNextRequest extends NextRequest {
   middlewareParams: {
     commerceUrl: string;
-    found: boolean;
     rewrites: {
       locale?: string;
       prettyUrl?: string;

package/middlewares/locale.ts

@@ -23,15 +23,7 @@ const getMatchedLocale = (pathname: string, req: PzNextRequest) => {
       );
 
       if (subDomainLocaleMatched && subDomainLocaleMatched[0]) {
-        const subdomainLocale = subDomainLocaleMatched[0].slice(1);
-
-        const isValidSubdomainLocale = settings.localization.locales.find(
-          (l) => l.value === subdomainLocale
-        );
-
-        if (isValidSubdomainLocale) {
-          matchedLocale = subdomainLocale;
-        }
+        matchedLocale = subDomainLocaleMatched[0].slice(1);
       }
     }
   }

package/middlewares/pretty-url.ts

@@ -123,8 +123,6 @@ const withPrettyUrl =
       return middleware(req, event);
     }
 
-    req.middlewareParams.found = false;
-
     return middleware(req, event);
   };
 

package/middlewares/redirection-payment.ts

@@ -149,8 +149,7 @@ const withRedirectionPayment =
       logger.info('Redirecting to order success page', {
         middleware: 'redirection-payment',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/saved-card-redirection.ts

@@ -149,8 +149,7 @@ const withSavedCardRedirection =
       logger.info('Redirecting to order success page', {
         middleware: 'saved-card-redirection',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an 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 { ServerVariables } from '../utils/server-variables';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -148,8 +149,7 @@ const withThreeDRedirection =
       logger.info('Redirecting to order success page', {
         middleware: 'three-d-redirection',
         redirectUrlWithLocale,
-        ip,
-        setCookie: request.headers.get('set-cookie')
+        ip
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/url-redirection.ts

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

package/package.json

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

package/plugins.d.ts

@@ -31,14 +31,11 @@ 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-flow-payment' {}
-
-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;
-}

package/plugins.js

@@ -16,7 +16,5 @@ module.exports = [
   'pz-tabby-extension',
   'pz-apple-pay',
   'pz-tamara-extension',
-  'pz-hepsipay',
-  'pz-flow-payment',
-  'pz-similar-products'
+  'pz-flow-payment'
 ];

package/redux/middlewares/checkout.ts

@@ -51,11 +51,7 @@ export const errorMiddleware: Middleware = ({ dispatch }: MiddlewareParams) => {
     const result: CheckoutResult = next(action);
     const errors = result?.payload?.errors;
 
-    if (
-      !!errors &&
-      ((typeof errors === 'object' && Object.keys(errors).length > 0) ||
-        (Array.isArray(errors) && errors.length > 0))
-    ) {
+    if (errors) {
       dispatch(setErrors(errors));
     }
 
@@ -102,7 +98,7 @@ export const contextListMiddleware: Middleware = ({
     if (result?.payload?.context_list) {
       result.payload.context_list.forEach((context) => {
         const redirectUrl = context.page_context.redirect_url;
-        const isIframe = context.page_context.is_iframe ?? false;
+        const isIframe = context.page_context.is_frame ?? false;
 
         if (redirectUrl) {
           const currentLocale = getCookie('pz-locale');

package/types/commerce/order.ts

@@ -114,7 +114,6 @@ export interface Order {
     pk: number;
     name: string;
     slug: string;
-    logo: string;
     [key: string]: any;
   };
 }

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;
   };
@@ -298,13 +292,7 @@ export interface ButtonProps
   target?: '_blank' | '_self' | '_parent' | '_top';
 }
 
-export interface FileInputProps extends React.HTMLProps<HTMLInputElement> {
-  fileClassName?: string;
-  fileNameWrapperClassName?: string;
-  fileInputClassName?: string;
-  onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
-  buttonClassName?: string;
-}
+export type FileInputProps = React.HTMLProps<HTMLInputElement>;
 
 export interface PriceProps {
   currencyCode?: string;
@@ -325,19 +313,15 @@ export interface InputProps extends React.HTMLProps<HTMLInputElement> {
 
 export interface AccordionProps {
   isCollapse?: boolean;
-  collapseClassName?: string;
   title?: string;
   subTitle?: string;
   icons?: string[];
   iconSize?: number;
   iconColor?: string;
   children?: ReactNode;
-  headerClassName?: string;
   className?: string;
   titleClassName?: string;
-  subTitleClassName?: string;
   dataTestId?: string;
-  contentClassName?: string;
 }
 
 export interface PluginModuleComponentProps {
@@ -362,20 +346,3 @@ export interface PaginationProps {
   direction?: 'next' | 'prev';
   isLoading?: boolean;
 }
-
-export interface ModalProps {
-  portalId: string;
-  children?: React.ReactNode;
-  open?: boolean;
-  setOpen?: (open: boolean) => void;
-  title?: React.ReactNode;
-  showCloseButton?: React.ReactNode;
-  className?: string;
-  overlayClassName?: string;
-  headerWrapperClassName?: string;
-  titleClassName?: string;
-  closeButtonClassName?: string;
-  iconName?: string;
-  iconSize?: number;
-  iconClassName?: string;
-}

package/utils/app-fetch.ts

@@ -43,12 +43,12 @@ const appFetch = async <T>({
     const requestURL = `${decodeURIComponent(commerceUrl)}${url}`;
 
     init.headers = {
-      cookie: nextCookies.toString(),
       ...(init.headers ?? {}),
       ...(ServerVariables.globalHeaders ?? {}),
       'Accept-Language': currentLocale.apiValue,
       'x-currency': currency,
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      cookie: nextCookies.toString()
     };
 
     init.next = {
@@ -60,11 +60,6 @@ const appFetch = async <T>({
     status = req.status;
     logger.debug(`FETCH END ${url}`, { status: req.status, ip });
 
-    if (!req.ok) {
-      const errorMessage = `HTTP ${req.status}: ${req.statusText}`;
-      throw new Error(errorMessage);
-    }
-
     if (responseType === FetchResponseType.JSON) {
       response = (await req.json()) as T;
     } else {