@akinon/next 1.60.0-rc.17 → 1.60.0-rc.19

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @akinon/next
 
+## 1.60.0-rc.19
+
+### Minor Changes
+
+- 48d508fd: ZERO-2989: refine cookie header in payment middlewares
+
+## 1.60.0-rc.18
+
+### Minor Changes
+
+- e6f3653e: ZERO-2985: Add resetBasketOnCurrencyChange option to Settings
+
 ## 1.60.0-rc.17
 
 ### Minor Changes

package/middlewares/complete-gpay.ts

@@ -43,7 +43,7 @@ const withCompleteGpay =
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',
-      Cookie: `osessionid=${req.cookies.get('osessionid')?.value ?? ''}`,
+      Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
       'x-forwarded-for': ip
     };

package/middlewares/complete-masterpass.ts

@@ -43,7 +43,7 @@ const withCompleteMasterpass =
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',
-      Cookie: `osessionid=${req.cookies.get('osessionid')?.value ?? ''}`,
+      Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
       'x-forwarded-for': ip
     };

package/middlewares/currency.ts

@@ -75,7 +75,8 @@ const withCurrency =
         url.pathname.match(urlLocaleMatcherRegex) &&
         !url.search.includes('mobile_app=true') &&
         !url.search.includes('page=CreditCardThreeDSecurePage') &&
-        !url.search.includes('page=RedirectionPageCompletePage')
+        !url.search.includes('page=RedirectionPageCompletePage') &&
+        settings.resetBasketOnCurrencyChange !== false
       ) {
         logger.info('Currency changed. Resetting basket...', {
           sessionid: req.cookies.get('osessionid')?.value ?? '',

package/middlewares/three-d-redirection.ts

@@ -43,7 +43,7 @@ const withThreeDRedirection =
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',
-      Cookie: `osessionid=${req.cookies.get('osessionid')?.value ?? ''}`,
+      Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
       'x-forwarded-for': ip
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.60.0-rc.17",
+  "version": "1.60.0-rc.19",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.60.0-rc.17",
+    "@akinon/eslint-plugin-projectzero": "1.60.0-rc.19",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/types/index.ts

@@ -194,6 +194,11 @@ export interface Settings {
   useOptimizedTranslations?: boolean;
   plugins?: Record<string, Record<string, any>>;
   includedProxyHeaders?: string[];
+  /**
+   * By default, the currency will be reset when the currency is changed.
+   * If you want to keep the basket when the currency is changed, you can set this option to `false`.
+   */
+  resetBasketOnCurrencyChange?: boolean;
 }
 
 export interface CacheOptions {