@akinon/next 1.14.0 → 1.14.1

package/middlewares/url-redirection.ts

@@ -1,65 +1,65 @@
-import { NextFetchEvent, NextMiddleware } from 'next/server';
-import settings from 'settings';
-import { PzNextRequest } from '.';
-import logger from '../utils/log';
-import { urlLocaleMatcherRegex } from '../utils';
-import { getUrlPathWithLocale } from '../utils/localization';
-import { ROUTES } from 'routes';
-
-// This middleware is used to handle url redirections set in Omnitron
-
-const withUrlRedirection =
-  (middleware: NextMiddleware) =>
-  async (req: PzNextRequest, event: NextFetchEvent) => {
-    const url = req.nextUrl.clone();
-    const ip = req.headers.get('x-forwarded-for') ?? '';
-    const pathnameWithoutLocale = url.pathname.replace(
-      urlLocaleMatcherRegex,
-      ''
-    );
-
-    if (
-      Object.entries(ROUTES).find(([, value]) =>
-        new RegExp(`^${value}$`).test(pathnameWithoutLocale)
-      ) ||
-      pathnameWithoutLocale.startsWith('/orders')
-    ) {
-      return middleware(req, event);
-    }
-
-    try {
-      const request = await fetch(
-        `${settings.commerceUrl}${pathnameWithoutLocale}${url.search}`,
-        {
-          redirect: 'manual',
-          next: {
-            revalidate: 0
-          }
-        }
-      );
-
-      if (request.headers.get('location')) {
-        const location = request.headers.get('location');
-        const redirectUrl = new URL(
-          request.headers.get('location'),
-          location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
-        );
-
-        redirectUrl.pathname = getUrlPathWithLocale(
-          redirectUrl.pathname,
-          req.middlewareParams.rewrites.locale
-        );
-
-        return Response.redirect(redirectUrl.toString(), request.status);
-      }
-    } catch (error) {
-      logger.error('withUrlRedirection error', {
-        error,
-        ip
-      });
-    }
-
-    return middleware(req, event);
-  };
-
-export default withUrlRedirection;
+import { NextFetchEvent, NextMiddleware } from 'next/server';
+import settings from 'settings';
+import { PzNextRequest } from '.';
+import logger from '../utils/log';
+import { urlLocaleMatcherRegex } from '../utils';
+import { getUrlPathWithLocale } from '../utils/localization';
+import { ROUTES } from 'routes';
+
+// This middleware is used to handle url redirections set in Omnitron
+
+const withUrlRedirection =
+  (middleware: NextMiddleware) =>
+  async (req: PzNextRequest, event: NextFetchEvent) => {
+    const url = req.nextUrl.clone();
+    const ip = req.headers.get('x-forwarded-for') ?? '';
+    const pathnameWithoutLocale = url.pathname.replace(
+      urlLocaleMatcherRegex,
+      ''
+    );
+
+    if (
+      Object.entries(ROUTES).find(([, value]) =>
+        new RegExp(`^${value}$`).test(pathnameWithoutLocale)
+      ) ||
+      pathnameWithoutLocale.startsWith('/orders')
+    ) {
+      return middleware(req, event);
+    }
+
+    try {
+      const request = await fetch(
+        `${settings.commerceUrl}${pathnameWithoutLocale}${url.search}`,
+        {
+          redirect: 'manual',
+          next: {
+            revalidate: 0
+          }
+        }
+      );
+
+      if (request.headers.get('location')) {
+        const location = request.headers.get('location');
+        const redirectUrl = new URL(
+          request.headers.get('location'),
+          location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
+        );
+
+        redirectUrl.pathname = getUrlPathWithLocale(
+          redirectUrl.pathname,
+          req.middlewareParams.rewrites.locale
+        );
+
+        return Response.redirect(redirectUrl.toString(), request.status);
+      }
+    } catch (error) {
+      logger.error('withUrlRedirection error', {
+        error,
+        ip
+      });
+    }
+
+    return middleware(req, event);
+  };
+
+export default withUrlRedirection;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.14.0",
+  "version": "1.14.1",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -26,7 +26,7 @@
     "@typescript-eslint/eslint-plugin": "6.7.4",
     "@typescript-eslint/parser": "6.7.4",
     "eslint": "^8.14.0",
-    "@akinon/eslint-plugin-projectzero": "1.14.0",
+    "@akinon/eslint-plugin-projectzero": "1.14.1",
     "eslint-config-prettier": "8.5.0"
   }
 }

package/redux/hooks.ts

