@akinon/next 1.118.0-rc.7 → 1.118.0-rc.9

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @akinon/next
 
+## 1.118.0-rc.9
+
+### Minor Changes
+
+- 01ee41f1: ZERO-4102: Implement a post-checkout flow by dynamically determining checkout paths and managing a pz-post-checkout-flow cookie.
+
+## 1.118.0-rc.8
+
+### Minor Changes
+
+- 31b4a266: ZERO-4102: Add support for post-checkout redirect in middleware
+
 ## 1.118.0-rc.7
 
 ## 1.118.0-rc.6

package/data/client/checkout.ts

@@ -17,7 +17,7 @@ import {
   SendSmsType,
   VerifySmsType
 } from '../../types';
-import { buildClientRequestUrl } from '../../utils';
+import { buildClientRequestUrl, getCookie } from '../../utils';
 import { api } from './api';
 import { checkout } from '../urls';
 import type { AppDispatch, AppStore } from 'redux/store';
@@ -87,6 +87,18 @@ export interface PayOnDeliveryParams {
   paymentType: string;
 }
 
+const buildCheckoutRequestUrl = (
+  path: string,
+  options?: Parameters<typeof buildClientRequestUrl>[1]
+) => {
+  const effectivePath =
+    getCookie('pz-post-checkout-flow') === 'true' &&
+    /^\/orders\/checkout(\/|\?|$)/.test(path)
+      ? path.replace('/orders/checkout', '/orders/post-checkout')
+      : path;
+  return buildClientRequestUrl(effectivePath, options);
+};
+
 const completeMasterpassPayment = async (
   params: CompleteCreditCardParams,
   dispatch: AppDispatch,
@@ -186,41 +198,41 @@ export const checkoutApi = api.injectEndpoints({
   endpoints: (build) => ({
     fetchCheckout: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.fetchCheckout, {})
+        url: buildCheckoutRequestUrl(checkout.fetchCheckout, {})
       }),
       providesTags: ['Checkout']
     }),
     resetCheckoutState: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.guestLogin, {})
