@akinon/next 1.116.0-rc.5 → 1.116.0-rc.7

package/CHANGELOG.md

@@ -1,5 +1,13 @@
 # @akinon/next
 
+## 1.116.0-rc.7
+
+### Minor Changes
+
+- 729fe756: ZERO-3895: improve non-3D payment handling and error display
+
+## 1.116.0-rc.6
+
 ## 1.116.0-rc.5
 
 ## 1.116.0-rc.4

package/middlewares/masterpass-rest-callback.ts

@@ -9,49 +9,21 @@ const withMasterpassRestCallback =
   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
-      });
+    const isMasterpassCompletePage =
+      url.pathname.includes('/orders/checkout') &&
+      url.searchParams.get('page') === 'MasterpassRestCompletePage';
 
-      return NextResponse.redirect(
-        `${url.origin}${getUrlPathWithLocale(
-          '/orders/checkout/',
-          req.cookies.get('pz-locale')?.value
-        )}`,
-        303
-      );
+    if (!isMasterpassCompletePage) {
+      return middleware(req, event);
     }
 
-    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
+    try {
+      const requestUrl = new URL('/orders/checkout/', Settings.commerceUrl);
+      url.searchParams.forEach((value, key) => {
+        requestUrl.searchParams.set(key, value);
       });
 
-      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> = {};
 
@@ -59,37 +31,6 @@ const withMasterpassRestCallback =
         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',
@@ -105,33 +46,13 @@ const withMasterpassRestCallback =
         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;
-          }
-        }
-      }
+      const { errors } = response;
 
       if (errors && Object.keys(errors).length) {
-        logger.error('Error while processing masterpass REST callback', {
-          middleware: 'masterpass-rest-callback',
+        logger.error('Error while processing MasterpassRestCompletePage', {
+          middleware: 'masterpass-rest-complete',
           errors,
-          requestHeaders,
           ip
         });
 
@@ -143,73 +64,36 @@ const withMasterpassRestCallback =
           {
             status: 303,
             headers: {
-              'Set-Cookie': `pz-pos-error=${JSON.stringify(errors)}; path=/;`
+              'Set-Cookie': `pz-pos-error=${encodeURIComponent(JSON.stringify(errors))}; path=/;`
             }
           }
         );
       }
 
-      logger.info('Masterpass REST callback response', {
-        middleware: 'masterpass-rest-callback',
-        contextList,
-        redirectUrl,
-        ip
-      });
+      const redirectUrl =
+        response.redirect_url ||
+        response.context_list?.[0]?.page_context?.redirect_url;
 
-      if (!redirectUrl) {
-        logger.warn(
-          'No redirection url found in response. Redirecting to checkout page.',
-          {
-            middleware: 'masterpass-rest-callback',
-            requestHeaders,
-            response: JSON.stringify(response),
-            ip
-          }
+      if (redirectUrl) {
+        return NextResponse.redirect(
+          `${url.origin}${getUrlPathWithLocale(redirectUrl, req.cookies.get('pz-locale')?.value)}`,
+          303
         );
-
-        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.redirect(
+        `${url.origin}${getUrlPathWithLocale('/orders/checkout/', req.cookies.get('pz-locale')?.value)}`,
+        303
       );
-
-      return nextResponse;
     } catch (error) {
-      logger.error('Error while processing masterpass REST callback', {
-        middleware: 'masterpass-rest-callback',
+      logger.error('Error while processing MasterpassRestCompletePage', {
+        middleware: 'masterpass-rest-complete',
         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
-        )}`,
+        `${url.origin}${getUrlPathWithLocale('/orders/checkout/', req.cookies.get('pz-locale')?.value)}`,
         303
       );
     }

package/package.json

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

package/utils/index.ts

@@ -193,7 +193,8 @@ export const urlLocaleMatcherRegex = new RegExp(
 );
 
 export const getPosError = () => {
-  const error = JSON.parse(getCookie('pz-pos-error') ?? '{}');
+  const cookieValue = getCookie('pz-pos-error');
+  const error = JSON.parse(cookieValue ? decodeURIComponent(cookieValue) : '{}');
 
   // delete 'pz-pos-error' cookie when refreshing or closing page
   window.addEventListener('beforeunload', () => {