@akinon/next 1.93.0 → 1.95.0

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @akinon/next
 
+## 1.95.0
+
+### Minor Changes
+
+- 35dfb8f: ZERO-3363: Refactor URL handling in checkout and redirection middlewares to use url.origin instead of process.env.NEXT_PUBLIC_URL
+- 99b6e7b: ZERO-3421: Enhance Sentry error handling by adding network error detection logic and refining initialization options
+- cbdb5c1: ZERO-3448: fix set cookie domain handling for subdomain locale strategy
+
+## 1.94.0
+
+### Minor Changes
+
+- 6e6b0a9: ZERO-3422: Add pz-flow-payment package
+- adf0eeb: ZERO-3597: Add copilot instruction files
+- c806fad: ZERO-3422: Add Flow Payment plugin to the defined plugins list
+- 0abde6b: ZERO-3422: Update fetch method to use dynamic request method in wallet complete redirection middleware
+- 72ad7bb: ZERO-3422: Add Flow Payment to the list of available plugins
+- e7cd3a5: ZERO-3435: Add Accept-Language to requestHeaders
+- 17bfadc: ZERO-3275: Disable OpenTelemetry monitoring in production environment
+- dfaceff: ZERO-3356: Add useLoyaltyAvailability hook and update checkout state management
+- 86642cf: ZERO-3531: Add saveSampleProducts endpoint and update URLs in checkout
+- 485e8ef: ZERO-3422: Refactor parameter handling in wallet complete redirection middleware to use forEach
+- b434ac8: ZERO-3545: Update fetchCheckout API URL to include page parameter
+- fee608d: ZERO-3422: Refactor body handling in wallet complete redirection middleware
+
 ## 1.93.0
 
 ### Minor Changes

package/components/plugin-module.tsx

