@akinon/next 1.111.0-snapshot-ZERO-3792-20251107072714 → 1.111.0

package/CHANGELOG.md

@@ -1,10 +1,11 @@
 # @akinon/next
 
-## 1.111.0-snapshot-ZERO-3792-20251107072714
+## 1.111.0
 
 ### Minor Changes
 
-- 888fdec: ZERO-3792: Virtual Try On new features are implemented and also basket support implemented.
+- c026300: ZERO-3833: fix masterpass rest conflicts
+- b47b9d8: ZERO-3414: create masterpass-rest package
 
 ## 1.110.0
 

package/api/virtual-try-on.ts

@@ -122,55 +122,6 @@ export async function GET(request: NextRequest) {
           'X-Virtual-Try-On-Cache-Status': 'MISS'
         }
       });
-    } else if (endpoint === 'job-status') {
-      const referenceUrl = searchParams.get('reference_url');
-      if (!referenceUrl) {
-        return NextResponse.json(
-          { error: 'reference_url is required' },
-          { status: 400 }
-        );
-      }
-
-      const externalUrl = `${VIRTUAL_TRY_ON_API_URL}/api/async/v1/job-status?reference_url=${encodeURIComponent(referenceUrl)}`;
-      const clientIP = getClientIP(request);
-      const locale = getLocaleFromRequest(request);
-
-      const headersToSend = {
-        Accept: 'application/json',
-        ...(locale && { 'Accept-Language': locale }),
-        ...(request.headers.get('authorization') && {
-          Authorization: request.headers.get('authorization')!
-        }),
-        ...(clientIP && {
-          'X-Forwarded-For': clientIP
-        })
-      };
-
-      const response = await fetch(externalUrl, {
-        method: 'GET',
-        headers: headersToSend
-      });
-
-      let responseData: any;
-      const responseText = await response.text();
-
-      try {
-        responseData = responseText ? JSON.parse(responseText) : {};
-      } catch (parseError) {
-        return NextResponse.json(
-          { error: 'Invalid JSON response from job status API' },
-          { status: 500 }
-        );
-      }
-
-      return NextResponse.json(responseData, {
-        status: response.status,
-        headers: {
-          'Access-Control-Allow-Origin': '*',
-          'Access-Control-Allow-Methods': 'GET, POST, PUT, OPTIONS',
-          'Access-Control-Allow-Headers': 'Content-Type, Accept, Authorization'
-        }
-      });
     }
 
     return NextResponse.json(
@@ -190,32 +141,13 @@ export async function POST(request: NextRequest) {
     const body = await request.json();
 
     let externalUrl: string;
-    let httpMethod = 'POST';
-
     if (endpoint === 'feedback') {
-      if (!body.url || typeof body.url !== 'string' || !body.url.trim()) {
-        return NextResponse.json(
-          { status: 'error', message: 'URL is required for feedback' },
-          { status: 400 }
-        );
-      }
-      if (typeof body.feedback !== 'boolean') {
-        return NextResponse.json(
-          { status: 'error', message: 'Feedback must be a boolean value' },
-          { status: 400 }
-        );
-      }
       externalUrl = `${VIRTUAL_TRY_ON_API_URL}/api/v1/feedback`;
-      httpMethod = 'PUT';
-    } else if (endpoint === 'async-multiple-try-on') {
-      externalUrl = `${VIRTUAL_TRY_ON_API_URL}/api/async/v1/multiple-virtual-try-on`;
     } else {
-      return NextResponse.json(
-        { error: 'Invalid endpoint specified' },
-        { status: 400 }
-      );
+      externalUrl = `${VIRTUAL_TRY_ON_API_URL}/api/v1/virtual-try-on`;
     }
 
+    const httpMethod = endpoint === 'feedback' ? 'PUT' : 'POST';
     const clientIP = getClientIP(request);
     const locale = getLocaleFromRequest(request);
 
@@ -231,18 +163,13 @@ export async function POST(request: NextRequest) {
       })
     };
 
