@akinon/next 1.81.0 → 1.82.0

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @akinon/next
 
+## 1.82.0
+
+### Minor Changes
+
+- 2e0b7ff: ZERO-3226: Refactor checkoutApi to simplify request body structure by removing device_info parameter
+- 778aabf: ZERO-3163: Add frontend ID header to authentication requests and forgot password mutation
+- c0fef07: ZERO-3197: Refetch payment options after loyalty usage
+- 2d2ab44: ZERO-3226: Add device_info param to WalletPaymentPage request
+- 0200d56: ZERO-3163: Add frontendIds property to Settings interface
+- 7d1b5af: ZERO-3206: Encode search parameters in product data URL
+- aa05ed7: ZERO-3170: Add commerceRedirectionIgnoreList to settings and update URL redirection middleware
+
 ## 1.81.0
 
 ### Minor Changes

package/api/auth.ts

@@ -92,6 +92,8 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
             req.headers['x-app-device']?.toString() ?? ''
           );
 
+          headers.set('x-frontend-id', req.cookies['pz-frontend-id'] || '');
+
           logger.debug('Trying to login/register', {
             formType: credentials.formType,
             userIp

package/data/client/api.ts

@@ -72,6 +72,7 @@ export const api = createApi({
     'DraftsB2b',
     'Product',
     'Checkout',
+    'PaymentOptions',
     'Favorite',
     'Addresses',
     'Profile',

package/data/client/checkout.ts

@@ -2,6 +2,7 @@ import {
   setBankAccounts,
   setCardType,
   setInstallmentOptions,
+  setPaymentOptions,
   setPaymentStepBusy,
   setSelectedBankAccountPk,
   setSelectedCreditPaymentPk,
@@ -424,6 +425,12 @@ export const checkoutApi = api.injectEndpoints({
         }
       })
     }),
+    fetchPaymentOptions: build.query<CheckoutResponse, void>({
+      query: () => ({
+        url: buildClientRequestUrl(checkout.setPaymentOption)
+      }),
+      providesTags: ['PaymentOptions']
+    }),
     setPaymentOption: build.mutation<CheckoutResponse, number>({
       query: (pk: number) => ({
         url: buildClientRequestUrl(checkout.setPaymentOption, {
@@ -472,16 +479,15 @@ export const checkoutApi = api.injectEndpoints({
       CheckoutResponse,
       {
         payment_token?: string;
+        [key: string]: any;
       }
     >({
-      query: ({ payment_token }) => ({
+      query: (requestBody) => ({
         url: buildClientRequestUrl(checkout.setWalletPaymentPage, {
           useFormData: true
         }),
         method: 'POST',
-        body: {
-          payment_token
-        }
+        body: requestBody
       }),
       async onQueryStarted(arg, { dispatch, queryFulfilled }) {
         dispatch(setPaymentStepBusy(true));
@@ -737,7 +743,27 @@ export const checkoutApi = api.injectEndpoints({
         body: {
           loyalty_amount_to_use: amount
         }
-      })
+      }),
+      async onQueryStarted(arg, { dispatch, queryFulfilled }) {
+        dispatch(setPaymentStepBusy(true));
+        dispatch(setPaymentOptions([]));
+        await queryFulfilled;
+
+        const paymentOptionsData = await dispatch(
+          checkoutApi.endpoints.fetchPaymentOptions.initiate()
+        ).unwrap();
+
+        const paymentOptions = paymentOptionsData?.context_list?.find(
+          (context) => context?.page_name === 'PaymentOptionSelectionPage'
+        )?.page_context?.payment_options;
+
+        if (paymentOptions) {
+          dispatch(setPaymentOptions(paymentOptions));
+        }
+
+        dispatch(setPaymentStepBusy(false));
+      },
+      invalidatesTags: ['PaymentOptions']
     }),
     setOrderNote: build.mutation<CheckoutResponse, string>({
       query: (notes) => ({
@@ -840,6 +866,7 @@ export const {
   useSetAddressesMutation,
   useSetShippingOptionMutation,
   useSetDataSourceShippingOptionsMutation,
+  useFetchPaymentOptionsQuery,
   useSetPaymentOptionMutation,
   useSetBinNumberMutation,
   useSetInstallmentOptionMutation,

package/data/client/user.ts

@@ -1,7 +1,7 @@
 import { api } from './api';
 import { user } from '../urls';
 import { ForgotPasswordFormType, Order } from '../../types';
-import { buildClientRequestUrl } from '../../utils';
+import { buildClientRequestUrl, getCookie } from '../../utils';
 
 interface GetCaptchaResponse {
   siteKey: string;
@@ -64,13 +64,21 @@ const userApi = api.injectEndpoints({
       })
     }),
     forgotPassword: build.mutation<void, ForgotPasswordFormType>({
-      query: (body) => ({
-        url: buildClientRequestUrl(user.forgotPassword, {
-          contentType: 'application/json'
-        }),
-        method: 'POST',
-        body
-      })
+      query: (body) => {
+        const frontendId = getCookie('pz-frontend-id');
+        const headers = frontendId
+          ? { 'x-frontend-id': frontendId }
+          : undefined;
+
+        return {
+          url: buildClientRequestUrl(user.forgotPassword, {
+            contentType: 'application/json'
+          }),
+          method: 'POST',
+          body,
+          headers
+        };
+      }
     }),
     otpLogin: build.mutation<void, { phone: string }>({
       query: ({ phone }) => ({

package/data/server/product.ts

@@ -31,7 +31,7 @@ const getProductDataHandler = ({
       url +=
         '?' +
         Object.keys(searchParams)
-          .map((key) => `${key}=${searchParams[key]}`)
+          .map((key) => `${key}=${encodeURIComponent(searchParams[key])}`)
           .join('&');
     }
 

package/middlewares/url-redirection.ts

@@ -60,6 +60,22 @@ const withUrlRedirection =
 
         const setCookies = request.headers.getSetCookie();
 
+        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(), {
           status: request.status
         });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.81.0",
+  "version": "1.82.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.81.0",
+    "@akinon/eslint-plugin-projectzero": "1.82.0",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/types/index.ts

@@ -203,11 +203,13 @@ export interface Settings {
   useOptimizedTranslations?: boolean;
   plugins?: Record<string, Record<string, any>>;
   includedProxyHeaders?: string[];
+  commerceRedirectionIgnoreList?: string[];
   /**
    * By default, the currency will be reset when the currency is changed.
    * If you want to keep the basket when the currency is changed, you can set this option to `false`.
    */
   resetBasketOnCurrencyChange?: boolean;
+  frontendIds?: Record<string, number>;
 }
 
 export interface CacheOptions {