@@ -20,7 +20,8 @@ enum Plugin {
   B2B = 'pz-b2b',
   Akifast = 'pz-akifast',
   MultiBasket = 'pz-multi-basket',
-  SavedCard = 'pz-saved-card'
+  SavedCard = 'pz-saved-card',
+  FlowPayment = 'pz-flow-payment'
 }
 
 export enum Component {
@@ -45,7 +46,8 @@ export enum Component {
   AkifastQuickLoginButton = 'QuickLoginButton',
   AkifastCheckoutButton = 'CheckoutButton',
   MultiBasket = 'MultiBasket',
-  SavedCard = 'SavedCardOption'
+  SavedCard = 'SavedCardOption',
+  FlowPayment = 'FlowPayment'
 }
 
 const PluginComponents = new Map([
@@ -78,7 +80,8 @@ const PluginComponents = new Map([
     [Component.AkifastQuickLoginButton, Component.AkifastCheckoutButton]
   ],
   [Plugin.MultiBasket, [Component.MultiBasket]],
-  [Plugin.SavedCard, [Component.SavedCard]]
+  [Plugin.SavedCard, [Component.SavedCard]],
+  [Plugin.FlowPayment, [Component.FlowPayment]]
 ]);
 
 const getPlugin = (component: Component) => {
@@ -143,6 +146,8 @@ export default function PluginModule({
               promise = import(`${'@akinon/pz-multi-basket'}`);
             } else if (plugin === Plugin.SavedCard) {
               promise = import(`${'@akinon/pz-saved-card'}`);
+            } else if (plugin === Plugin.FlowPayment) {
+              promise = import(`${'@akinon/pz-flow-payment'}`);
             }
           } catch (error) {
             logger.error(error);

package/components/selected-payment-option-view.tsx

@@ -62,6 +62,17 @@ export default function SelectedPaymentOptionView({
               : fallbackView;
           }
 
+          if (
+            payment_option?.payment_type === 'wallet' &&
+            wallet_method === 'checkout_flow'
+          ) {
+            const mod = await import('@akinon/pz-flow-payment');
+
+            return typeof mod?.default === 'function'
+              ? mod.default
+              : fallbackView;
+          }
+
           const view = paymentTypeToView[payment_option?.payment_type] || null;
 
           if (view) {

package/data/client/checkout.ts

@@ -181,7 +181,10 @@ export const checkoutApi = api.injectEndpoints({
   endpoints: (build) => ({
     fetchCheckout: build.query<CheckoutResponse, void>({
       query: () => ({
-        url: buildClientRequestUrl(checkout.fetchCheckout, {})
+        url: buildClientRequestUrl(
+          `${checkout.fetchCheckout}?page=IndexPage`,
+          {}
+        )
       }),
       providesTags: ['Checkout']
     }),
@@ -867,6 +870,22 @@ export const checkoutApi = api.injectEndpoints({
         method: 'POST',
         body
       })
+    }),
+    saveSampleProducts: build.mutation<CheckoutResponse, number[] | undefined>({
+      query: (products = []) => {
+        const formData = new FormData();
+
+        products.forEach((product) => {
+          formData.append('sample_products', String(product));
+        });
+
+        return {
+          url: buildClientRequestUrl(checkout.saveSampleProducts),
+          method: 'POST',
+          body: formData
+        };
+      },
+      invalidatesTags: ['Checkout']
     })
   }),
   overrideExisting: false
@@ -914,5 +933,6 @@ export const {
   useSetWalletCompletePageMutation,
   useSendSmsMutation,
   useVerifySmsMutation,
-  useResetCheckoutStateQuery
+  useResetCheckoutStateQuery,
+  useSaveSampleProductsMutation
 } = checkoutApi;

package/data/urls.ts

@@ -142,7 +142,8 @@ export const checkout = {
   setOrderSelectionPage: '/orders/checkout/?page=OrderSelectionPage',
   loyaltyCardPage: '/orders/checkout/?page=LoyaltyCardPage',
   sendSmsPage: '/orders/checkout/?page=SendSmsPage',
-  verifySmsPage: '/orders/checkout/?page=VerifySmsPage'
+  verifySmsPage: '/orders/checkout/?page=VerifySmsPage',
+  saveSampleProducts: '/orders/checkout/?page=SampleProductPage'
 };
 
 export const flatpage = {

package/hooks/use-loyalty-availability.ts

@@ -0,0 +1,21 @@
+import { useAppSelector } from '../redux/hooks';
+
+export const useLoyaltyAvailability = () => {
+  const { paymentOptions, unavailablePaymentOptions } = useAppSelector(
+    (state) => state.checkout
+  );
+
+  const hasLoyaltyInAvailable = paymentOptions.some(
+    (option) =>
+      option.payment_type === 'loyalty_money' ||
+      option.payment_type === 'loyalty'
+  );
+
+  const hasLoyaltyInUnavailable = unavailablePaymentOptions.some(
+    (option) =>
+      option.payment_type === 'loyalty_money' ||
+      option.payment_type === 'loyalty'
+  );
+
+  return hasLoyaltyInAvailable || hasLoyaltyInUnavailable;
+};

package/instrumentation/node.ts

@@ -4,17 +4,19 @@ import { Resource } from '@opentelemetry/resources';
 import { SemanticResourceAttributes } from '@opentelemetry/semantic-conventions';
 import { SimpleSpanProcessor } from '@opentelemetry/sdk-trace-node';
 
-const sdk = new NodeSDK({
-  resource: new Resource({
-    [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
-  }),
-  spanProcessor: new SimpleSpanProcessor(
-    new OTLPTraceExporter({
-      url: `${
-        process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
-      }/api/traces`
-    })
-  )
-});
+if (process.env.NODE_ENV === 'development') {
+  const sdk = new NodeSDK({
+    resource: new Resource({
+      [SemanticResourceAttributes.SERVICE_NAME]: 'pz-next-app'
+    }),
+    spanProcessor: new SimpleSpanProcessor(
+      new OTLPTraceExporter({
+        url: `${
+          process.env.PZ_DASHBOARD_URL ?? 'http://localhost:3005'
+        }/api/traces`
+      })
+    )
+  });
 
-sdk.start();
+  sdk.start();
+}

package/middlewares/checkout-provider.ts

@@ -64,7 +64,7 @@ const withCheckoutProvider =
           const location = request.headers.get('location');
           const redirectUrl = new URL(
             request.headers.get('location'),
-            location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
+            location.startsWith('http') ? '' : url.origin
           );
 
           redirectUrl.pathname = getUrlPathWithLocale(

package/middlewares/complete-gpay.ts

@@ -34,6 +34,7 @@ const withCompleteGpay =
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const sessionId = req.cookies.get('osessionid');
+    const currentLocale = req.middlewareParams?.rewrites?.locale;
 
     if (url.search.indexOf('GPayCompletePage') === -1) {
       return middleware(req, event);
@@ -45,7 +46,9 @@ const withCompleteGpay =
       'Content-Type': 'application/x-www-form-urlencoded',
       Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      'Accept-Language':
+        currentLocale ?? req.cookies.get('pz-locale')?.value ?? ''
     };
 
     try {

package/middlewares/complete-masterpass.ts

@@ -4,6 +4,7 @@ import { Buffer } from 'buffer';
 import logger from '../utils/log';
 import { getUrlPathWithLocale } from '../utils/localization';
 import { PzNextRequest } from '.';
+import { ServerVariables } from '../utils/server-variables';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -34,6 +35,7 @@ const withCompleteMasterpass =
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const sessionId = req.cookies.get('osessionid');
+    const currentLocale = req.middlewareParams?.rewrites?.locale;
 
     if (url.search.indexOf('MasterpassCompletePage') === -1) {
       return middleware(req, event);
@@ -45,7 +47,9 @@ const withCompleteMasterpass =
       'Content-Type': 'application/x-www-form-urlencoded',
       Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      'Accept-Language':
+        currentLocale ?? req.cookies.get('pz-locale')?.value ?? ''
     };
 
     try {

package/middlewares/default.ts

@@ -11,7 +11,8 @@ import {
   withRedirectionPayment,
   withSavedCardRedirection,
   withThreeDRedirection,
-  withUrlRedirection
+  withUrlRedirection,
+  withWalletCompleteRedirection
 } from '.';
 import { urlLocaleMatcherRegex } from '../utils';
 import withCurrency from './currency';
@@ -228,144 +229,168 @@ const withPzDefault =
                     withCompleteGpay(
                       withCompleteMasterpass(
                         withSavedCardRedirection(
-                          async (req: PzNextRequest, event: NextFetchEvent) => {
-                            let middlewareResult: NextResponse | void =
-                              NextResponse.next();
-
-                            try {
-                              const { locale, prettyUrl, currency } =
-                                req.middlewareParams.rewrites;
-                              const { defaultLocaleValue } =
-                                Settings.localization;
-                              const url = req.nextUrl.clone();
-                              const pathnameWithoutLocale =
-                                url.pathname.replace(urlLocaleMatcherRegex, '');
-
-                              middlewareResult = (await middleware(
-                                req,
-                                event
-                              )) as NextResponse | void;
-
-                              let customRewriteUrlDiff = '';
-
-                              if (
-                                middlewareResult instanceof NextResponse &&
-                                middlewareResult.headers.get(
-                                  'pz-override-response'
-                                ) &&
-                                middlewareResult.headers.get(
-                                  'x-middleware-rewrite'
-                                )
-                              ) {
-                                const rewriteUrl = new URL(
-                                  middlewareResult.headers.get(
-                                    'x-middleware-rewrite'
-                                  )
-                                );
-                                const originalUrl = new URL(req.url);
-                                customRewriteUrlDiff =
-                                  rewriteUrl.pathname.replace(
-                                    originalUrl.pathname,
+                          withWalletCompleteRedirection(
+                            async (
+                              req: PzNextRequest,
+                              event: NextFetchEvent
+                            ) => {
+                              let middlewareResult: NextResponse | void =
+                                NextResponse.next();
+
+                              try {
+                                const { locale, prettyUrl, currency } =
+                                  req.middlewareParams.rewrites;
+                                const { defaultLocaleValue } =
+                                  Settings.localization;
+                                const url = req.nextUrl.clone();
+                                const pathnameWithoutLocale =
+                                  url.pathname.replace(
+                                    urlLocaleMatcherRegex,
                                     ''
                                   );
-                              }
 
-                              url.basePath = `/${commerceUrl}`;
-                              url.pathname = `/${
-                                locale.length ? `${locale}/` : ''
-                              }${currency}/${customRewriteUrlDiff}${
-                                prettyUrl ?? pathnameWithoutLocale
-                              }`.replace(/\/+/g, '/');
-
-                              if (
-                                Settings.usePrettyUrlRoute &&
-                                url.searchParams.toString().length > 0 &&
-                                !Object.entries(ROUTES).find(([, value]) =>
-                                  new RegExp(`^${value}/?$`).test(
-                                    pathnameWithoutLocale
-                                  )
-                                )
-                              ) {
-                                url.pathname =
-                                  url.pathname +
-                                  (/\/$/.test(url.pathname) ? '' : '/') +
-                                  `searchparams|${encodeURIComponent(
-                                    url.searchParams.toString()
-                                  )}`;
-                              }
+                                middlewareResult = (await middleware(
+                                  req,
+                                  event
+                                )) as NextResponse | void;
 
-                              if (
-                                !req.middlewareParams.found &&
-                                Settings.customNotFoundEnabled
-                              ) {
-                                const pathname = url.pathname
-                                  .replace(/\/+$/, '')
-                                  .split('/');
-                                url.pathname = url.pathname.replace(
-                                  pathname.pop(),
-                                  'pz-not-found'
-                                );
-                              }
-
-                              Settings.rewrites.forEach((rewrite) => {
-                                url.pathname = url.pathname.replace(
-                                  rewrite.source,
-                                  rewrite.destination
-                                );
-                              });
+                                let customRewriteUrlDiff = '';
 
-                              // if middleware.ts has a return value for current url
-                              if (middlewareResult instanceof NextResponse) {
-                                // pz-override-response header is used to prevent 404 page for custom responses.
                                 if (
+                                  middlewareResult instanceof NextResponse &&
                                   middlewareResult.headers.get(
                                     'pz-override-response'
-                                  ) !== 'true'
-                                ) {
-                                  middlewareResult.headers.set(
-                                    'x-middleware-rewrite',
-                                    url.href
-                                  );
-                                } else if (
-                                  middlewareResult.headers.get(
-                                    'x-middleware-rewrite'
                                   ) &&
                                   middlewareResult.headers.get(
-                                    'pz-override-response'
-                                  ) === 'true'
+                                    'x-middleware-rewrite'
+                                  )
+                                ) {
+                                  const rewriteUrl = new URL(
+                                    middlewareResult.headers.get(
+                                      'x-middleware-rewrite'
+                                    )
+                                  );
+                                  const originalUrl = new URL(req.url);
+                                  customRewriteUrlDiff =
+                                    rewriteUrl.pathname.replace(
+                                      originalUrl.pathname,
+                                      ''
+                                    );
+                                }
+
+                                url.basePath = `/${commerceUrl}`;
+                                url.pathname = `/${
+                                  locale.length ? `${locale}/` : ''
+                                }${currency}/${customRewriteUrlDiff}${
+                                  prettyUrl ?? pathnameWithoutLocale
+                                }`.replace(/\/+/g, '/');
+
+                                if (
+                                  Settings.usePrettyUrlRoute &&
+                                  url.searchParams.toString().length > 0 &&
+                                  !Object.entries(ROUTES).find(([, value]) =>
+                                    new RegExp(`^${value}/?$`).test(
+                                      pathnameWithoutLocale
+                                    )
+                                  )
                                 ) {
+                                  url.pathname =
+                                    url.pathname +
+                                    (/\/$/.test(url.pathname) ? '' : '/') +
+                                    `searchparams|${encodeURIComponent(
+                                      url.searchParams.toString()
+                                    )}`;
+                                }
+
+                                if (
+                                  !req.middlewareParams.found &&
+                                  Settings.customNotFoundEnabled
+                                ) {
+                                  const pathname = url.pathname
+                                    .replace(/\/+$/, '')
+                                    .split('/');
+                                  url.pathname = url.pathname.replace(
+                                    pathname.pop(),
+                                    'pz-not-found'
+                                  );
+                                }
+
+                                Settings.rewrites.forEach((rewrite) => {
+                                  url.pathname = url.pathname.replace(
+                                    rewrite.source,
+                                    rewrite.destination
+                                  );
+                                });
+
+                                // if middleware.ts has a return value for current url
+                                if (middlewareResult instanceof NextResponse) {
+                                  // pz-override-response header is used to prevent 404 page for custom responses.
+                                  if (
+                                    middlewareResult.headers.get(
+                                      'pz-override-response'
+                                    ) !== 'true'
+                                  ) {
+                                    middlewareResult.headers.set(
+                                      'x-middleware-rewrite',
+                                      url.href
+                                    );
+                                  } else if (
+                                    middlewareResult.headers.get(
+                                      'x-middleware-rewrite'
+                                    ) &&
+                                    middlewareResult.headers.get(
+                                      'pz-override-response'
+                                    ) === 'true'
+                                  ) {
+                                    middlewareResult =
+                                      NextResponse.rewrite(url);
+                                  }
+                                } else {
+                                  // if middleware.ts doesn't have a return value.
+                                  // e.g. NextResponse.next() doesn't exist in middleware.ts
+
                                   middlewareResult = NextResponse.rewrite(url);
                                 }
-                              } else {
-                                // if middleware.ts doesn't have a return value.
-                                // e.g. NextResponse.next() doesn't exist in middleware.ts
 
-                                middlewareResult = NextResponse.rewrite(url);
-                              }
+                                const { localeUrlStrategy } =
+                                  Settings.localization;
+
+                                const fallbackHost =
+                                  req.headers.get('x-forwarded-host') ||
+                                  req.headers.get('host');
+                                const hostname =
+                                  process.env.NEXT_PUBLIC_URL ||
+                                  `https://${fallbackHost}`;
+                                const rootHostname =
+                                  localeUrlStrategy ===
+                                  LocaleUrlStrategy.Subdomain
+                                    ? getRootHostname(hostname)
+                                    : null;
+
+                                if (
+                                  !url.pathname.startsWith(
+                                    `/${currency}/orders`
+                                  )
+                                ) {
+                                  middlewareResult.cookies.set(
+                                    'pz-locale',
+                                    locale?.length > 0
+                                      ? locale
+                                      : defaultLocaleValue,
+                                    {
+                                      domain: rootHostname,
+                                      sameSite: 'none',
+                                      secure: true,
+                                      expires: new Date(
+                                        Date.now() + 1000 * 60 * 60 * 24 * 7
+                                      ) // 7 days
+                                    }
+                                  );
+                                }
 
-                              const { localeUrlStrategy } =
-                                Settings.localization;
-
-                              const fallbackHost =
-                                req.headers.get('x-forwarded-host') ||
-                                req.headers.get('host');
-                              const hostname =
-                                process.env.NEXT_PUBLIC_URL ||
-                                `https://${fallbackHost}`;
-                              const rootHostname =
-                                localeUrlStrategy ===
-                                LocaleUrlStrategy.Subdomain
-                                  ? getRootHostname(hostname)
-                                  : null;
-
-                              if (
-                                !url.pathname.startsWith(`/${currency}/orders`)
-                              ) {
                                 middlewareResult.cookies.set(
-                                  'pz-locale',
-                                  locale?.length > 0
-                                    ? locale
-                                    : defaultLocaleValue,
+                                  'pz-currency',
+                                  currency,
                                   {
                                     domain: rootHostname,
                                     sameSite: 'none',
@@ -375,82 +400,69 @@ const withPzDefault =
                                     ) // 7 days
                                   }
                                 );
-                              }
 
-                              middlewareResult.cookies.set(
-                                'pz-currency',
-                                currency,
-                                {
-                                  domain: rootHostname,
-                                  sameSite: 'none',
-                                  secure: true,
-                                  expires: new Date(
-                                    Date.now() + 1000 * 60 * 60 * 24 * 7
-                                  ) // 7 days
+                                if (
+                                  req.cookies.get('pz-locale') &&
+                                  req.cookies.get('pz-locale').value !== locale
+                                ) {
+                                  logger.debug('Locale changed', {
+                                    locale,
+                                    oldLocale:
+                                      req.cookies.get('pz-locale')?.value,
+                                    ip
+                                  });
                                 }
-                              );
-
-                              if (
-                                req.cookies.get('pz-locale') &&
-                                req.cookies.get('pz-locale').value !== locale
-                              ) {
-                                logger.debug('Locale changed', {
-                                  locale,
-                                  oldLocale:
-                                    req.cookies.get('pz-locale')?.value,
-                                  ip
-                                });
-                              }
-
-                              middlewareResult.headers.set(
-                                'pz-url',
-                                req.nextUrl.toString()
-                              );
-
-                              if (req.cookies.get('pz-set-currency')) {
-                                middlewareResult.cookies.delete(
-                                  'pz-set-currency'
-                                );
-                              }
 
-                              if (process.env.ACC_APP_VERSION) {
                                 middlewareResult.headers.set(
-                                  'acc-app-version',
-                                  process.env.ACC_APP_VERSION
+                                  'pz-url',
+                                  req.nextUrl.toString()
                                 );
-                              }
 
-                              // Set CSRF token if not set
-                              try {
-                                const url = `${Settings.commerceUrl}${user.csrfToken}`;
+                                if (req.cookies.get('pz-set-currency')) {
+                                  middlewareResult.cookies.delete(
+                                    'pz-set-currency'
+                                  );
+                                }
 
-                                if (!req.cookies.get('csrftoken')) {
-                                  const { csrf_token } = await (
-                                    await fetch(url)
-                                  ).json();
-                                  middlewareResult.cookies.set(
-                                    'csrftoken',
-                                    csrf_token,
-                                    {
-                                      domain: rootHostname
-                                    }
+                                if (process.env.ACC_APP_VERSION) {
+                                  middlewareResult.headers.set(
+                                    'acc-app-version',
+                                    process.env.ACC_APP_VERSION
                                   );
                                 }
+
+                                // Set CSRF token if not set
+                                try {
+                                  const url = `${Settings.commerceUrl}${user.csrfToken}`;
+
+                                  if (!req.cookies.get('csrftoken')) {
+                                    const { csrf_token } = await (
+                                      await fetch(url)
+                                    ).json();
+                                    middlewareResult.cookies.set(
+                                      'csrftoken',
+                                      csrf_token,
+                                      {
+                                        domain: rootHostname
+                                      }
+                                    );
+                                  }
+                                } catch (error) {
+                                  logger.error('CSRF Error', {
+                                    error,
+                                    ip
+                                  });
+                                }
                               } catch (error) {
-                                logger.error('CSRF Error', {
+                                logger.error('withPzDefault Error', {
                                   error,
                                   ip
                                 });
                               }
-                            } catch (error) {
-                              logger.error('withPzDefault Error', {
-                                error,
-                                ip
-                              });
-                            }
 
-                            return middlewareResult;
-                          }
+                              return middlewareResult;
+                            }
+                          )
                         )
                       )
                     )

package/middlewares/index.ts

@@ -9,6 +9,7 @@ import withCompleteGpay from './complete-gpay';
 import withCompleteMasterpass from './complete-masterpass';
 import withCheckoutProvider from './checkout-provider';
 import withSavedCardRedirection from './saved-card-redirection';
+import withWalletCompleteRedirection from './wallet-complete-redirection';
 import { NextRequest } from 'next/server';
 
 export {
@@ -22,7 +23,8 @@ export {
   withCompleteGpay,
   withCompleteMasterpass,
   withCheckoutProvider,
-  withSavedCardRedirection
+  withSavedCardRedirection,
+  withWalletCompleteRedirection
 };
 
 export interface PzNextRequest extends NextRequest {

package/middlewares/redirection-payment.ts

@@ -35,6 +35,7 @@ const withRedirectionPayment =
     const searchParams = new URLSearchParams(url.search);
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const sessionId = req.cookies.get('osessionid');
+    const currentLocale = req.middlewareParams?.rewrites?.locale;
 
     if (searchParams.get('page') !== 'RedirectionPageCompletePage') {
       return middleware(req, event);
@@ -46,7 +47,9 @@ const withRedirectionPayment =
       'Content-Type': 'application/x-www-form-urlencoded',
       Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      'Accept-Language':
+        currentLocale ?? req.cookies.get('pz-locale')?.value ?? ''
     };
 
     try {

package/middlewares/saved-card-redirection.ts

@@ -4,6 +4,7 @@ import { Buffer } from 'buffer';
 import logger from '../utils/log';
 import { getUrlPathWithLocale } from '../utils/localization';
 import { PzNextRequest } from '.';
+import { ServerVariables } from '../utils/server-variables';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -34,6 +35,7 @@ const withSavedCardRedirection =
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const sessionId = req.cookies.get('osessionid');
+    const currentLocale = req.middlewareParams?.rewrites?.locale;
 
     if (url.search.indexOf('SavedCardThreeDSecurePage') === -1) {
       return middleware(req, event);
@@ -45,7 +47,9 @@ const withSavedCardRedirection =
       'Content-Type': 'application/x-www-form-urlencoded',
       Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      'Accept-Language':
+        currentLocale ?? req.cookies.get('pz-locale')?.value ?? ''
     };
 
     try {

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 { ServerVariables } from '../utils/server-variables';
 
 const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
   if (stream) {
@@ -34,6 +35,7 @@ const withThreeDRedirection =
     const url = req.nextUrl.clone();
     const ip = req.headers.get('x-forwarded-for') ?? '';
     const sessionId = req.cookies.get('osessionid');
+    const currentLocale = req.middlewareParams?.rewrites?.locale;
 
     if (url.search.indexOf('CreditCardThreeDSecurePage') === -1) {
       return middleware(req, event);
@@ -45,7 +47,9 @@ const withThreeDRedirection =
       'Content-Type': 'application/x-www-form-urlencoded',
       Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      'Accept-Language':
+        currentLocale ?? req.cookies.get('pz-locale')?.value ?? ''
     };
 
     try {

package/middlewares/url-redirection.ts

@@ -50,7 +50,7 @@ const withUrlRedirection =
         const location = request.headers.get('location');
         const redirectUrl = new URL(
           request.headers.get('location'),
-          location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
+          location.startsWith('http') ? '' : url.origin
         );
 
         redirectUrl.pathname = getUrlPathWithLocale(

package/middlewares/wallet-complete-redirection.ts

@@ -0,0 +1,203 @@
+import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
+import Settings from 'settings';
+import { Buffer } from 'buffer';
+import logger from '../utils/log';
+import { getUrlPathWithLocale } from '../utils/localization';
+import { PzNextRequest } from '.';
+
+const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
+  if (stream) {
+    const chunks = [];
+    let result = '';
+
+    try {
+      for await (const chunk of stream as any) {
+        chunks.push(Buffer.from(chunk));
+      }
+
+      result = Buffer.concat(chunks).toString('utf-8');
+    } catch (error) {
+      logger.error('Error while reading body stream', {
+        middleware: 'wallet-complete-redirection',
+        error
+      });
+    }
+
+    return result;
+  }
+  return null;
+};
+
+const withWalletCompleteRedirection =
+  (middleware: NextMiddleware) =>
+  async (req: PzNextRequest, event: NextFetchEvent) => {
+    const url = req.nextUrl.clone();
+    const ip = req.headers.get('x-forwarded-for') ?? '';
+    const sessionId = req.cookies.get('osessionid');
+
+    if (url.search.indexOf('WalletCompletePage') === -1) {
+      return middleware(req, event);
+    }
+
+    const requestUrl = `${Settings.commerceUrl}/orders/checkout/${url.search}`;
+    const requestHeaders = {
+      'X-Requested-With': 'XMLHttpRequest',
+      'Content-Type': 'application/x-www-form-urlencoded',
+      Cookie: req.headers.get('cookie') ?? '',
+      'x-currency': req.cookies.get('pz-currency')?.value ?? '',
+      'x-forwarded-for': ip
+    };
+
+    try {
+      const existingBody = await streamToString(req.body);
+      const queryParams = new URLSearchParams(url.search);
+      const bodyParams = new URLSearchParams();
+
+      if (existingBody) {
+        try {
+          const existingParams = new URLSearchParams(existingBody);
+
+          existingParams.forEach((value, key) => {
+            bodyParams.append(key, value);
+          });
+        } catch {
+          logger.error('Error parsing existing body as URL-encoded data', {
+            middleware: 'wallet-complete-redirection',
+            existingBody,
+            ip
+          });
+        }
+      }
+
+      queryParams.forEach((value, key) => {
+        bodyParams.append(key, value);
+      });
+
+      const body = bodyParams.toString();
+
+      if (!sessionId) {
+        logger.warn(
+          'Make sure that the SESSION_COOKIE_SAMESITE environment variable is set to None in Commerce.',
+          {
+            middleware: 'wallet-complete-redirection',
+            ip
+          }
+        );
+
+        return NextResponse.redirect(
+          `${url.origin}${getUrlPathWithLocale(
+            '/orders/checkout/',
+            req.cookies.get('pz-locale')?.value
+          )}`,
+          303
+        );
+      }
+
+      const request = await fetch(requestUrl, {
+        method: 'POST',
+        headers: requestHeaders,
+        body
+      });
+
+      logger.info('Complete wallet payment request', {
+        requestUrl,
+        status: request.status,
+        requestHeaders,
+        ip
+      });
+
+      const response = await request.json();
+
+      const { context_list: contextList, errors } = response;
+      const redirectionContext = contextList?.find(
+        (context) => context.page_context?.redirect_url
+      );
+      const redirectUrl = redirectionContext?.page_context?.redirect_url;
+
+      if (errors && Object.keys(errors).length) {
+        logger.error('Error while completing wallet payment', {
+          middleware: 'wallet-complete-redirection',
+          errors,
+          requestHeaders,
+          ip
+        });
+
+        return NextResponse.redirect(
+          `${url.origin}${getUrlPathWithLocale(
+            '/orders/checkout/',
+            req.cookies.get('pz-locale')?.value
+          )}`,
+          {
+            status: 303,
+            headers: {
+              'Set-Cookie': `pz-pos-error=${JSON.stringify(errors)}; path=/;`
+            }
+          }
+        );
+      }
+
+      logger.info('Order success page context list', {
+        middleware: 'wallet-complete-redirection',
+        contextList,
+        ip
+      });
+
+      if (!redirectUrl) {
+        logger.warn(
+          'No redirection url for order success page found in page_context. Redirecting to checkout page.',
+          {
+            middleware: 'wallet-complete-redirection',
+            requestHeaders,
+            response: JSON.stringify(response),
+            ip
+          }
+        );
+
+        const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`;
+
+        return NextResponse.redirect(redirectUrlWithLocale, 303);
+      }
+
+      const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
+        redirectUrl,
+        req.cookies.get('pz-locale')?.value
+      )}`;
+
+      logger.info('Redirecting to order success page', {
+        middleware: 'wallet-complete-redirection',
+        redirectUrlWithLocale,
+        ip
+      });
+
+      // Using POST method while redirecting causes an error,
+      // So we use 303 status code to change the method to GET
+      const nextResponse = NextResponse.redirect(redirectUrlWithLocale, 303);
+
+      nextResponse.headers.set(
+        'Set-Cookie',
+        request.headers.get('set-cookie') ?? ''
+      );
+
+      return nextResponse;
+    } catch (error) {
+      logger.error('Error while completing wallet payment', {
+        middleware: 'wallet-complete-redirection',
+        error,
+        requestHeaders,
+        ip
+      });
+
+      return NextResponse.redirect(
+        `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`,
+        303
+      );
+    }
+  };
+
+export default withWalletCompleteRedirection;

package/package.json

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

package/plugins.d.ts

@@ -36,3 +36,5 @@ declare module '@akinon/pz-iyzico-saved-card' {
 }
 
 declare module '@akinon/pz-apple-pay' {}
+
+declare module '@akinon/pz-flow-payment' {}

package/plugins.js

@@ -15,5 +15,6 @@ module.exports = [
   'pz-saved-card',
   'pz-tabby-extension',
   'pz-apple-pay',
-  'pz-tamara-extension'
+  'pz-tamara-extension',
+  'pz-flow-payment'
 ];

package/redux/middlewares/checkout.ts

@@ -20,7 +20,8 @@ import {
   setShippingOptions,
   setHepsipayAvailability,
   setWalletPaymentData,
-  setPayOnDeliveryOtpModalActive
+  setPayOnDeliveryOtpModalActive,
+  setUnavailablePaymentOptions
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
@@ -176,6 +177,14 @@ export const contextListMiddleware: Middleware = ({
           dispatch(setPaymentOptions(context.page_context.payment_options));
         }
 
+        if (context.page_context.unavailable_options) {
+          dispatch(
+            setUnavailablePaymentOptions(
+              context.page_context.unavailable_options
+            )
+          );
+        }
+
         if (context.page_context.credit_payment_options) {
           dispatch(
             setCreditPaymentOptions(context.page_context.credit_payment_options)

package/redux/reducers/checkout.ts

@@ -40,6 +40,7 @@ export interface CheckoutState {
   shippingOptions: ShippingOption[];
   dataSourceShippingOptions: DataSource[];
   paymentOptions: PaymentOption[];
+  unavailablePaymentOptions: PaymentOption[];
   creditPaymentOptions: CheckoutCreditPaymentOption[];
   selectedCreditPaymentPk: number;
   paymentChoices: PaymentChoice[];
@@ -60,6 +61,8 @@ export interface CheckoutState {
       countryCode: string;
       currencyCode: string;
       version: string;
+      public_key: string;
+      [key: string]: any;
     };
     detail: {
       label: string;
@@ -94,6 +97,7 @@ const initialState: CheckoutState = {
   shippingOptions: [],
   dataSourceShippingOptions: [],
   paymentOptions: [],
+  unavailablePaymentOptions: [],
   creditPaymentOptions: [],
   selectedCreditPaymentPk: null,
   paymentChoices: [],
@@ -157,6 +161,9 @@ const checkoutSlice = createSlice({
     setPaymentOptions(state, { payload }) {
       state.paymentOptions = payload;
     },
+    setUnavailablePaymentOptions(state, { payload }) {
+      state.unavailablePaymentOptions = payload;
+    },
     setPaymentChoices(state, { payload }) {
       state.paymentChoices = payload;
     },
@@ -218,9 +225,10 @@ export const {
   setShippingOptions,
   setDataSourceShippingOptions,
   setPaymentOptions,
+  setUnavailablePaymentOptions,
+  setPaymentChoices,
   setCreditPaymentOptions,
   setSelectedCreditPaymentPk,
-  setPaymentChoices,
   setCardType,
   setInstallmentOptions,
   setBankAccounts,

package/sentry/index.ts

@@ -13,36 +13,73 @@ const ALLOWED_CLIENT_LOG_TYPES: ClientLogType[] = [
   ClientLogType.CHECKOUT
 ];
 
+const isNetworkError = (exception: unknown): boolean => {
+  if (!(exception instanceof Error)) return false;
+
+  const networkErrorPatterns = [
+    'networkerror',
+    'failed to fetch',
+    'network request failed',
+    'network error',
+    'loading chunk',
+    'chunk load failed'
+  ];
+
+  if (exception.name === 'NetworkError') return true;
+
+  if (exception.name === 'TypeError') {
+    return networkErrorPatterns.some((pattern) =>
+      exception.message.toLowerCase().includes(pattern)
+    );
+  }
+
+  return networkErrorPatterns.some((pattern) =>
+    exception.message.toLowerCase().includes(pattern)
+  );
+};
+
 export const initSentry = (
   type: 'Server' | 'Client' | 'Edge',
   options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {}
 ) => {
-  // TODO: Handle options with ESLint rules
+  // TODO: Remove Zero Project DSN
 
-  Sentry.init({
+  const baseConfig = {
     dsn:
-      options.dsn ||
       SENTRY_DSN ||
+      options.dsn ||
       'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
     initialScope: {
       tags: {
         APP_TYPE: 'ProjectZeroNext',
-        TYPE: type
+        TYPE: type,
+        ...((options.initialScope as any)?.tags || {})
       }
     },
     tracesSampleRate: 0,
-    integrations: [],
-    beforeSend: (event, hint) => {
-      if (
-        type === 'Client' &&
-        !ALLOWED_CLIENT_LOG_TYPES.includes(
-          event.tags?.LOG_TYPE as ClientLogType
-        )
-      ) {
-        return null;
-      }
+    integrations: []
+  };
 
-      return event;
-    }
-  });
+  if (type === 'Server' || type === 'Edge') {
+    Sentry.init(baseConfig);
+  } else if (type === 'Client') {
+    Sentry.init({
+      ...baseConfig,
+      beforeSend: (event, hint) => {
+        if (
+          !ALLOWED_CLIENT_LOG_TYPES.includes(
+            event.tags?.LOG_TYPE as ClientLogType
+          )
+        ) {
+          return null;
+        }
+
+        if (isNetworkError(hint?.originalException)) {
+          return null;
+        }
+
+        return event;
+      }
+    });
+  }
 };

package/types/index.ts

@@ -218,6 +218,14 @@ export interface CacheOptions {
   useProxy?: boolean;
 }
 
+export interface SetCookieOptions {
+  expires?: number; // days
+  path?: string;
+  domain?: string;
+  secure?: boolean;
+  sameSite?: 'strict' | 'lax' | 'none';
+}
+
 export interface ClientRequestOptions {
   useTrailingSlash?: boolean;
   useFormData?: boolean;

package/utils/index.ts

@@ -1,6 +1,7 @@
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../localization';
-import { CDNOptions, ClientRequestOptions } from '../types';
+import { CDNOptions, ClientRequestOptions, SetCookieOptions } from '../types';
+import getRootHostname from './get-root-hostname';
 
 export * from './get-currency';
 export * from './menu-generator';
@@ -20,14 +21,40 @@ export function getCookie(name: string) {
   }
 }
 
-export function setCookie(name: string, val: string) {
-  const date = new Date();
-  const value = val;
+export function setCookie(
+  name: string,
+  value: string,
+  options: SetCookieOptions = {}
+) {
+  const cookieParts = [`${name}=${value}`];
+
+  if (options.expires) {
+    const date = new Date();
+    date.setTime(date.getTime() + options.expires * 24 * 60 * 60 * 1000);
+    cookieParts.push(`expires=${date.toUTCString()}`);
+  }
 
-  date.setTime(date.getTime() + 7 * 24 * 60 * 60 * 1000);
+  cookieParts.push(`path=${options.path ?? '/'}`);
 
-  document.cookie =
-    name + '=' + value + '; expires=' + date.toUTCString() + '; path=/';
+  if (options.secure) {
+    cookieParts.push('secure');
+  }
+
+  if (options.sameSite) {
+    cookieParts.push(`sameSite=${options.sameSite}`);
+  }
+
+  const domain =
+    options.domain ??
+    (settings.localization.localeUrlStrategy === LocaleUrlStrategy.Subdomain
+      ? getRootHostname(document.location.href)
+      : null);
+
+  if (domain) {
+    cookieParts.push(`domain=${domain}`);
+  }
+
+  document.cookie = cookieParts.join('; ');
 }
 
 export function removeCookie(name: string) {
@@ -152,9 +179,6 @@ export function buildCDNUrl(url: string, config?: CDNOptions) {
   return `${rootWithoutOptions}${options}${fileExtension}`;
 }
 
-const { locales, localeUrlStrategy, defaultLocaleValue } =
-  settings.localization;
-
 export const urlLocaleMatcherRegex = new RegExp(
   `^/(${settings.localization.locales
     .filter((l) =>