-    const fetchOptions: RequestInit = {
+    const response = await fetch(externalUrl, {
       method: httpMethod,
-      headers: headersToSend
-    };
-
-    if (httpMethod !== 'GET') {
-      fetchOptions.body = JSON.stringify(body);
-    }
-
-    const response = await fetch(externalUrl, fetchOptions);
+      headers: headersToSend,
+      body: JSON.stringify(body)
+    });
 
-    let responseData: Record<string, any>;
+    let responseData: any;
     const responseText = await response.text();
 
     if (endpoint === 'feedback') {
@@ -346,7 +273,7 @@ export async function PUT(request: NextRequest) {
       body: JSON.stringify(body)
     });
 
-    const responseData = response?.json() || {};
+    const responseData = await response.json();
 
     return NextResponse.json(responseData, {
       status: response.status,
@@ -360,8 +287,7 @@ export async function PUT(request: NextRequest) {
     return NextResponse.json(
       {
         status: 'error',
-        message: 'Internal server error occurred during feedback submission',
-        error: (error as Error).message
+        message: 'Internal server error occurred during feedback submission'
       },
       { status: 500 }
     );

package/components/plugin-module.tsx

@@ -23,7 +23,8 @@ enum Plugin {
   SavedCard = 'pz-saved-card',
   FlowPayment = 'pz-flow-payment',
   VirtualTryOn = 'pz-virtual-try-on',
-  Hepsipay = 'pz-hepsipay'
+  Hepsipay = 'pz-hepsipay',
+  MasterpassRest = 'pz-masterpass-rest'
 }
 
 export enum Component {
@@ -50,10 +51,10 @@ export enum Component {
   MultiBasket = 'MultiBasket',
   SavedCard = 'SavedCardOption',
   VirtualTryOnPlugin = 'VirtualTryOnPlugin',
-  BasketVirtualTryOn = 'BasketVirtualTryOn',
   IyzicoSavedCard = 'IyzicoSavedCardOption',
   Hepsipay = 'Hepsipay',
-  FlowPayment = 'FlowPayment'
+  FlowPayment = 'FlowPayment',
+  MasterpassRest = 'MasterpassRestOption'
 }
 
 const PluginComponents = new Map([
@@ -89,11 +90,9 @@ const PluginComponents = new Map([
   [Plugin.SavedCard, [Component.SavedCard, Component.IyzicoSavedCard]],
   [Plugin.SavedCard, [Component.SavedCard]],
   [Plugin.FlowPayment, [Component.FlowPayment]],
-  [
-    Plugin.VirtualTryOn,
-    [Component.VirtualTryOnPlugin, Component.BasketVirtualTryOn]
-  ],
-  [Plugin.Hepsipay, [Component.Hepsipay]]
+  [Plugin.VirtualTryOn, [Component.VirtualTryOnPlugin]],
+  [Plugin.Hepsipay, [Component.Hepsipay]],
+  [Plugin.MasterpassRest, [Component.MasterpassRest]]
 ]);
 
 const getPlugin = (component: Component) => {
@@ -105,10 +104,10 @@ const getPlugin = (component: Component) => {
 };
 
 export default function PluginModule({
-  component,
-  props,
-  children
-}: {
+                                       component,
+                                       props,
+                                       children
+                                     }: {
   component: Component;
   props?: any;
   children?: React.ReactNode;
@@ -164,6 +163,8 @@ export default function PluginModule({
               promise = import(`${'@akinon/pz-flow-payment'}`);
             } else if (plugin === Plugin.VirtualTryOn) {
               promise = import(`${'@akinon/pz-virtual-try-on'}`);
+            } else if (plugin === Plugin.MasterpassRest) {
+              promise = import(`${'@akinon/pz-masterpass-rest'}`);
             }
           } catch (error) {
             logger.error(error);

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

@@ -16,6 +16,7 @@ const paymentTypeToView = {
   gpay: 'gpay',
   loyalty_money: 'loyalty',
   masterpass: 'credit-card',
+  masterpass_rest: 'masterpass-rest',
   pay_on_delivery: 'pay-on-delivery',
   redirection: 'redirection',
   saved_card: 'saved-card'

package/hooks/use-payment-options.ts

@@ -21,7 +21,8 @@ export const usePaymentOptions = () => {
     credit_payment: 'pz-credit-payment',
     masterpass: 'pz-masterpass',
     saved_card: 'pz-saved-card',
-    gpay: 'pz-gpay'
+    gpay: 'pz-gpay',
+    masterpass_rest: 'pz-masterpass-rest'
   };
 
   const isInitialTypeIncluded = (type: string) => initialTypes.has(type);

package/middlewares/default.ts

@@ -13,7 +13,8 @@ import {
   withThreeDRedirection,
   withUrlRedirection,
   withCompleteWallet,
-  withWalletCompleteRedirection
+  withWalletCompleteRedirection,
+  withMasterpassRestCallback
 } from '.';
 import { urlLocaleMatcherRegex } from '../utils';
 import withCurrency from './currency';
@@ -230,226 +231,235 @@ const withPzDefault =
                       withCompleteMasterpass(
                         withSavedCardRedirection(
                           withCompleteWallet(
-                          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,
-                                    ''
-                                  );
-
-                                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(
+                              withMasterpassRestCallback(
+                                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,
+                                          ''
+                                        );
+                                    }
 
-                                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()
-                                    )}`;
-                                }
+                                    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()
+                                        )}`;
+                                    }
 
-                                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
+                                    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);
-                                }
+                                      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,
+                                        {
+                                          domain: rootHostname,
+                                          sameSite: 'none',
+                                          secure: true,
+                                          expires: new Date(
+                                            Date.now() + 1000 * 60 * 60 * 24 * 7
+                                          ) // 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
-                                  });
-                                }
+                                    middlewareResult.cookies.set(
+                                      'pz-currency',
+                                      currency,
+                                      {
+                                        domain: rootHostname,
+                                        sameSite: 'none',
+                                        secure: true,
+                                        expires: new Date(
+                                          Date.now() + 1000 * 60 * 60 * 24 * 7
+                                        ) // 7 days
+                                      }
+                                    );
 
-                                middlewareResult.headers.set(
-                                  'pz-url',
-                                  req.nextUrl.toString()
-                                );
+                                    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-set-currency')) {
-                                  middlewareResult.cookies.delete(
-                                    'pz-set-currency'
-                                  );
-                                }
+                                    middlewareResult.headers.set(
+                                      'pz-url',
+                                      req.nextUrl.toString()
+                                    );
 
-                                if (process.env.ACC_APP_VERSION) {
-                                  middlewareResult.headers.set(
-                                    'acc-app-version',
-                                    process.env.ACC_APP_VERSION
-                                  );
-                                }
+                                    if (req.cookies.get('pz-set-currency')) {
+                                      middlewareResult.cookies.delete(
+                                        'pz-set-currency'
+                                      );
+                                    }
 
-                                // Set CSRF token if not set
-                                try {
-                                  const url = `${Settings.commerceUrl}${user.csrfToken}`;
+                                    if (process.env.ACC_APP_VERSION) {
+                                      middlewareResult.headers.set(
+                                        'acc-app-version',
+                                        process.env.ACC_APP_VERSION
+                                      );
+                                    }
 
-                                  if (!req.cookies.get('csrftoken')) {
-                                    const { csrf_token } = await (
-                                      await fetch(url)
-                                    ).json();
-                                    middlewareResult.cookies.set(
-                                      'csrftoken',
-                                      csrf_token,
-                                      {
-                                        domain: rootHostname
+                                    // 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('withPzDefault Error', {
+                                      error,
+                                      ip
+                                    });
                                   }
-                                } catch (error) {
-                                  logger.error('CSRF Error', {
-                                    error,
-                                    ip
-                                  });
+
+                                  return middlewareResult;
                                 }
-                              } catch (error) {
-                                logger.error('withPzDefault Error', {
-                                  error,
-                                  ip
-                                });
-                              }
-
-                              return middlewareResult;
-                            }
+                              )
+                            )
                           )
                         )
                       )