@@ -1,7 +1,7 @@
-'use client';
-
-import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
-import type { RootState, TypedDispatch } from 'redux/store';
-
-export const useAppDispatch = () => useDispatch<TypedDispatch>();
-export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;
+'use client';
+
+import { TypedUseSelectorHook, useDispatch, useSelector } from 'react-redux';
+import type { RootState, TypedDispatch } from 'redux/store';
+
+export const useAppDispatch = () => useDispatch<TypedDispatch>();
+export const useAppSelector: TypedUseSelectorHook<RootState> = useSelector;

package/redux/middlewares/index.ts

@@ -1,50 +1,50 @@
-'use client';
-
-import { signOut } from 'next-auth/react';
-import { ROUTES } from 'routes';
-import type { Middleware } from '@reduxjs/toolkit';
-import {
-  errorMiddleware,
-  contextListMiddleware,
-  preOrderMiddleware
-} from './checkout';
-import { api } from '../../data/client/api';
-import logger from '@akinon/next/utils/log';
-
-export const rtkQueryResponseHandler: Middleware =
-  ({ dispatch }) =>
-  (next) =>
-  (action) => {
-    return next(action);
-  };
-
-export const rtkQueryErrorHandler: Middleware =
-  () => (next) => async (action) => {
-    if (action?.payload?.status === 401) {
-      await signOut({
-        callbackUrl: `${ROUTES.AUTH}?callbackUrl=${window.location.pathname}`
-      });
-      logger.debug('Session expired: 401');
-
-      return;
-    }
-
-    if (action?.payload?.status === 404) {
-      logger.warn(
-        `404 - Not Found. Endpoint: ${action.meta.arg.endpointName}, url: ${action.meta.baseQueryMeta.request.url}`
-      );
-    }
-
-    return next(action);
-  };
-
-const middlewares = [
-  api.middleware,
-  rtkQueryResponseHandler,
-  rtkQueryErrorHandler,
-  errorMiddleware,
-  preOrderMiddleware,
-  contextListMiddleware
-];
-
-export default middlewares;
+'use client';
+
+import { signOut } from 'next-auth/react';
+import { ROUTES } from 'routes';
+import type { Middleware } from '@reduxjs/toolkit';
+import {
+  errorMiddleware,
+  contextListMiddleware,
+  preOrderMiddleware
+} from './checkout';
+import { api } from '../../data/client/api';
+import logger from '@akinon/next/utils/log';
+
+export const rtkQueryResponseHandler: Middleware =
+  ({ dispatch }) =>
+  (next) =>
+  (action) => {
+    return next(action);
+  };
+
+export const rtkQueryErrorHandler: Middleware =
+  () => (next) => async (action) => {
+    if (action?.payload?.status === 401) {
+      await signOut({
+        callbackUrl: `${ROUTES.AUTH}?callbackUrl=${window.location.pathname}`
+      });
+      logger.debug('Session expired: 401');
+
+      return;
+    }
+
+    if (action?.payload?.status === 404) {
+      logger.warn(
+        `404 - Not Found. Endpoint: ${action.meta.arg.endpointName}, url: ${action.meta.baseQueryMeta.request.url}`
+      );
+    }
+
+    return next(action);
+  };
+
+const middlewares = [
+  api.middleware,
+  rtkQueryResponseHandler,
+  rtkQueryErrorHandler,
+  errorMiddleware,
+  preOrderMiddleware,
+  contextListMiddleware
+];
+
+export default middlewares;

package/redux/reducers/checkout.ts