+        url: buildCheckoutRequestUrl(checkout.guestLogin, {})
       })
     }),
     fetchCheckoutResult: build.query<{ order: Order }, string>({
       query: (token: string) =>
-        buildClientRequestUrl(checkout.fetchCheckoutResult(token))
+        buildCheckoutRequestUrl(checkout.fetchCheckoutResult(token))
     }),
     get3dRedirectForm: build.query<{ result: string }, void>({
       query: () =>
-        buildClientRequestUrl(checkout.get3dRedirectForm, {
+        buildCheckoutRequestUrl(checkout.get3dRedirectForm, {
           responseType: 'text'
         })
     }),
     getContract: build.query<GetContractResponse, string>({
       query: (slug: string) =>
-        buildClientRequestUrl(checkout.getContract(slug), {
+        buildCheckoutRequestUrl(checkout.getContract(slug), {
           responseType: 'text'
         })
     }),
     getCoupons: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.couponSelectionPage)
+        url: buildCheckoutRequestUrl(checkout.couponSelectionPage)
       })
     }),
 
     setCoupon: build.mutation<CheckoutResponse, { pk: number; action: string }>(
       {
         query: ({ pk, action }) => ({
-          url: buildClientRequestUrl(checkout.couponSelectionPage, {
+          url: buildCheckoutRequestUrl(checkout.couponSelectionPage, {
             useFormData: true
           }),
           method: 'POST',
@@ -256,7 +268,7 @@ export const checkoutApi = api.injectEndpoints({
 
         if (paymentOption?.payment_type === 'masterpass') {
           const result = await baseQuery({
-            url: buildClientRequestUrl(checkout.getMasterpassOrderNo, {
+            url: buildCheckoutRequestUrl(checkout.getMasterpassOrderNo, {
               useFormData: true
             }),
             method: 'POST'
@@ -279,7 +291,7 @@ export const checkoutApi = api.injectEndpoints({
         }
 
         const result = await baseQuery({
-          url: buildClientRequestUrl(checkout.completeCreditCardPayment, {
+          url: buildCheckoutRequestUrl(checkout.completeCreditCardPayment, {
             useFormData: true
           }),
           method: 'POST',
@@ -315,7 +327,7 @@ export const checkoutApi = api.injectEndpoints({
       }
     >({
       query: ({ token }) => ({
-        url: buildClientRequestUrl(checkout.completeMasterpassPayment, {
+        url: buildCheckoutRequestUrl(checkout.completeMasterpassPayment, {
           useFormData: true
         }),
         method: 'POST',
@@ -332,7 +344,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     completeFundsTransfer: build.mutation<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.completeFundsTransfer, {
+        url: buildCheckoutRequestUrl(checkout.completeFundsTransfer, {
           useFormData: true
         }),
         method: 'POST',
@@ -349,7 +361,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     guestLogin: build.mutation<CheckoutResponse, GuestLoginFormParams>({
       query: ({ user_email, phone_number }) => ({
-        url: buildClientRequestUrl(checkout.guestLogin, {
+        url: buildCheckoutRequestUrl(checkout.guestLogin, {
           useFormData: true
         }),
         method: 'POST',
@@ -362,7 +374,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setDeliveryOption: build.mutation<CheckoutResponse, number>({
       query: (pk: number) => ({
-        url: buildClientRequestUrl(checkout.setDeliveryOption, {
+        url: buildCheckoutRequestUrl(checkout.setDeliveryOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -378,7 +390,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setAddresses: build.mutation<CheckoutResponse, SetAddressesParams>({
       query: ({ shippingAddressPk, billingAddressPk }) => ({
-        url: buildClientRequestUrl(checkout.setAddresses, {
+        url: buildCheckoutRequestUrl(checkout.setAddresses, {
           useFormData: true
         }),
         method: 'POST',
@@ -395,7 +407,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setShippingOption: build.mutation<CheckoutResponse, number>({
       query: (pk: number) => ({
-        url: buildClientRequestUrl(checkout.setShippingOption, {
+        url: buildCheckoutRequestUrl(checkout.setShippingOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -411,7 +423,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setDataSourceShippingOptions: build.mutation<CheckoutResponse, number[]>({
       query: (pks) => ({
-        url: buildClientRequestUrl(checkout.setDataSourceShippingOption, {
+        url: buildCheckoutRequestUrl(checkout.setDataSourceShippingOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -427,7 +439,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setRetailStore: build.mutation<CheckoutResponse, SetRetailStoreParams>({
       query: ({ retailStorePk, billingAddressPk }) => ({
-        url: buildClientRequestUrl(
+        url: buildCheckoutRequestUrl(
           '/orders/checkout?page=RetailStoreSelectionPage',
           {
             useFormData: true
@@ -442,13 +454,13 @@ export const checkoutApi = api.injectEndpoints({
     }),
     fetchPaymentOptions: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.setPaymentOption)
+        url: buildCheckoutRequestUrl(checkout.setPaymentOption)
       }),
       providesTags: ['PaymentOptions']
     }),
     setPaymentOption: build.mutation<CheckoutResponse, number>({
       query: (pk: number) => ({
-        url: buildClientRequestUrl(checkout.setPaymentOption, {
+        url: buildCheckoutRequestUrl(checkout.setPaymentOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -474,7 +486,7 @@ export const checkoutApi = api.injectEndpoints({
       }
     >({
       query: ({ payment_option: pk, validationURL }) => ({
-        url: buildClientRequestUrl(checkout.setWalletSelectionPage, {
+        url: buildCheckoutRequestUrl(checkout.setWalletSelectionPage, {
           useFormData: true
         }),
         method: 'POST',
@@ -498,7 +510,7 @@ export const checkoutApi = api.injectEndpoints({
       }
     >({
       query: (requestBody) => ({
-        url: buildClientRequestUrl(checkout.setWalletPaymentPage, {
+        url: buildCheckoutRequestUrl(checkout.setWalletPaymentPage, {
           useFormData: true
         }),
         method: 'POST',
@@ -519,7 +531,7 @@ export const checkoutApi = api.injectEndpoints({
       }
     >({
       query: ({ success, ...additionalParams }) => ({
-        url: buildClientRequestUrl(checkout.setWalletCompletePage, {
+        url: buildCheckoutRequestUrl(checkout.setWalletCompletePage, {
           useFormData: true
         }),
         method: 'POST',
@@ -545,7 +557,7 @@ export const checkoutApi = api.injectEndpoints({
             : checkout.setBinNumber;
 
         const result = await baseQuery({
-          url: buildClientRequestUrl(binNumberUrl, {
+          url: buildCheckoutRequestUrl(binNumberUrl, {
             useFormData: true
           }),
           method: 'POST',
@@ -573,7 +585,7 @@ export const checkoutApi = api.injectEndpoints({
             : checkout.setInstallmentOption;
 
         const result = await baseQuery({
-          url: buildClientRequestUrl(installmentOption, {
+          url: buildCheckoutRequestUrl(installmentOption, {
             useFormData: true
           }),
           method: 'POST',
@@ -591,7 +603,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setFundsTransferOption: build.mutation<CheckoutResponse, number>({
       query: (pk: number) => ({
-        url: buildClientRequestUrl(checkout.setFundsTransferOption, {
+        url: buildCheckoutRequestUrl(checkout.setFundsTransferOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -608,7 +620,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setCreditPaymentOption: build.mutation<CheckoutResponse, number>({
       query: (pk: number) => ({
-        url: buildClientRequestUrl(checkout.setCreditPaymentOption, {
+        url: buildCheckoutRequestUrl(checkout.setCreditPaymentOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -625,7 +637,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     confirmationCreditPayment: build.mutation<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.confirmationCreditPayment, {
+        url: buildCheckoutRequestUrl(checkout.confirmationCreditPayment, {
           useFormData: true
         }),
         method: 'POST',
@@ -641,7 +653,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     completeRedirectionPayment: build.mutation<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.completeRedirectionPayment, {
+        url: buildCheckoutRequestUrl(checkout.completeRedirectionPayment, {
           useFormData: true
         }),
         method: 'POST',
@@ -657,7 +669,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     applePaymentSelect: build.mutation<CheckoutResponse, ApplePaySelectParams>({
       query: ({ agreement, validationURL }) => ({
-        url: buildClientRequestUrl(checkout.confirmationPaymentSelect, {
+        url: buildCheckoutRequestUrl(checkout.confirmationPaymentSelect, {
           useFormData: true
         }),
         method: 'POST',
@@ -674,7 +686,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     appleQuery: build.mutation<CheckoutResponse, ApplePayQueryParams>({
       query: ({ agreement, paymentToken }) => ({
-        url: buildClientRequestUrl(checkout.confirmationQuery, {
+        url: buildCheckoutRequestUrl(checkout.confirmationQuery, {
           useFormData: true
         }),
         method: 'POST',
@@ -691,7 +703,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     completeConfirmation: build.mutation<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.confirmationComplete, {
+        url: buildCheckoutRequestUrl(checkout.confirmationComplete, {
           useFormData: true
         }),
         method: 'POST',
@@ -710,7 +722,7 @@ export const checkoutApi = api.injectEndpoints({
       PayOnDeliveryParams
     >({
       query: ({ paymentType }) => ({
-        url: buildClientRequestUrl(
+        url: buildCheckoutRequestUrl(
           `${checkout.fetchCheckout}?page=PayOnDeliveryPage`,
           { useFormData: true }
         ),
@@ -728,7 +740,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setPayOnDeliveryChoice: build.mutation<CheckoutResponse, string>({
       query: (body) => ({
-        url: buildClientRequestUrl(
+        url: buildCheckoutRequestUrl(
           `${checkout.fetchCheckout}?page=PayOnDeliveryPaymentChoicePage`,
           { useFormData: true }
         ),
@@ -745,7 +757,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     completeLoyaltyPayment: build.mutation<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.completeLoyaltyPayment, {
+        url: buildCheckoutRequestUrl(checkout.completeLoyaltyPayment, {
           useFormData: true
         }),
         method: 'POST',
@@ -761,12 +773,12 @@ export const checkoutApi = api.injectEndpoints({
     }),
     getCheckoutLoyaltyBalance: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.loyaltyMoneyUsage)
+        url: buildCheckoutRequestUrl(checkout.loyaltyMoneyUsage)
       })
     }),
     payWithLoyaltyBalance: build.mutation<any, string>({
       query: (amount) => ({
-        url: buildClientRequestUrl(checkout.loyaltyMoneyUsage, {
+        url: buildCheckoutRequestUrl(checkout.loyaltyMoneyUsage, {
           useFormData: true
         }),
         method: 'POST',
@@ -797,7 +809,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setOrderNote: build.mutation<CheckoutResponse, string>({
       query: (notes) => ({
-        url: buildClientRequestUrl(checkout.setOrderNote, {
+        url: buildCheckoutRequestUrl(checkout.setOrderNote, {
           useFormData: true
         }),
         method: 'POST',
@@ -817,7 +829,7 @@ export const checkoutApi = api.injectEndpoints({
         };
 
         return {
-          url: buildClientRequestUrl(checkout.deliveryBagsPage, {
+          url: buildCheckoutRequestUrl(checkout.deliveryBagsPage, {
             useFormData: true
           }),
           method: 'POST',
@@ -830,7 +842,7 @@ export const checkoutApi = api.injectEndpoints({
       Record<string, number>
     >({
       query: (options) => ({
-        url: buildClientRequestUrl(checkout.setAttributeBasedShippingOption, {
+        url: buildCheckoutRequestUrl(checkout.setAttributeBasedShippingOption, {
           useFormData: true
         }),
         method: 'POST',
@@ -849,7 +861,7 @@ export const checkoutApi = api.injectEndpoints({
       { extra_field: ExtraField }
     >({
       query: ({ extra_field }) => ({
-        url: buildClientRequestUrl(checkout.setOrderSelectionPage, {
+        url: buildCheckoutRequestUrl(checkout.setOrderSelectionPage, {
           useFormData: true
         }),
         method: 'POST',
@@ -860,7 +872,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     fetchLoyaltyData: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.loyaltyCardPage, {
+        url: buildCheckoutRequestUrl(checkout.loyaltyCardPage, {
           accept: 'application/json',
           contentType: 'application/json'
         }),
@@ -869,7 +881,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     setLoyaltyData: build.mutation<CheckoutResponse, number | string>({
       query: (amount) => ({
-        url: buildClientRequestUrl(checkout.loyaltyCardPage, {
+        url: buildCheckoutRequestUrl(checkout.loyaltyCardPage, {
           useFormData: true
         }),
         method: 'POST',
@@ -880,7 +892,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     sendSms: build.mutation<CheckoutResponse, SendSmsType>({
       query: (body) => ({
-        url: buildClientRequestUrl(checkout.sendSmsPage, {
+        url: buildCheckoutRequestUrl(checkout.sendSmsPage, {
           useFormData: true
         }),
         method: 'POST',
@@ -889,7 +901,7 @@ export const checkoutApi = api.injectEndpoints({
     }),
     verifySms: build.mutation<CheckoutResponse, VerifySmsType>({
       query: (body) => ({
-        url: buildClientRequestUrl(checkout.verifySmsPage, {
+        url: buildCheckoutRequestUrl(checkout.verifySmsPage, {
           useFormData: true
         }),
         method: 'POST',
@@ -905,7 +917,7 @@ export const checkoutApi = api.injectEndpoints({
         });
 
         return {
-          url: buildClientRequestUrl(checkout.saveSampleProducts),
+          url: buildCheckoutRequestUrl(checkout.saveSampleProducts),
           method: 'POST',
           body: formData
         };

package/middlewares/complete-gpay.ts

@@ -4,6 +4,7 @@ import { Buffer } from 'buffer';
 import logger from '../utils/log';
 import { getUrlPathWithLocale } from '../utils/localization';
 import { PzNextRequest } from '.';
+import { getCheckoutPath } from '../utils';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -40,7 +41,8 @@ const withCompleteGpay =
       return middleware(req, event);
     }
 
-    const requestUrl = `${Settings.commerceUrl}/orders/checkout/${url.search}`;
+    const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+    const requestUrl = `${Settings.commerceUrl}${getCheckoutPath(isPostCheckout)}${url.search}`;
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',

package/middlewares/complete-masterpass.ts

@@ -5,6 +5,7 @@ import logger from '../utils/log';
 import { getUrlPathWithLocale } from '../utils/localization';
 import { PzNextRequest } from '.';
 import { ServerVariables } from '../utils/server-variables';
+import { getCheckoutPath } from '../utils';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -41,7 +42,8 @@ const withCompleteMasterpass =
       return middleware(req, event);
     }
 
-    const requestUrl = `${Settings.commerceUrl}/orders/checkout/${url.search}`;
+    const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+    const requestUrl = `${Settings.commerceUrl}${getCheckoutPath(isPostCheckout)}${url.search}`;
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',

package/middlewares/complete-wallet.ts

@@ -4,6 +4,7 @@ import { Buffer } from 'buffer';
 import logger from '../utils/log';
 import { getUrlPathWithLocale } from '../utils/localization';
 import { PzNextRequest } from '.';
+import { getCheckoutPath } from '../utils';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -39,7 +40,8 @@ const withCompleteWallet =
       return middleware(req, event);
     }
 
-    const requestUrl = `${Settings.commerceUrl}/orders/checkout/${url.search}`;
+    const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+    const requestUrl = `${Settings.commerceUrl}${getCheckoutPath(isPostCheckout)}${url.search}`;
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',

package/middlewares/default.ts

@@ -26,6 +26,8 @@ import { getUrlPathWithLocale } from '../utils/localization';
 import getRootHostname from '../utils/get-root-hostname';
 import { LocaleUrlStrategy } from '../localization';
 
+const POST_CHECKOUT_COOKIE_MAX_AGE_MS = 1000 * 60 * 30; // 30 minutes
+
 const withPzDefault =
   (middleware: NextMiddleware) =>
   async (req: PzNextRequest, event: NextFetchEvent) => {
@@ -102,6 +104,7 @@ const withPzDefault =
     if (
       req.nextUrl.pathname.includes('/orders/hooks/') ||
       req.nextUrl.pathname.includes('/orders/checkout-with-token/') ||
+      req.nextUrl.pathname.includes('/orders/post-checkout-redirect/') ||
       req.nextUrl.pathname.includes('/hooks/cash_register/complete/') ||
       req.nextUrl.pathname.includes('/hooks/cash_register/pre_order/')
     ) {
@@ -153,21 +156,35 @@ const withPzDefault =
       );
     }
 
-    // If commerce redirects to /orders/checkout/ without locale
+    // If commerce redirects to /orders/checkout/ or /orders/post-checkout/ without locale
+    const isPostCheckout = !!req.nextUrl.pathname.match(
+      new RegExp('^/orders/post-checkout/$')
+    );
+    const checkoutLocalePath = getUrlPathWithLocale(
+      '/orders/checkout/',
+      req.cookies.get('pz-locale')?.value
+    );
     if (
-      req.nextUrl.pathname.match(new RegExp('^/orders/checkout/$')) &&
-      req.nextUrl.searchParams.size === 0 &&
-      getUrlPathWithLocale(
-        '/orders/checkout/',
-        req.cookies.get('pz-locale')?.value
-      ) !== req.nextUrl.pathname
+      isPostCheckout ||
+      (req.nextUrl.pathname.match(new RegExp('^/orders/checkout/$')) &&
+        req.nextUrl.searchParams.size === 0 &&
+        checkoutLocalePath !== req.nextUrl.pathname)
     ) {
-      const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
-        '/orders/checkout/',
-        req.cookies.get('pz-locale')?.value
-      )}`;
+      const response = NextResponse.redirect(
+        `${url.origin}${checkoutLocalePath}`,
+        303
+      );
+
+      if (isPostCheckout) {
+        response.cookies.set('pz-post-checkout-flow', 'true', {
+          path: '/',
+          sameSite: 'none',
+          secure: true,
+          expires: new Date(Date.now() + POST_CHECKOUT_COOKIE_MAX_AGE_MS)
+        });
+      }
 
-      return NextResponse.redirect(redirectUrlWithLocale, 303);
+      return response;
     }
 
     // Dynamically handle any payment gateway without specifying names
@@ -427,6 +444,25 @@ const withPzDefault =
                                       );
                                     }
 
+                                    if (
+                                      req.cookies.get(
+                                        'pz-post-checkout-flow'
+                                      )
+                                    ) {
+                                      if (
+                                        pathnameWithoutLocale.startsWith(
+                                          '/orders/completed/'
+                                        ) ||
+                                        pathnameWithoutLocale.startsWith(
+                                          '/basket'
+                                        )
+                                      ) {
+                                        middlewareResult.cookies.delete(
+                                          'pz-post-checkout-flow'
+                                        );
+                                      }
+                                    }
+
                                     if (process.env.ACC_APP_VERSION) {
                                       middlewareResult.headers.set(
                                         'acc-app-version',

package/middlewares/masterpass-rest-callback.ts

@@ -3,6 +3,7 @@ import Settings from 'settings';
 import logger from '../utils/log';
 import { getUrlPathWithLocale } from '../utils/localization';
 import { PzNextRequest } from '.';
+import { getCheckoutPath } from '../utils';
 
 const withMasterpassRestCallback =
   (middleware: NextMiddleware) =>
@@ -19,7 +20,9 @@ const withMasterpassRestCallback =
     }
 
     try {
-      const requestUrl = new URL('/orders/checkout/', Settings.commerceUrl);
+      const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+      const requestUrl = new URL(getCheckoutPath(isPostCheckout), Settings.commerceUrl);
+
       url.searchParams.forEach((value, key) => {
         requestUrl.searchParams.set(key, value);
       });

package/middlewares/redirection-payment.ts

@@ -4,6 +4,7 @@ import Settings from 'settings';
 import logger from '../utils/log';
 import { PzNextRequest } from '.';
 import { getUrlPathWithLocale } from '../utils/localization';
+import { getCheckoutPath } from '../utils';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -41,7 +42,8 @@ const withRedirectionPayment =
       return middleware(req, event);
     }
 
-    const requestUrl = `${Settings.commerceUrl}/orders/checkout/${url.search}`;
+    const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+    const requestUrl = `${Settings.commerceUrl}${getCheckoutPath(isPostCheckout)}${url.search}`;
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',

package/middlewares/saved-card-redirection.ts

@@ -5,6 +5,7 @@ import logger from '../utils/log';
 import { getUrlPathWithLocale } from '../utils/localization';
 import { PzNextRequest } from '.';
 import { ServerVariables } from '../utils/server-variables';
+import { getCheckoutPath } from '../utils';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -41,7 +42,8 @@ const withSavedCardRedirection =
       return middleware(req, event);
     }
 
-    const requestUrl = `${Settings.commerceUrl}/orders/checkout/${url.search}`;
+    const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+    const requestUrl = `${Settings.commerceUrl}${getCheckoutPath(isPostCheckout)}${url.search}`;
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',

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 { getCheckoutPath } from '../utils';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -40,7 +41,8 @@ const withThreeDRedirection =
       return middleware(req, event);
     }
 
-    const requestUrl = `${Settings.commerceUrl}/orders/checkout/${url.search}`;
+    const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+    const requestUrl = `${Settings.commerceUrl}${getCheckoutPath(isPostCheckout)}${url.search}`;
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',

package/middlewares/wallet-complete-redirection.ts

@@ -4,6 +4,7 @@ import { Buffer } from 'buffer';
 import logger from '../utils/log';
 import { getUrlPathWithLocale } from '../utils/localization';
 import { PzNextRequest } from '.';
+import { getCheckoutPath } from '../utils';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -39,7 +40,8 @@ const withWalletCompleteRedirection =
       return middleware(req, event);
     }
 
-    const requestUrl = `${Settings.commerceUrl}/orders/checkout/${url.search}`;
+    const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+    const requestUrl = `${Settings.commerceUrl}${getCheckoutPath(isPostCheckout)}${url.search}`;
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',

package/package.json

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

package/utils/get-checkout-path.ts

@@ -0,0 +1,3 @@
+export const getCheckoutPath = (isPostCheckout: boolean): string => {
+  return isPostCheckout ? '/orders/post-checkout/' : '/orders/checkout/';
+};

package/utils/index.ts

@@ -7,6 +7,7 @@ export * from './get-currency';
 export * from './menu-generator';
 export * from './generate-commerce-search-params';
 export * from './get-currency-label';
+export * from './get-checkout-path';
 
 export function getCookie(name: string) {
   if (typeof document === 'undefined') {