@@ -461,7 +471,6 @@ const withPzDefault =
           )
         )
       )
-    )
     )(req, event);
   };
 

package/middlewares/index.ts

@@ -11,6 +11,7 @@ import withCheckoutProvider from './checkout-provider';
 import withSavedCardRedirection from './saved-card-redirection';
 import withCompleteWallet from './complete-wallet';
 import withWalletCompleteRedirection from './wallet-complete-redirection';
+import withMasterpassRestCallback from './masterpass-rest-callback';
 import { NextRequest } from 'next/server';
 
 export {
@@ -26,7 +27,8 @@ export {
   withCheckoutProvider,
   withSavedCardRedirection,
   withCompleteWallet,
-  withWalletCompleteRedirection
+  withWalletCompleteRedirection,
+  withMasterpassRestCallback
 };
 
 export interface PzNextRequest extends NextRequest {

package/middlewares/masterpass-rest-callback.ts

@@ -0,0 +1,218 @@
+import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
+import Settings from 'settings';
+import logger from '../utils/log';
+import { getUrlPathWithLocale } from '../utils/localization';
+import { PzNextRequest } from '.';
+
+const withMasterpassRestCallback =
+  (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.pathname.includes('/orders/masterpass-rest-callback')) {
+      return middleware(req, event);
+    }
+
+    if (req.method !== 'POST') {
+      logger.warn('Invalid request method for masterpass REST callback', {
+        middleware: 'masterpass-rest-callback',
+        method: req.method,
+        ip
+      });
+
+      return NextResponse.redirect(
+        `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`,
+        303
+      );
+    }
+
+    const responseCode = url.searchParams.get('responseCode');
+    const token = url.searchParams.get('token');
+
+    if (!responseCode || !token) {
+      logger.warn('Missing required parameters for masterpass REST callback', {
+        middleware: 'masterpass-rest-callback',
+        responseCode,
+        token,
+        ip
+      });
+
+      return NextResponse.redirect(
+        `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`,
+        303
+      );
+    }
+
+    try {
+      const formData = await req.formData();
+      const body: Record<string, string> = {};
+
+      Array.from(formData.entries()).forEach(([key, value]) => {
+        body[key] = value.toString();
+      });
+
+      if (!sessionId) {
+        logger.warn(
+          'Make sure that the SESSION_COOKIE_SAMESITE environment variable is set to None in Commerce.',
+          {
+            middleware: 'masterpass-rest-callback',
+            ip
+          }
+        );
+
+        return NextResponse.redirect(
+          `${url.origin}${getUrlPathWithLocale(
+            '/orders/checkout/',
+            req.cookies.get('pz-locale')?.value
+          )}`,
+          303
+        );
+      }
+
+      const requestUrl = new URL('/orders/checkout/', Settings.commerceUrl);
+      requestUrl.searchParams.set('page', 'MasterpassRestCompletePage');
+      requestUrl.searchParams.set('responseCode', responseCode);
+      requestUrl.searchParams.set('token', token);
+      requestUrl.searchParams.set(
+        'three_d_secure',
+        body.transactionType?.includes('3D') ? 'true' : 'false'
+      );
+      requestUrl.searchParams.set(
+        'transactionType',
+        body.transactionType || ''
+      );
+
+      const requestHeaders = {
+        'Content-Type': 'application/x-www-form-urlencoded',
+        'X-Requested-With': 'XMLHttpRequest',
+        Cookie: req.headers.get('cookie') ?? '',
+        'x-currency': req.cookies.get('pz-currency')?.value ?? '',
+        'x-forwarded-for': ip,
+        'User-Agent': req.headers.get('user-agent') ?? ''
+      };
+
+      const request = await fetch(requestUrl.toString(), {
+        method: 'POST',
+        headers: requestHeaders,
+        body: new URLSearchParams(body)
+      });
+
+      logger.info('Masterpass REST callback request', {
+        requestUrl: requestUrl.toString(),
+        status: request.status,
+        requestHeaders,
+        ip
+      });
+
+      const response = await request.json();
+
+      const { context_list: contextList, errors } = response;
+
+      let redirectUrl = response.redirect_url;
+
+      if (!redirectUrl && contextList && contextList.length > 0) {
+        for (const context of contextList) {
+          if (context.page_context && context.page_context.redirect_url) {
+            redirectUrl = context.page_context.redirect_url;
+            break;
+          }
+        }
+      }
+
+      if (errors && Object.keys(errors).length) {
+        logger.error('Error while processing masterpass REST callback', {
+          middleware: 'masterpass-rest-callback',
+          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('Masterpass REST callback response', {
+        middleware: 'masterpass-rest-callback',
+        contextList,
+        redirectUrl,
+        ip
+      });
+
+      if (!redirectUrl) {
+        logger.warn(
+          'No redirection url found in response. Redirecting to checkout page.',
+          {
+            middleware: 'masterpass-rest-callback',
+            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 after masterpass REST callback', {
+        middleware: 'masterpass-rest-callback',
+        redirectUrlWithLocale,
+        ip
+      });
+
+      const nextResponse = NextResponse.redirect(redirectUrlWithLocale, 303);
+
+      nextResponse.headers.set(
+        'Set-Cookie',
+        request.headers.get('set-cookie') ?? ''
+      );
+
+      return nextResponse;
+    } catch (error) {
+      logger.error('Error while processing masterpass REST callback', {
+        middleware: 'masterpass-rest-callback',
+        error,
+        requestHeaders: {
+          Cookie: req.headers.get('cookie') ?? '',
+          'x-currency': req.cookies.get('pz-currency')?.value ?? ''
+        },
+        ip
+      });
+
+      return NextResponse.redirect(
+        `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`,
+        303
+      );
+    }
+  };
+
+export default withMasterpassRestCallback;

package/package.json

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

package/plugins.d.ts

@@ -46,3 +46,8 @@ declare module '@akinon/pz-cybersource-uc' {
 }
 
 declare module '@akinon/pz-flow-payment' {}
+
+declare module '@akinon/pz-masterpass-rest' {
+  export const MasterpassRestOption: React.FC;
+  export const masterpassRestReducer: any;
+}

package/plugins.js

@@ -19,5 +19,6 @@ module.exports = [
   'pz-cybersource-uc',
   'pz-hepsipay',
   'pz-flow-payment',
-  'pz-virtual-try-on'
+  'pz-virtual-try-on',
+  'pz-masterpass-rest'
 ];

package/redux/middlewares/checkout.ts

@@ -208,7 +208,10 @@ export const contextListMiddleware: Middleware = ({
             dispatch(setCardType(context.page_context.card_type));
           }
 
-          if (context.page_context.installments) {
+          if (
+            context.page_context.installments &&
+            preOrder?.payment_option?.payment_type !== 'masterpass_rest'
+          ) {
             dispatch(setInstallmentOptions(context.page_context.installments));
           }
         }

package/redux/middlewares/pre-order/installment-option.ts

@@ -20,6 +20,7 @@ export const installmentOptionMiddleware: Middleware = ({
     if (
       !preOrder?.installment &&
       preOrder?.payment_option?.payment_type !== 'saved_card' &&
+      preOrder?.payment_option?.payment_type !== 'masterpass_rest' &&
       installmentOptions.length > 0
     ) {
       const firstInstallmentOptionPk = installmentOptions[0]?.pk;

package/redux/reducers/index.ts

@@ -9,6 +9,7 @@ import { masterpassReducer } from '@akinon/pz-masterpass';
 import { otpReducer } from '@akinon/pz-otp';
 import { savedCardReducer } from '@akinon/pz-saved-card';
 import cyberSourceUcReducer from '@akinon/pz-cybersource-uc/src/redux/reducer';
+import { masterpassRestReducer } from '@akinon/pz-masterpass-rest';
 
 const fallbackReducer = (state = {}) => state;
 
@@ -21,7 +22,8 @@ const reducers = {
   masterpass: masterpassReducer || fallbackReducer,
   otp: otpReducer || fallbackReducer,
   savedCard: savedCardReducer || fallbackReducer,
-  cybersource_uc: cyberSourceUcReducer || fallbackReducer
+  cybersource_uc: cyberSourceUcReducer || fallbackReducer,
+  masterpassRest: masterpassRestReducer || fallbackReducer
 };
 
 export default reducers;