@akinon/next 1.45.0-rc.5 → 1.46.0

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.5",
+  "version": "1.46.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.5",
     "@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.46.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' {

package/redux/middlewares/checkout.ts

@@ -16,10 +16,8 @@ import {
   setPreOrder,
   setRetailStores,
   setShippingOptions,
-  setDataSourceShippingOptions,
   setShippingStepCompleted,
-  setCreditPaymentOptions,
-  setAttributeBasedShippingOptions
+  setCreditPaymentOptions
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
@@ -28,11 +26,10 @@ import { getCookie, setCookie } from '../../utils';
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../../localization';
 import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
-import { showRedirectionIframe } from '../../utils/redirection-iframe';
 
 interface CheckoutResult {
   payload: {
-    errors?: Record<string, string[]>;
+    errors?: any;
     pre_order?: PreOrder;
     context_list?: CheckoutContext[];
   };
@@ -76,10 +73,8 @@ export const preOrderMiddleware: Middleware = ({
       deliveryOptions,
       addressList: addresses,
       shippingOptions,
-      dataSourceShippingOptions,
       paymentOptions,
-      installmentOptions,
-      attributeBasedShippingOptions
+      installmentOptions
     } = getState().checkout;
     const { endpoints: apiEndpoints } = checkoutApi;
 
@@ -130,40 +125,6 @@ export const preOrderMiddleware: Middleware = ({
       dispatch(apiEndpoints.setShippingOption.initiate(shippingOptions[0].pk));
     }
 
-    if (
-      dataSourceShippingOptions.length > 0 &&
-      !preOrder.data_source_shipping_options
-    ) {
-      const selectedDataSourceShippingOptionsPks =
-        dataSourceShippingOptions.map(
-          (opt) => opt.data_source_shipping_options[0].pk
-        );
-
-      dispatch(
-        apiEndpoints.setDataSourceShippingOptions.initiate(
-          selectedDataSourceShippingOptionsPks
-        )
-      );
-    }
-
-    if (
-      Object.keys(attributeBasedShippingOptions).length > 0 &&
-      !preOrder.attribute_based_shipping_options
-    ) {
-      const initialSelectedOptions: Record<string, number> = Object.fromEntries(
-        Object.entries(attributeBasedShippingOptions).map(([key, options]) => [
-          key,
-          options[0].pk
-        ])
-      );
-
-      dispatch(
-        apiEndpoints.setAttributeBasedShippingOptions.initiate(
-          initialSelectedOptions
-        )
-      );
-    }
-
     if (!preOrder.payment_option && paymentOptions.length > 0) {
       dispatch(apiEndpoints.setPaymentOption.initiate(paymentOptions[0].pk));
     }
@@ -202,7 +163,6 @@ 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_frame ?? false;
 
         if (redirectUrl) {
           const currentLocale = getCookie('pz-locale');
@@ -221,19 +181,16 @@ export const contextListMiddleware: Middleware = ({
           }
 
           const urlObj = new URL(url, window.location.origin);
-          const isMobileDevice =
-            isMobileApp ||
-            /iPad|iPhone|iPod|Android/i.test(navigator.userAgent);
-          const isIframePaymentOptionExcluded =
-            !settings.checkout?.iframeExcludedPaymentOptions?.includes(
-              result.payload?.pre_order?.payment_option?.slug
-            );
           urlObj.searchParams.set('t', new Date().getTime().toString());
 
-          if (isMobileDevice && !isIframePaymentOptionExcluded) {
+          if (
+            (isMobileApp ||
+              /iPad|iPhone|iPod|Android/i.test(navigator.userAgent)) &&
+            !settings.checkout?.iframeExcludedPaymentOptions?.includes(
+              result.payload?.pre_order?.payment_option?.slug
+            )
+          ) {
             showMobile3dIframe(urlObj.toString());
-          } else if (isIframe && !isIframePaymentOptionExcluded) {
-            showRedirectionIframe(urlObj.toString());
           } else {
             window.location.href = urlObj.toString();
           }
@@ -263,28 +220,12 @@ export const contextListMiddleware: Middleware = ({
           dispatch(setShippingOptions(context.page_context.shipping_options));
         }
 
-        if (context.page_context.data_sources) {
-          dispatch(
-            setDataSourceShippingOptions(context.page_context.data_sources)
-          );
-        }
-
-        if (context.page_context.attribute_based_shipping_options) {
-          dispatch(
-            setAttributeBasedShippingOptions(
-              context.page_context.attribute_based_shipping_options
-            )
-          );
-        }
-
         if (context.page_context.payment_options) {
           dispatch(setPaymentOptions(context.page_context.payment_options));
         }
 
         if (context.page_context.credit_payment_options) {
-          dispatch(
-            setCreditPaymentOptions(context.page_context.credit_payment_options)
-          );
+          dispatch(setCreditPaymentOptions(context.page_context.credit_payment_options));
         }
 
         if (context.page_context.payment_choices) {

package/redux/reducers/checkout.ts

@@ -14,13 +14,12 @@ import {
   CheckoutCreditPaymentOption,
   PreOrder,
   RetailStore,
-  ShippingOption,
-  DataSource,
-  AttributeBasedShippingOption
+  ShippingOption
 } from '../../types';
 
 export interface CheckoutState {
-  errors: Record<string, string[]>;
+  // TODO: Add types
+  errors: any;
   hasGiftBox: boolean;
   canGuestPurchase: boolean;
   steps: {
@@ -38,7 +37,6 @@ export interface CheckoutState {
   addressList: Address[];
   deliveryOptions: DeliveryOption[];
   shippingOptions: ShippingOption[];
-  dataSourceShippingOptions: DataSource[];
   paymentOptions: PaymentOption[];
   creditPaymentOptions: CheckoutCreditPaymentOption[];
   selectedCreditPaymentPk: number;
@@ -49,8 +47,6 @@ export interface CheckoutState {
   selectedBankAccountPk: number;
   loyaltyBalance?: string;
   retailStores: RetailStore[];
-  attributeBasedShippingOptions: AttributeBasedShippingOption[];
-  selectedShippingOptions: Record<string, number>;
 }
 
 const initialState: CheckoutState = {
@@ -72,7 +68,6 @@ const initialState: CheckoutState = {
   addressList: [],
   deliveryOptions: [],
   shippingOptions: [],
-  dataSourceShippingOptions: [],
   paymentOptions: [],
   creditPaymentOptions: [],
   selectedCreditPaymentPk: null,
@@ -81,9 +76,7 @@ const initialState: CheckoutState = {
   installmentOptions: [],
   bankAccounts: [],
   selectedBankAccountPk: null,
-  retailStores: [],
-  attributeBasedShippingOptions: [],
-  selectedShippingOptions: {}
+  retailStores: []
 };
 
 const checkoutSlice = createSlice({
@@ -129,9 +122,6 @@ const checkoutSlice = createSlice({
     setShippingOptions(state, { payload }) {
       state.shippingOptions = payload;
     },
-    setDataSourceShippingOptions(state, { payload }) {
-      state.dataSourceShippingOptions = payload;
-    },
     setPaymentOptions(state, { payload }) {
       state.paymentOptions = payload;
     },
@@ -161,12 +151,6 @@ const checkoutSlice = createSlice({
     },
     setRetailStores(state, { payload }) {
       state.retailStores = payload;
-    },
-    setAttributeBasedShippingOptions(state, { payload }) {
-      state.attributeBasedShippingOptions = payload;
-    },
-    setSelectedShippingOptions: (state, { payload }) => {
-      state.selectedShippingOptions = payload;
     }
   }
 });
@@ -185,7 +169,6 @@ export const {
   setAddressList,
   setDeliveryOptions,
   setShippingOptions,
-  setDataSourceShippingOptions,
   setPaymentOptions,
   setCreditPaymentOptions,
   setSelectedCreditPaymentPk,
@@ -195,9 +178,7 @@ export const {
   setBankAccounts,
   setSelectedBankAccountPk,
   setLoyaltyBalance,
-  setRetailStores,
-  setAttributeBasedShippingOptions,
-  setSelectedShippingOptions
+  setRetailStores
 } = checkoutSlice.actions;
 
 export default checkoutSlice.reducer;

package/redux/reducers/config.ts

@@ -6,8 +6,6 @@ import { Config } from '../../types';
 const initialState: Config = {
   user_phone_regex: '^(05)\\d{9}$',
   user_phone_format: '05999999999',
-  user_post_code_regex: '^\\d{5}$',
-  user_post_code_format: '99999',
   country: {
     pk: 1,
     name: 'Türkiye',

package/types/commerce/account.ts

@@ -61,5 +61,4 @@ export type ContactFormType = {
   order?: string;
   country_code?: string;
   order_needed?: boolean;
-  file?: FileList
 };

package/types/commerce/address.ts

@@ -17,7 +17,7 @@ export type AddressFormType = {
   line: string;
   postcode: string;
   company_name?: string;
-  tax_no?: string;
+  tax_no?: number;
   tax_office?: string;
   e_bill_taxpayer?: boolean;
   country_code?: string;

package/types/commerce/b2b.ts

@@ -72,7 +72,7 @@ export type BasketItemType = {
   divisions: BasketItemDivision[];
   product: ProductB2b;
   product_remote_id: number;
-};
+}
 
 export type BasketParams = {
   division: string;
@@ -91,7 +91,7 @@ export type CreateQuotationParams = {
 export type UpdateProductParams = {
   product_remote_id: number;
   division: number;
-  quantity: number;
+  quantity: number
 };
 
 export type DeleteProductParams = {
@@ -115,13 +115,3 @@ export type DraftResponse = {
   total_amount: number;
   total_quantity: number;
 };
-
-export type BasketStatusResponse = {
-  is_ready: boolean;
-  status: string;
-  url: string;
-};
-
-export type ExportBasketResponse = {
-  cache_key: string;
-};

package/types/commerce/checkout.ts

@@ -33,23 +33,6 @@ export interface ShippingOption {
   slug: string;
 }
 
-export interface DataSource {
-  pk: number;
-  name: string;
-  data_source_shipping_options: DataSourceShippingOption[];
-}
-
-export interface DataSourceShippingOption {
-  pk: number;
-  shipping_amount: string;
-  shipping_option_name: string;
-  shipping_option_logo: string | null;
-  data_source: {
-    pk: number;
-    title: string | null;
-  };
-}
-
 export interface CheckoutAddressType {
   label: string;
   text: string;
@@ -95,8 +78,6 @@ export interface PreOrder {
   retail_store?: RetailStore;
   gift_box?: GiftBox;
   credit_payment_option?: CheckoutCreditPaymentOption;
-  data_source_shipping_options: any;
-  attribute_based_shipping_options?: AttributeBasedShippingOption[];
 }
 
 export interface GuestLoginFormParams {
@@ -136,7 +117,6 @@ export interface CheckoutContext {
     redirect_url?: string;
     context_data?: any;
     balance?: string;
-    attribute_based_shipping_options?: AttributeBasedShippingOption[];
     [key: string]: any;
   };
 }
@@ -162,13 +142,3 @@ export interface BankAccount {
   pk: number;
   sort_order: number;
 }
-
-export interface AttributeBasedShippingOption {
-  pk: number;
-  shipping_amount: string | null;
-  shipping_option_name: string | null;
-  shipping_option_logo: string | null;
-  attribute_value: string | null;
-  attribute_key: string;
-  [key: string]: any;
-}

package/types/commerce/misc.ts

@@ -2,8 +2,6 @@ import { District } from './address';
 export interface Config {
   user_phone_regex: string;
   user_phone_format: string;
-  user_post_code_regex: string;
-  user_post_code_format: string;
   country: {
     pk: number;
     name: string;

package/types/commerce/order.ts

@@ -52,10 +52,6 @@ export interface OrderItem {
   quantity: string;
   unit_price: string;
   total_amount: string;
-  attributes: {
-    gift_note: string;
-    [key: string]: any;
-  };
 }
 
 export interface Order {
@@ -109,14 +105,6 @@ export interface Order {
   shipping_option: number;
   tracking_number: string;
   tracking_url: string;
-  [key: string]: any;
-  bank: {
-    pk: number;
-    name: string;
-    slug: string;
-    logo: string;
-    [key: string]: any;
-  };
 }
 
 export interface Quotations {