@akinon/next 2.0.32-beta.0 → 2.0.32

package/CHANGELOG.md

@@ -1,10 +1,10 @@
 # @akinon/next
 
-## 2.0.32-beta.0
+## 2.0.32
 
 ### Patch Changes
 
-- cbbbfd75: ZERO-4376: Bootstrap beta cycle (next-main pre-release motor)
+- 239aa9d0: ZERO-4169: Add instore source parameter and forward set-cookie headers in checkout-with-token redirect
 
 ## 2.0.31
 

package/middlewares/default.ts

@@ -102,9 +102,79 @@ const withPzDefault =
       }
     }
 
+    if (req.nextUrl.pathname.includes('/orders/checkout-with-token/')) {
+      const queryString = searchParams.toString();
+      const currency = searchParams.get('currency')?.toLowerCase();
+      const commercePath = req.nextUrl.pathname.replace(
+        urlLocaleMatcherRegex,
+        ''
+      );
+      const targetUrl = `${Settings.commerceUrl}${commercePath}${
+        queryString ? `?${queryString}` : ''
+      }`;
+
+      try {
+        const commerceResponse = await fetch(targetUrl, {
+          redirect: 'manual',
+          headers: {
+            cookie: req.headers.get('cookie') || ''
+          }
+        });
+
+        const location = commerceResponse.headers.get('location');
+
+        if (location) {
+          const locationUrl = new URL(location, Settings.commerceUrl);
+          locationUrl.searchParams.set('source', 'instore');
+          const redirectTarget = `${req.nextUrl.origin}${locationUrl.pathname}${locationUrl.search}`;
+          const response = NextResponse.redirect(redirectTarget);
+
+          // Set pz-currency FIRST via cookies API — NextResponse.cookies.set()
+          // overwrites manually appended Set-Cookie headers, so it must run
+          // before headers.append('Set-Cookie', ...) calls.
+          if (currency) {
+            response.cookies.set('pz-currency', currency, {
+              sameSite: 'none',
+              secure: true,
+              expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7)
+            });
+          }
+
+          // Forward set-cookie headers from the upstream response
+          const setCookies =
+            commerceResponse.headers.getSetCookie?.() ?? [];
+          setCookies.forEach((cookie) => {
+            response.headers.append('Set-Cookie', cookie);
+          });
+
+          return response;
+        }
+
+        logger.warn('checkout-with-token: no redirect from commerce', {
+          ip,
+          url: targetUrl
+        });
+      } catch {
+        logger.warn(
+          'checkout-with-token: fetch failed, falling back to rewrite',
+          { ip, url: targetUrl }
+        );
+      }
+      const response = NextResponse.rewrite(new URL(targetUrl));
+
+      if (currency) {
+        response.cookies.set('pz-currency', currency, {
+          sameSite: 'none',
+          secure: true,
+          expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7)
+        });
+      }
+
+      return response;
+    }
+
     if (
       req.nextUrl.pathname.includes('/orders/hooks/') ||
-      req.nextUrl.pathname.includes('/orders/checkout-with-token/') ||
       req.nextUrl.pathname.includes('/orders/post-checkout-redirect/') ||
       req.nextUrl.pathname.includes('/hooks/cash_register/complete/') ||
       req.nextUrl.pathname.includes('/hooks/cash_register/pre_order/')
@@ -510,9 +580,7 @@ const withPzDefault =
                                     }
 
                                     if (
-                                      req.cookies.get(
-                                        'pz-post-checkout-flow'
-                                      )
+                                      req.cookies.get('pz-post-checkout-flow')
                                     ) {
                                       if (
                                         pathnameWithoutLocale.startsWith(

package/package.json

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