@akinon/next 1.92.0-rc.22 → 1.92.0-rc.24

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @akinon/next
 
+## 1.92.0-rc.24
+
+### Minor Changes
+
+- fee608d: ZERO-3422: Refactor body handling in wallet complete redirection middleware
+
+## 1.92.0-rc.23
+
+### Minor Changes
+
+- cbdb5c14: ZERO-3448: fix set cookie domain handling for subdomain locale strategy
+
 ## 1.92.0-rc.22
 
 ### Minor Changes

package/middlewares/wallet-complete-redirection.ts

@@ -49,7 +49,31 @@ const withWalletCompleteRedirection =
     };
 
     try {
-      const body = await streamToString(req.body);
+      const existingBody = await streamToString(req.body);
+      const queryParams = new URLSearchParams(url.search);
+      const bodyParams = new URLSearchParams();
+
+      if (existingBody) {
+        try {
+          const existingParams = new URLSearchParams(existingBody);
+
+          for (const [key, value] of existingParams) {
+            bodyParams.append(key, value);
+          }
+        } catch {
+          logger.error('Error parsing existing body as URL-encoded data', {
+            middleware: 'wallet-complete-redirection',
+            existingBody,
+            ip
+          });
+        }
+      }
+
+      for (const [key, value] of queryParams) {
+        bodyParams.append(key, value);
+      }
+
+      const body = bodyParams.toString();
 
       if (!sessionId) {
         logger.warn(
@@ -70,7 +94,7 @@ const withWalletCompleteRedirection =
       }
 
       const request = await fetch(requestUrl, {
-        method: req.method,
+        method: 'POST',
         headers: requestHeaders,
         body
       });

package/package.json

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

package/types/index.ts

@@ -224,6 +224,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,6 @@
 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';
@@ -21,29 +21,40 @@ export function getCookie(name: string) {
   }
 }
 
-export function setCookie(name: string, value: string) {
-  const WEEK_IN_MS = 7 * 24 * 60 * 60 * 1000;
-  const hostname = process.env.NEXT_PUBLIC_URL || '';
+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()}`);
+  }
+
+  cookieParts.push(`path=${options.path ?? '/'}`);
+
+  if (options.secure) {
+    cookieParts.push('secure');
+  }
+
+  if (options.sameSite) {
+    cookieParts.push(`sameSite=${options.sameSite}`);
+  }
+
   const domain =
-    localeUrlStrategy === LocaleUrlStrategy.Subdomain
-      ? getRootHostname(hostname)
-      : null;
-  const domainStr = domain ? `Domain=${domain}` : '';
-  const expiryDate = new Date(Date.now() + WEEK_IN_MS);
-  const isSecure = hostname.startsWith('https://');
-
-  const cookieParts = [
-    `${name}=${value}`,
-    `Eexpires=${expiryDate.toUTCString()}`,
-    `Path=/`,
-    `SameSite=lax`,
-    `Secure=${isSecure}`,
-    domainStr
-  ].filter(Boolean);
-
-  const cookieString = cookieParts.join('; ');
-
-  document.cookie = cookieString;
+    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) {
@@ -168,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) =>