@akinon/next 1.126.4-v1-rc.3 → 1.126.4

package/CHANGELOG.md

@@ -1,25 +1,10 @@
 # @akinon/next
 
-## 1.126.4-v1-rc.3
+## 1.126.4
 
 ### Patch Changes
 
-- d480941: ZERO-4399: add card rewards to pz-masterpass-rest
-- 182a639: ZERO-4483: Verify v1-rc maintenance pipeline (no-op patch to confirm v1-rc dist-tag flow)
-
-## 1.126.4-v1-rc.2
-
-## 1.126.4-v1-rc.1
-
-### Patch Changes
-
-- d480941: ZERO-4399: add card rewards to pz-masterpass-rest
-
-## 1.126.4-v1-rc.0
-
-### Patch Changes
-
-- 182a639: ZERO-4483: Verify v1-rc maintenance pipeline (no-op patch to confirm v1-rc dist-tag flow)
+- 17a2288: ZERO-4622: Add additional remote pattern for akinoncloudcdn.com in image configuration
 
 ## 1.126.3
 

package/middlewares/masterpass-rest-callback.ts

@@ -7,111 +7,224 @@ import { getCheckoutPath } from '../utils';
 
 const withMasterpassRestCallback =
   (middleware: NextMiddleware) =>
-    async (req: PzNextRequest, event: NextFetchEvent) => {
-      const url = req.nextUrl.clone();
-      const ip = req.headers.get('x-forwarded-for') ?? '';
-
-      const isMasterpassCompletePage =
-        url.pathname.includes('/orders/checkout') &&
-        url.searchParams.get('page') === 'MasterpassRestCompletePage';
+  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
+          }
+        );
 
-      if (!isMasterpassCompletePage) {
-        return middleware(req, event);
+        return NextResponse.redirect(
+          `${url.origin}${getUrlPathWithLocale(
+            '/orders/checkout/',
+            req.cookies.get('pz-locale')?.value
+          )}`,
+          303
+        );
       }
 
-      try {
-        const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
-        const requestUrl = new URL(getCheckoutPath(isPostCheckout), Settings.commerceUrl);
+      const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
+      const requestUrl = new URL(getCheckoutPath(isPostCheckout), 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;
+          }
+        }
+      }
 
-        url.searchParams.forEach((value, key) => {
-          requestUrl.searchParams.set(key, value);
+      if (errors && Object.keys(errors).length) {
+        logger.error('Error while processing masterpass REST callback', {
+          middleware: 'masterpass-rest-callback',
+          errors,
+          requestHeaders,
+          ip
         });
 
-        const formData = await req.formData();
-        const body: Record<string, string> = {};
-
-        Array.from(formData.entries()).forEach(([key, value]) => {
-          body[key] = value.toString();
-        });
+        const errorResponse = NextResponse.redirect(
+          `${url.origin}${getUrlPathWithLocale(
+            '/orders/checkout/',
+            req.cookies.get('pz-locale')?.value
+          )}`,
+          {
+            status: 303,
+            headers: {
+              'Set-Cookie': `pz-pos-error=${encodeURIComponent(JSON.stringify(errors))}; path=/;`
+            }
+          }
+        );
 
-        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)
+        // Add error cookie
+        errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
+          path: '/'
         });
 
-        const response = await request.json();
-        const { errors } = response;
+        return errorResponse;
+      }
 
-        if (errors && Object.keys(errors).length) {
-          logger.error('Error while processing MasterpassRestCompletePage', {
+      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',
-            errors,
+            requestHeaders,
+            response: JSON.stringify(response),
             ip
-          });
-
-          const errorResponse = NextResponse.redirect(
-            `${url.origin}${getUrlPathWithLocale(
-              '/orders/checkout/',
-              req.cookies.get('pz-locale')?.value
-            )}`,
-            303
-          );
-
-          // Add error cookie
-          errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
-            path: '/'
-          });
-
-          return errorResponse;
-        }
-
-        const redirectUrl =
-          response.redirect_url ||
-          response.context_list?.[0]?.page_context?.redirect_url;
-
-        if (redirectUrl) {
-          const nextResponse = NextResponse.redirect(
-            `${url.origin}${getUrlPathWithLocale(redirectUrl, req.cookies.get('pz-locale')?.value)}`,
-            303
-          );
-
-          // Forward set-cookie headers from the upstream response
-          const setCookieHeader = request.headers.get('set-cookie');
-          if (setCookieHeader) {
-            setCookieHeader.split(',').forEach((cookie) => {
-              nextResponse.headers.append('Set-Cookie', cookie.trim());
-            });
           }
+        );
 
-          return nextResponse;
-        }
+        const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`;
 
-        return NextResponse.redirect(
-          `${url.origin}${getUrlPathWithLocale('/orders/checkout/', req.cookies.get('pz-locale')?.value)}`,
-          303
-        );
-      } catch (error) {
-        logger.error('Error while processing MasterpassRestCompletePage', {
-          middleware: 'masterpass-rest-callback',
-          error,
-          ip
-        });
+        return NextResponse.redirect(redirectUrlWithLocale, 303);
+      }
 
-        return NextResponse.redirect(
-          `${url.origin}${getUrlPathWithLocale('/orders/checkout/', req.cookies.get('pz-locale')?.value)}`,
-          303
-        );
+      const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
+        redirectUrl,
+        req.cookies.get('pz-locale')?.value
+      )}`;
+
+      logger.info('Redirecting after masterpass REST callback', {
+        middleware: 'masterpass-rest-callback',
+        redirectUrl: redirectUrlWithLocale,
+        ip
+      });
+
+      const nextResponse = NextResponse.redirect(redirectUrlWithLocale, 303);
+
+      // Forward set-cookie headers from the upstream response
+      const setCookieHeader = request.headers.get('set-cookie');
+      if (setCookieHeader) {
+        setCookieHeader.split(',').forEach((cookie) => {
+          nextResponse.headers.append('Set-Cookie', cookie.trim());
+        });
       }
-    };
+
+      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.126.4-v1-rc.3",
+  "version": "1.126.4",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -35,7 +35,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.126.4-v1-rc.3",
+    "@akinon/eslint-plugin-projectzero": "1.126.4",
     "@babel/core": "7.26.10",
     "@babel/preset-env": "7.26.9",
     "@babel/preset-typescript": "7.27.0",

package/with-pz-config.js

@@ -21,6 +21,10 @@ const defaultConfig = {
         protocol: 'https',
         hostname: '**.akinoncloud.com'
       },
+      {
+        protocol: 'https',
+        hostname: '**.akinoncloudcdn.com'
+      },
       {
         protocol: 'https',
         hostname: '**.akinoncdn.com'