@akinon/next 1.45.0-rc.0 → 1.45.0

package/data/client/account.ts

@@ -123,16 +123,15 @@ const accountApi = api.injectEndpoints({
       query: ({ page, status, limit }) =>
         buildClientRequestUrl(account.getQuotations(page, status, limit))
     }),
-    sendContact: builder.mutation<void, FormData>({
-      query: (body) => {
-        return {
-          url: buildClientRequestUrl(account.sendContact, {
-            useFormData: true
-          }),
-          method: 'POST',
-          body
-        };
-      }
+    sendContact: builder.mutation<void, ContactFormType>({
+      query: (body) => ({
+        url: buildClientRequestUrl(account.sendContact, {
+          contentType: 'application/json',
+          responseType: 'text'
+        }),
+        method: 'POST',
+        body
+      })
     }),
     cancelOrder: builder.mutation<void, AccountOrderCancellation>({
       query: ({ id, ...body }) => ({

package/data/client/address.ts

@@ -39,10 +39,7 @@ const addressApi = api.injectEndpoints({
       query: (city) =>
         buildClientRequestUrl(address.getRetailStoreTownships(city))
     }),
-    addAddress: builder.mutation<
-      Address,
-      Partial<Address> & { invalidateTag?: 'Addresses' | 'Checkout' }
-    >({
+    addAddress: builder.mutation<Address, Partial<Address>>({
       query: (body) => ({
         url: buildClientRequestUrl(address.base, {
           contentType: 'application/json'
@@ -53,16 +50,9 @@ const addressApi = api.injectEndpoints({
           type: body.is_corporate === 'true' ? 'corporate' : 'personal'
         }
       }),
-      invalidatesTags: (_, error, arg) => {
-        if (error) return [];
-        if (arg.invalidateTag) return [arg.invalidateTag];
-        return ['Addresses', 'Checkout'];
-      }
+      invalidatesTags: (_, error) => (error ? [] : ['Addresses', 'Checkout'])
     }),
-    editAddress: builder.mutation<
-      Address,
-      Partial<Address> & { invalidateTag?: 'Addresses' | 'Checkout' }
-    >({
+    editAddress: builder.mutation<Address, Partial<Address>>({
       query: ({ pk, ...body }) => ({
         url: buildClientRequestUrl(address.editAddress(pk), {
           contentType: 'application/json'
@@ -74,28 +64,14 @@ const addressApi = api.injectEndpoints({
           type: body.is_corporate === 'true' ? 'corporate' : 'personal'
         }
       }),
-      invalidatesTags: (_, error, arg) => {
-        if (error) return [];
-        if (arg.invalidateTag) return [arg.invalidateTag];
-        return ['Addresses', 'Checkout'];
-      }
+      invalidatesTags: (_, error) => (error ? [] : ['Addresses', 'Checkout']) // TODO: Invalidate one of these tags when necessary (e.g. Address page invalidates Addresses tag, Checkout page invalidates Checkout tag)
     }),
-    removeAddress: builder.mutation<
-      void,
-      number | { id: number; invalidateTag: 'Addresses' | 'Checkout' }
-    >({
-      query: (arg) => ({
-        url: buildClientRequestUrl(
-          address.removeAddress(typeof arg === 'number' ? arg : arg.id)
-        ),
+    removeAddress: builder.mutation<void, number>({
+      query: (id) => ({
+        url: buildClientRequestUrl(address.removeAddress(id)),
         method: 'DELETE'
       }),
-      invalidatesTags: (_, error, arg) => {
-        if (error) return [];
-        if (typeof arg === 'object' && arg.invalidateTag)
-          return [arg.invalidateTag];
-        return ['Addresses', 'Checkout'];
-      }
+      invalidatesTags: (_, error) => (error ? [] : ['Addresses', 'Checkout']) // TODO: Invalidate one of these tags when necessary (e.g. Address page invalidates Addresses tag, Checkout page invalidates Checkout tag)
     }),
     setDefaultAddress: builder.mutation<Address, Partial<Address>>({
       query: ({ pk, primary }) => ({

package/data/client/api.ts

@@ -9,7 +9,7 @@ import {
 } from '@reduxjs/toolkit/query/react';
 import settings from 'settings';
 import { getCookie } from '../../utils';
-import { RootState } from 'redux/store';
+import { RootState } from '@theme/redux/store';
 
 interface CustomBaseQueryApi extends BaseQueryApi {
   getState: () => RootState;

package/data/client/checkout.ts

@@ -1,11 +1,11 @@
 import {
   setBankAccounts,
-  setCardType,
   setInstallmentOptions,
   setPaymentStepBusy,
   setSelectedBankAccountPk,
   setSelectedCreditPaymentPk,
-  setShippingStepBusy
+  setShippingStepBusy,
+  setCardType
 } from '../../redux/reducers/checkout';
 import {
   CheckoutContext,
@@ -20,7 +20,6 @@ import { AppDispatch, AppStore, store } from 'redux/store';
 import settings from 'settings';
 import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
 import {
-  setCvcRequired,
   setError,
   setOtpModalVisible
 } from '@akinon/pz-masterpass/src/redux/reducer';
@@ -114,8 +113,7 @@ const completeMasterpassPayment = async (
     ? await buildDirectPurchaseForm(commonFormValues, params)
     : await buildPurchaseForm({
         ...commonFormValues,
-        selectedCard,
-        cardCvc: params?.card_cvv
+        selectedCard
       });
 
   window.MFS?.[
@@ -153,10 +151,6 @@ const completeMasterpassPayment = async (
       return;
     }
 
-    if (['5013', '5182'].includes(response.responseCode)) {
-      dispatch(setCvcRequired(true));
-    }
-
     if (
       response.token &&
       (response.responseCode == '0000' || response.responseCode == '')
@@ -379,22 +373,6 @@ export const checkoutApi = api.injectEndpoints({
         dispatch(setShippingStepBusy(false));
       }
     }),
-    setDataSourceShippingOptions: build.mutation<CheckoutResponse, number[]>({
-      query: (pks) => ({
-        url: buildClientRequestUrl(checkout.setDataSourceShippingOption, {
-          useFormData: true
-        }),
-        method: 'POST',
-        body: {
-          data_source_shipping_options: JSON.stringify(pks)
-        }
-      }),
-      async onQueryStarted(arg, { dispatch, queryFulfilled }) {
-        dispatch(setShippingStepBusy(true));
-        await queryFulfilled;
-        dispatch(setShippingStepBusy(false));
-      }
-    }),
     setRetailStore: build.mutation<CheckoutResponse, SetRetailStoreParams>({
       query: ({ retailStorePk, billingAddressPk }) => ({
         url: buildClientRequestUrl(
@@ -676,25 +654,6 @@ export const checkoutApi = api.injectEndpoints({
           notes
         }
       })
-    }),
-    setAttributeBasedShippingOptions: build.mutation<
-      CheckoutResponse,
-      Record<string, number>
-    >({
-      query: (options) => ({
-        url: buildClientRequestUrl(checkout.setAttributeBasedShippingOption, {
-          useFormData: true
-        }),
-        method: 'POST',
-        body: {
-          attribute_based_shipping_options: JSON.stringify(options)
-        }
-      }),
-      async onQueryStarted(arg, { dispatch, queryFulfilled }) {
-        dispatch(setShippingStepBusy(true));
-        await queryFulfilled;
-        dispatch(setShippingStepBusy(false));
-      }
     })
   }),
   overrideExisting: false
@@ -713,7 +672,6 @@ export const {
   useSetDeliveryOptionMutation,
   useSetAddressesMutation,
   useSetShippingOptionMutation,
-  useSetDataSourceShippingOptionsMutation,
   useSetPaymentOptionMutation,
   useSetBinNumberMutation,
   useSetInstallmentOptionMutation,
@@ -730,6 +688,5 @@ export const {
   useCompleteLoyaltyPaymentMutation,
   useGetCheckoutLoyaltyBalanceQuery,
   usePayWithLoyaltyBalanceMutation,
-  useSetOrderNoteMutation,
-  useSetAttributeBasedShippingOptionsMutation
+  useSetOrderNoteMutation
 } = checkoutApi;

package/data/server/category.ts

@@ -8,7 +8,7 @@ import logger from '../../utils/log';
 
 function getCategoryDataHandler(
   pk: number,
-  searchParams?: { [key: string]: string | string[] | undefined },
+  searchParams?: URLSearchParams,
   headers?: Record<string, string>
 ) {
   return async function () {
@@ -78,7 +78,7 @@ export const getCategoryData = ({
   headers
 }: {
   pk: number;
-  searchParams?: { [key: string]: string | string[] | undefined };
+  searchParams?: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(

package/data/server/list.ts

@@ -7,7 +7,7 @@ import { parse } from 'lossless-json';
 import logger from '../../utils/log';
 
 const getListDataHandler = (
-  searchParams: { [key: string]: string | string[] | undefined },
+  searchParams: URLSearchParams,
   headers?: Record<string, string>
 ) => {
   return async function () {
@@ -54,7 +54,7 @@ export const getListData = async ({
   searchParams,
   headers
 }: {
-  searchParams: { [key: string]: string | string[] | undefined };
+  searchParams: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(

package/data/server/product.ts

@@ -1,12 +1,15 @@
 import { Cache, CacheKey } from '../../lib/cache';
 import { product } from '../urls';
-import { ProductCategoryResult, ProductResult } from '../../types';
+import {
+  BreadcrumbResultType,
+  ProductCategoryResult,
+  ProductResult
+} from '../../types';
 import appFetch from '../../utils/app-fetch';
-import logger from '../../utils/log';
 
 type GetProduct = {
   pk: number;
-  searchParams?: { [key: string]: string | string[] | undefined };
+  searchParams?: URLSearchParams;
   groupProduct?: boolean;
 };
 
@@ -47,17 +50,9 @@ const getProductDataHandler = ({
       }
     );
 
-    const menuItemModel = productCategoryData?.results[0]?.menuitemmodel;
-
-    if (!menuItemModel) {
-      logger.warn('menuItemModel is undefined, skipping breadcrumbData fetch', {
-        handler: 'getProductDataHandler',
-        pk
-      });
-      return { data, breadcrumbData: undefined };
-    }
-
-    const breadcrumbUrl = product.breadcrumbUrl(menuItemModel);
+    const breadcrumbUrl = product.breadcrumbUrl(
+      productCategoryData.results[0].menuitemmodel
+    );
 
     const breadcrumbData = await appFetch<any>(breadcrumbUrl, {
       headers: {
@@ -79,7 +74,10 @@ export const getProductData = async ({
   groupProduct
 }: GetProduct) => {
   return Cache.wrap(
-    CacheKey[groupProduct ? 'GroupProduct' : 'Product'](pk, searchParams ?? {}),
+    CacheKey[groupProduct ? 'GroupProduct' : 'Product'](
+      pk,
+      searchParams ?? new URLSearchParams()
+    ),
     getProductDataHandler({ pk, searchParams, groupProduct }),
     {
       expire: 300

package/data/server/special-page.ts

@@ -7,7 +7,7 @@ import header from '../../redux/reducers/header';
 
 const getSpecialPageDataHandler = (
   pk: number,
-  searchParams: { [key: string]: string | string[] | undefined },
+  searchParams: URLSearchParams,
   headers?: Record<string, string>
 ) => {
   return async function () {
@@ -34,7 +34,7 @@ export const getSpecialPageData = async ({
   headers
 }: {
   pk: number;
-  searchParams: { [key: string]: string | string[] | undefined };
+  searchParams: URLSearchParams;
   headers?: Record<string, string>;
 }) => {
   return Cache.wrap(

package/data/urls.ts

@@ -83,8 +83,6 @@ export const checkout = {
   setDeliveryOption: '/orders/checkout/?page=DeliveryOptionSelectionPage',
   setAddresses: '/orders/checkout/?page=AddressSelectionPage',
   setShippingOption: '/orders/checkout/?page=ShippingOptionSelectionPage',
-  setDataSourceShippingOption:
-    '/orders/checkout/?page=DataSourceShippingOptionSelectionPage',
   setPaymentOption: '/orders/checkout/?page=PaymentOptionSelectionPage',
   setBinNumber: '/orders/checkout/?page=BinNumberPage',
   setMasterpassBinNumber: '/orders/checkout/?page=MasterpassBinNumberPage',
@@ -110,9 +108,7 @@ export const checkout = {
   completeLoyaltyPayment: '/orders/checkout/?page=LoyaltyPaymentSelectedPage',
   loyaltyMoneyUsage: '/orders/checkout/?page=LoyaltyMoneyUsagePage',
   setOrderNote: '/orders/checkout/?page=OrderNotePage',
-  couponSelectionPage: '/orders/checkout/?page=CouponSelectionPage',
-  setAttributeBasedShippingOption:
-    '/orders/checkout/?page=AttributeBasedShippingOptionSelectionPage'
+  couponSelectionPage: '/orders/checkout/?page=CouponSelectionPage'
 };
 
 export const flatpage = {

package/hooks/index.ts

@@ -8,5 +8,4 @@ export * from './use-media-query';
 export * from './use-on-click-outside';
 export * from './use-mobile-iframe-handler';
 export * from './use-payment-options';
-export * from './use-pagination';
-export * from './use-message-listener';
+export * from './use-pagination';

package/hooks/use-payment-options.ts

@@ -18,8 +18,7 @@ export const usePaymentOptions = () => {
     pay_on_delivery: 'pz-pay-on-delivery',
     bkm_express: 'pz-bkm',
     credit_payment: 'pz-credit-payment',
-    masterpass: 'pz-masterpass',
-    gpay: 'pz-gpay'
+    masterpass: 'pz-masterpass'
   };
 
   const isInitialTypeIncluded = (type: string) => initialTypes.has(type);

package/lib/cache.ts

@@ -20,16 +20,13 @@ const hashCacheKey = (object?: Record<string, string>) => {
   return `_${encodeURIComponent(cacheKey)}`;
 };
 export const CacheKey = {
-  List: (
-    searchParams: { [key: string]: string | string[] | undefined },
-    headers?: Record<string, string>
-  ) =>
+  List: (searchParams: URLSearchParams, headers?: Record<string, string>) =>
     `list_${encodeURIComponent(JSON.stringify(searchParams))}${hashCacheKey(
       headers
     )}`,
   Category: (
     pk: number,
-    searchParams?: { [key: string]: string | string[] | undefined },
+    searchParams?: URLSearchParams,
     headers?: Record<string, string>
   ) =>
     `category_${pk}_${encodeURIComponent(
@@ -38,20 +35,15 @@ export const CacheKey = {
   CategorySlug: (slug: string) => `category_${slug}`,
   SpecialPage: (
     pk: number,
-    searchParams: { [key: string]: string | string[] | undefined },
+    searchParams: URLSearchParams,
     headers?: Record<string, string>
   ) =>
     `special_page_${pk}_${encodeURIComponent(
       JSON.stringify(searchParams)
     )}${hashCacheKey(headers)}`,
-  Product: (
-    pk: number,
-    searchParams: { [key: string]: string | string[] | undefined }
-  ) => `product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
-  GroupProduct: (
-    pk: number,
-    searchParams: { [key: string]: string | string[] | undefined }
-  ) =>
+  Product: (pk: number, searchParams: URLSearchParams) =>
+    `product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
+  GroupProduct: (pk: number, searchParams: URLSearchParams) =>
     `group_product_${pk}_${encodeURIComponent(JSON.stringify(searchParams))}`,
   FlatPage: (pk: number) => `flat_page_${pk}`,
   LandingPage: (pk: number) => `landing_page_${pk}`,
@@ -166,10 +158,6 @@ export class Cache {
     handler: () => Promise<T>,
     options?: CacheOptions
   ): Promise<T> {
-    if (Settings.usePrettyUrlRoute) {
-      return await handler();
-    }
-
     const requiredVariables = [
       process.env.CACHE_HOST,
       process.env.CACHE_PORT,

package/middlewares/default.ts

@@ -69,10 +69,6 @@ const withPzDefault =
       return NextResponse.json({ status: 'ok' });
     }
 
-    if (url.pathname.startsWith('/metrics')) {
-      return new NextResponse(null, { status: 200 });
-    }
-
     if (req.nextUrl.pathname.startsWith('/.well-known')) {
       const url = new URL(`${Settings.commerceUrl}${req.nextUrl.pathname}`);
       const req_ = await fetch(url.toString());
@@ -88,44 +84,14 @@ const withPzDefault =
       req.nextUrl.pathname.includes('/orders/hooks/') ||
       req.nextUrl.pathname.includes('/orders/checkout-with-token/')
     ) {
-      const segment = url.searchParams.get('segment');
-      const currency = url.searchParams.get('currency')?.toLowerCase();
-
-      const headers = {};
-
-      if (segment) {
-        headers['X-Segment-Id'] = segment;
-      }
-
-      if (currency) {
-        headers['x-currency'] = currency;
-      }
-
-      const response = NextResponse.rewrite(
+      return NextResponse.rewrite(
         new URL(
           `${Settings.commerceUrl}${req.nextUrl.pathname.replace(
             urlLocaleMatcherRegex,
             ''
           )}`
-        ),
-        {
-          headers
-        }
+        )
       );
-
-      if (segment) {
-        response.cookies.set('pz-segment', segment);
-      }
-
-      if (currency) {
-        response.cookies.set('pz-currency', currency, {
-          sameSite: 'none',
-          secure: true,
-          expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7) // 7 days
-        });
-      }
-
-      return response;
     }
 
     if (req.nextUrl.pathname.startsWith('/orders/redirection/')) {
@@ -237,20 +203,6 @@ const withPzDefault =
                               );
                             }
 
-                            if (
-                              Settings.usePrettyUrlRoute &&
-                              url.searchParams.toString().length > 0 &&
-                              !Object.entries(ROUTES).find(([, value]) =>
-                                new RegExp(`^${value}/?$`).test(
-                                  pathnameWithoutLocale
-                                )
-                              )
-                            ) {
-                              url.pathname =
-                                url.pathname +
-                                `searchparams|${url.searchParams.toString()}`;
-                            }
-
                             Settings.rewrites.forEach((rewrite) => {
                               url.pathname = url.pathname.replace(
                                 rewrite.source,

package/middlewares/locale.ts

@@ -5,6 +5,22 @@ import { LocaleUrlStrategy } from '../localization';
 import { urlLocaleMatcherRegex } from '../utils';
 import logger from '../utils/log';
 
+const getMatchedLocale = (pathname: string) => {
+  let matchedLocale = pathname.match(urlLocaleMatcherRegex)?.[0] ?? '';
+  matchedLocale = matchedLocale.replace('/', '');
+
+  if (!matchedLocale.length) {
+    if (
+      settings.localization.localeUrlStrategy !==
+      LocaleUrlStrategy.ShowAllLocales
+    ) {
+      matchedLocale = settings.localization.defaultLocaleValue;
+    }
+  }
+
+  return matchedLocale;
+};
+
 const withLocale =
   (middleware: NextMiddleware) =>
   async (req: PzNextRequest, event: NextFetchEvent) => {
@@ -12,12 +28,12 @@ const withLocale =
 
     try {
       const url = req.nextUrl.clone();
-      const {
-        locales,
-        localeUrlStrategy,
-        defaultLocaleValue,
-        redirectToDefaultLocale
-      } = settings.localization;
+      const matchedLocale = getMatchedLocale(url.pathname);
+      let { localeUrlStrategy, defaultLocaleValue, redirectToDefaultLocale } =
+        settings.localization;
+
+      localeUrlStrategy =
+        localeUrlStrategy ?? LocaleUrlStrategy.HideDefaultLocale;
 
       if (!defaultLocaleValue) {
         logger.error('Default locale value is not defined in settings.', {
@@ -29,34 +45,16 @@ const withLocale =
       }
 
       if (
-        locales.length === 1 &&
-        localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales
+        !matchedLocale?.length &&
+        localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales &&
+        redirectToDefaultLocale &&
+        req.method === 'GET'
       ) {
-        const singleLocale = locales[0].value;
-        const pathParts = url.pathname.split('/').filter(Boolean);
-
-        if (pathParts[0] === singleLocale) {
-          url.pathname = '/' + pathParts.slice(1).join('/');
-          return NextResponse.redirect(url);
-        }
-
-        req.middlewareParams.rewrites.locale = singleLocale;
-      } else {
-        const matchedLocale =
-          url.pathname.match(urlLocaleMatcherRegex)?.[0]?.replace('/', '') ||
-          '';
-        if (
-          !matchedLocale &&
-          localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales &&
-          redirectToDefaultLocale &&
-          req.method === 'GET'
-        ) {
-          url.pathname = `/${defaultLocaleValue}${url.pathname}`;
-          return NextResponse.redirect(url);
-        }
-        req.middlewareParams.rewrites.locale =
-          matchedLocale || defaultLocaleValue;
+        url.pathname = `/${defaultLocaleValue}${url.pathname}`;
+        return NextResponse.redirect(url);
       }
+
+      req.middlewareParams.rewrites.locale = matchedLocale;
     } catch (error) {
       logger.error('withLocale error', {
         error,

package/middlewares/pretty-url.ts

@@ -56,10 +56,6 @@ const resolvePrettyUrl = async (pathname: string, ip: string | null) => {
 const withPrettyUrl =
   (middleware: NextMiddleware) =>
   async (req: PzNextRequest, event: NextFetchEvent) => {
-    if (Settings.usePrettyUrlRoute) {
-      return middleware(req, event);
-    }
-
     const url = req.nextUrl.clone();
     const matchedLanguagePrefix = url.pathname.match(
       urlLocaleMatcherRegex

package/middlewares/url-redirection.ts

@@ -11,10 +11,6 @@ import { ROUTES } from 'routes';
 const withUrlRedirection =
   (middleware: NextMiddleware) =>
   async (req: PzNextRequest, event: NextFetchEvent) => {
-    if (settings.usePrettyUrlRoute) {
-      return middleware(req, event);
-    }
-
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const pathnameWithoutLocale = url.pathname.replace(

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.45.0-rc.0",
+  "version": "1.45.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -20,22 +20,21 @@
     "@opentelemetry/sdk-trace-node": "1.19.0",
     "@opentelemetry/semantic-conventions": "1.19.0",
     "@reduxjs/toolkit": "1.9.7",
-    "@neshca/cache-handler": "1.5.1",
     "cross-spawn": "7.0.3",
     "generic-pool": "3.9.0",
     "react-redux": "8.1.3",
     "react-string-replace": "1.1.1",
-    "redis": "4.6.13",
-    "semver": "7.6.2",
+    "redis": "4.5.1",
+    "semver": "7.5.4",
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.45.0-rc.0",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
+    "@akinon/eslint-plugin-projectzero": "1.45.0",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/plugins.d.ts

@@ -12,7 +12,6 @@ declare module '@akinon/pz-masterpass/src/utils' {
 declare module '@akinon/pz-masterpass/src/redux/reducer' {
   export const setError: any;
   export const setOtpModalVisible: any;
-  export const setCvcRequired: any;
 }
 
 declare module '@akinon/pz-otp' {