@@ -1,184 +1,184 @@
-'use client';
-
-import { createSlice } from '@reduxjs/toolkit';
-
-import {
-  Address,
-  BankAccount,
-  CheckoutStep,
-  CreditCardType,
-  DeliveryOption,
-  InstallmentOption,
-  PaymentChoice,
-  PaymentOption,
-  CheckoutCreditPaymentOption,
-  PreOrder,
-  RetailStore,
-  ShippingOption
-} from '../../types';
-
-export interface CheckoutState {
-  // TODO: Add types
-  errors: any;
-  hasGiftBox: boolean;
-  canGuestPurchase: boolean;
-  steps: {
-    current: CheckoutStep;
-    shipping: {
-      completed: boolean;
-      busy: boolean;
-    };
-    payment: {
-      completed: boolean;
-      busy: boolean;
-    };
-  };
-  preOrder: PreOrder;
-  addressList: Address[];
-  deliveryOptions: DeliveryOption[];
-  shippingOptions: ShippingOption[];
-  paymentOptions: PaymentOption[];
-  creditPaymentOptions: CheckoutCreditPaymentOption[];
-  selectedCreditPaymentPk: number;
-  paymentChoices: PaymentChoice[];
-  cardType: CreditCardType;
-  installmentOptions: InstallmentOption[];
-  bankAccounts: BankAccount[];
-  selectedBankAccountPk: number;
-  loyaltyBalance?: string;
-  retailStores: RetailStore[];
-}
-
-const initialState: CheckoutState = {
-  errors: null,
-  hasGiftBox: false,
-  canGuestPurchase: false,
-  steps: {
-    current: CheckoutStep.Shipping,
-    shipping: {
-      completed: false,
-      busy: false
-    },
-    payment: {
-      completed: false,
-      busy: false
-    }
-  },
-  preOrder: null,
-  addressList: [],
-  deliveryOptions: [],
-  shippingOptions: [],
-  paymentOptions: [],
-  creditPaymentOptions: [],
-  selectedCreditPaymentPk: null,
-  paymentChoices: [],
-  cardType: null,
-  installmentOptions: [],
-  bankAccounts: [],
-  selectedBankAccountPk: null,
-  retailStores: []
-};
-
-const checkoutSlice = createSlice({
-  name: 'checkout',
-  initialState,
-  reducers: {
-    resetCheckoutState() {
-      return initialState;
-    },
-    setErrors(state, { payload }) {
-      state.errors = payload;
-    },
-    setHasGiftBox(state, { payload }) {
-      state.hasGiftBox = payload;
-    },
-    setCanGuestPurchase(state, { payload }) {
-      state.canGuestPurchase = payload;
-    },
-    setCurrentStep(state, { payload }) {
-      state.steps.current = payload;
-    },
-    setShippingStepCompleted(state, { payload }) {
-      state.steps.shipping.completed = payload;
-    },
-    setShippingStepBusy(state, { payload }) {
-      state.steps.shipping.busy = payload;
-    },
-    setPaymentStepCompleted(state, { payload }) {
-      state.steps.payment.completed = payload;
-    },
-    setPaymentStepBusy(state, { payload }) {
-      state.steps.payment.busy = payload;
-    },
-    setPreOrder(state, { payload }) {
-      state.preOrder = payload;
-    },
-    setAddressList(state, { payload }) {
-      state.addressList = payload;
-    },
-    setDeliveryOptions(state, { payload }) {
-      state.deliveryOptions = payload;
-    },
-    setShippingOptions(state, { payload }) {
-      state.shippingOptions = payload;
-    },
-    setPaymentOptions(state, { payload }) {
-      state.paymentOptions = payload;
-    },
-    setPaymentChoices(state, { payload }) {
-      state.paymentChoices = payload;
-    },
-    setCreditPaymentOptions(state, { payload }) {
-      state.creditPaymentOptions = payload;
-    },
-    setSelectedCreditPaymentPk(state, { payload }) {
-      state.selectedCreditPaymentPk = payload;
-    },
-    setCardType(state, { payload }) {
-      state.cardType = payload;
-    },
-    setInstallmentOptions(state, { payload }) {
-      state.installmentOptions = payload;
-    },
-    setBankAccounts(state, { payload }) {
-      state.bankAccounts = payload;
-    },
-    setSelectedBankAccountPk(state, { payload }) {
-      state.selectedBankAccountPk = payload;
-    },
-    setLoyaltyBalance(state, { payload }) {
-      state.loyaltyBalance = payload;
-    },
-    setRetailStores(state, { payload }) {
-      state.retailStores = payload;
-    }
-  }
-});
-
-export const {
-  resetCheckoutState,
-  setErrors,
-  setHasGiftBox,
-  setCanGuestPurchase,
-  setCurrentStep,
-  setShippingStepCompleted,
-  setShippingStepBusy,
-  setPaymentStepCompleted,
-  setPaymentStepBusy,
-  setPreOrder,
-  setAddressList,
-  setDeliveryOptions,
-  setShippingOptions,
-  setPaymentOptions,
-  setCreditPaymentOptions,
-  setSelectedCreditPaymentPk,
-  setPaymentChoices,
-  setCardType,
-  setInstallmentOptions,
-  setBankAccounts,
-  setSelectedBankAccountPk,
-  setLoyaltyBalance,
-  setRetailStores
-} = checkoutSlice.actions;
-
-export default checkoutSlice.reducer;
+'use client';
+
+import { createSlice } from '@reduxjs/toolkit';
+
+import {
+  Address,
+  BankAccount,
+  CheckoutStep,
+  CreditCardType,
+  DeliveryOption,
+  InstallmentOption,
+  PaymentChoice,
+  PaymentOption,
+  CheckoutCreditPaymentOption,
+  PreOrder,
+  RetailStore,
+  ShippingOption
+} from '../../types';
+
+export interface CheckoutState {
+  // TODO: Add types
+  errors: any;
+  hasGiftBox: boolean;
+  canGuestPurchase: boolean;
+  steps: {
+    current: CheckoutStep;
+    shipping: {
+      completed: boolean;
+      busy: boolean;
+    };
+    payment: {
+      completed: boolean;
+      busy: boolean;
+    };
+  };
+  preOrder: PreOrder;
+  addressList: Address[];
+  deliveryOptions: DeliveryOption[];
+  shippingOptions: ShippingOption[];
+  paymentOptions: PaymentOption[];
+  creditPaymentOptions: CheckoutCreditPaymentOption[];
+  selectedCreditPaymentPk: number;
+  paymentChoices: PaymentChoice[];
+  cardType: CreditCardType;
+  installmentOptions: InstallmentOption[];
+  bankAccounts: BankAccount[];
+  selectedBankAccountPk: number;
+  loyaltyBalance?: string;
+  retailStores: RetailStore[];
+}
+
+const initialState: CheckoutState = {
+  errors: null,
+  hasGiftBox: false,
+  canGuestPurchase: false,
+  steps: {
+    current: CheckoutStep.Shipping,
+    shipping: {
+      completed: false,
+      busy: false
+    },
+    payment: {
+      completed: false,
+      busy: false
+    }
+  },
+  preOrder: null,
+  addressList: [],
+  deliveryOptions: [],
+  shippingOptions: [],
+  paymentOptions: [],
+  creditPaymentOptions: [],
+  selectedCreditPaymentPk: null,
+  paymentChoices: [],
+  cardType: null,
+  installmentOptions: [],
+  bankAccounts: [],
+  selectedBankAccountPk: null,
+  retailStores: []
+};
+
+const checkoutSlice = createSlice({
+  name: 'checkout',
+  initialState,
+  reducers: {
+    resetCheckoutState() {
+      return initialState;
+    },
+    setErrors(state, { payload }) {
+      state.errors = payload;
+    },
+    setHasGiftBox(state, { payload }) {
+      state.hasGiftBox = payload;
+    },
+    setCanGuestPurchase(state, { payload }) {
+      state.canGuestPurchase = payload;
+    },
+    setCurrentStep(state, { payload }) {
+      state.steps.current = payload;
+    },
+    setShippingStepCompleted(state, { payload }) {
+      state.steps.shipping.completed = payload;
+    },
+    setShippingStepBusy(state, { payload }) {
+      state.steps.shipping.busy = payload;
+    },
+    setPaymentStepCompleted(state, { payload }) {
+      state.steps.payment.completed = payload;
+    },
+    setPaymentStepBusy(state, { payload }) {
+      state.steps.payment.busy = payload;
+    },
+    setPreOrder(state, { payload }) {
+      state.preOrder = payload;
+    },
+    setAddressList(state, { payload }) {
+      state.addressList = payload;
+    },
+    setDeliveryOptions(state, { payload }) {
+      state.deliveryOptions = payload;
+    },
+    setShippingOptions(state, { payload }) {
+      state.shippingOptions = payload;
+    },
+    setPaymentOptions(state, { payload }) {
+      state.paymentOptions = payload;
+    },
+    setPaymentChoices(state, { payload }) {
+      state.paymentChoices = payload;
+    },
+    setCreditPaymentOptions(state, { payload }) {
+      state.creditPaymentOptions = payload;
+    },
+    setSelectedCreditPaymentPk(state, { payload }) {
+      state.selectedCreditPaymentPk = payload;
+    },
+    setCardType(state, { payload }) {
+      state.cardType = payload;
+    },
+    setInstallmentOptions(state, { payload }) {
+      state.installmentOptions = payload;
+    },
+    setBankAccounts(state, { payload }) {
+      state.bankAccounts = payload;
+    },
+    setSelectedBankAccountPk(state, { payload }) {
+      state.selectedBankAccountPk = payload;
+    },
+    setLoyaltyBalance(state, { payload }) {
+      state.loyaltyBalance = payload;
+    },
+    setRetailStores(state, { payload }) {
+      state.retailStores = payload;
+    }
+  }
+});
+
+export const {
+  resetCheckoutState,
+  setErrors,
+  setHasGiftBox,
+  setCanGuestPurchase,
+  setCurrentStep,
+  setShippingStepCompleted,
+  setShippingStepBusy,
+  setPaymentStepCompleted,
+  setPaymentStepBusy,
+  setPreOrder,
+  setAddressList,
+  setDeliveryOptions,
+  setShippingOptions,
+  setPaymentOptions,
+  setCreditPaymentOptions,
+  setSelectedCreditPaymentPk,
+  setPaymentChoices,
+  setCardType,
+  setInstallmentOptions,
+  setBankAccounts,
+  setSelectedBankAccountPk,
+  setLoyaltyBalance,
+  setRetailStores
+} = checkoutSlice.actions;
+
+export default checkoutSlice.reducer;