@akinon/next 1.59.0-rc.5 → 1.60.0-rc.10

package/CHANGELOG.md

@@ -1,6 +1,26 @@
 # @akinon/next
 
-## 1.59.0-rc.5
+## 1.60.0-rc.10
+
+### Minor Changes
+
+- 7b17923: ZERO-2669: Fix isIframePaymentOptionExcluded value
+
+## 1.60.0-rc.9
+
+### Minor Changes
+
+- ad5de2c: ZERO-2949: Add currency and language headers to format=json request
+
+## 1.60.0-rc.8
+
+### Minor Changes
+
+- 57d1657: ZERO-2925: Update condation
+
+## 1.60.0-rc.7
+
+## 1.60.0-rc.6
 
 ### Minor Changes
 
@@ -36,10 +56,9 @@
 - 7e56d6b: ZERO-2841: Update api tagTypes
 - 94b69285: ZERO-2551: Add cache handler check in url-redirection middleware
 - 98bb8dcd: ZERO-2706: Cache getTranlations method
-- 50f3c60: ZERO-2936: Fix Input component styling for floating labels
 - dcc8a150: ZERO-2694: added build step to RC branch pipeline
 - 3be7462: ZERO-2934: fix reset basket on redirection payment complete
-- 8f47cca: ZERO-2829: fix and add nested JSON support for useFormData in api/client route
+- 8f47ccae: ZERO-2829: fix and add nested JSON support for useFormData in api/client route
 - fdd0b41: ZERO-2706: Add optimized translation support
 - f2c325c: ZERO-2838: Move file input component into @akinon/next
 - 9e25a64b: ZERO-2835: Update category page layout with breadcrumb
@@ -52,73 +71,11 @@
 - 86d25315: ZERO-2693: resolve dependency collision warning for eslint-config-next
 - 3f9b8d7e: ZERO-2761: Update plugins.js for akinon-next
 
-## 1.59.0-rc.4
-
-### Minor Changes
-
-- d899cc7: ZERO-2925: Login by checking the session id
-- 3be7462: ZERO-2934: fix reset basket on redirection payment complete
-
-## 1.59.0-rc.3
-
-## 1.59.0-rc.2
-
-### Minor Changes
-
-- c873740: ZERO-2903: add types
-- 034b813: ZERO-2903: create saved card plugin
-
-## 1.59.0-rc.1
+## 1.59.0
 
 ### Minor Changes
 
-- 907813c: ZERO-2934: add payment-gateway/<gateway> redirect in middleware
-
-## 1.59.0-rc.0
-
-### Minor Changes
-
-- c416d18: ZERO-2915: Add delivery option null check for setAddress
-- 572d2e84: ZERO-2667: Add iframe support for redirection payment methods
-- 5dfeea04: ZERO-2801: Revert ZERO-2801
-- a4c8d6a9: ZERO-2663: Fix the image url for gif and svgs and return them without options
-- fda5b927: ZERO-2725: fix invalid import
-- 2d9b2b2c: ZERO-2816: Add segment to headers
-- c53ea3e6: ZERO-2609: Reset additional form fields when selectedFormType is not company
-- 6c25f666: ZERO-2551: Check CACHE_HOST variable
-- bc2b4117: ZERO-2825: Add attribute-based shipping options to checkout page
-- 3bf2dd94: ZERO-2551: Fix search page
-- e9541a13: ZERO-2816: Add headers to url
-- c53ef7b9: ZERO-2668: The Link component has been updated to improve the logic for handling href values. Previously, if the href was not a string or started with 'http', it would return the href as is. Now, if the href is not provided, it will default to '#' to prevent any potential errors. Additionally, if the href is a string and does not start with 'http', it will be formatted with the locale and pathname, based on the localeUrlStrategy and defaultLocaleValue. This ensures that the correct href is generated based on the localization settings.
-- 2e6104d0: ZERO-2888:Edit the numbering in the pagination and the visibility of the prev and next buttons
-- 64699d3f: ZERO-2761: Fix invalid import for plugin module
-- 0d3a913e: ZERO-2725: Update decimal scale in Price component
-- 7b05522: ZERO-2905: Fix resend and close button in otp package
-- d6edb1d0: ZERO-2551: Fix searchparams handling for list and other routes
-- d3474c64: ZERO-2655: Add data source shipping option
-- 17f87524: ZERO-2816: Make the incoming currency lowercase
-- 29ead87: ZERO-2905: Fix resend and close button in otp package
-- c45b62c9: ZERO-2818: Add upload and download support for b2b package
-- 91265bba: ZERO-2551: Improve pretty url and caching performance
-- bbe18b9f: ZERO-2575: Fix build error
-- d4099960: ZERO-2781: Refactor buildClientRequestUrl function to support caching and options
-- 4920742c: Disable getCachedTranslations
-- 12a873e7: ZERO-2846:Edit the siteKey regex in the response from GetCaptcha
-- 7e56d6b6: ZERO-2841: Update api tagTypes
-- 94b69285: ZERO-2551: Add cache handler check in url-redirection middleware
-- 98bb8dcd: ZERO-2706: Cache getTranlations method
-- dcc8a150: ZERO-2694: added build step to RC branch pipeline
-- 8f47ccae: ZERO-2829: fix and add nested JSON support for useFormData in api/client route
-- fdd0b418: ZERO-2706: Add optimized translation support
-- f2c325c1: ZERO-2838: Move file input component into @akinon/next
-- 9e25a64b: ZERO-2835: Update category page layout with breadcrumb
-- beb499e6: ZERO-2551: Add new tsconfig paths
-- f2c92d5c: ZERO-2816: Update cookie name
-- 7bd3d992: ZERO-2801: Refactor locale middleware to handle single locale configuration
-- f046f8e0: ZERO-2575: update version for react-number-format
-- 49eeebf: ZERO-2909: Add deleteCollectionItem query to wishlistApi
-- 86d25315: ZERO-2693: resolve dependency collision warning for eslint-config-next
-- 3f9b8d7e: ZERO-2761: Update plugins.js for akinon-next
+- 50f3c60: ZERO-2936: Fix Input component styling for floating labels
 
 ## 1.58.0
 

package/middlewares/default.ts

@@ -37,6 +37,12 @@ const withPzDefault =
     // Support legacy ?format=json query param
     if (searchParams.has('json') || searchParams.get('format') === 'json') {
       try {
+        const { locales } = Settings.localization;
+        const locale = req.cookies.get('pz-locale')?.value;
+        const selectedLanguageValue = locales.find(
+          (l) => l.value === locale
+        )?.apiValue;
+
         searchParams.set('format', 'json');
 
         const request = await fetch(
@@ -51,7 +57,9 @@ const withPzDefault =
             headers: {
               Cookie: req.headers.get('cookie') || '',
               Accept: 'application/json',
-              'X-Requested-With': 'XMLHttpRequest'
+              'X-Requested-With': 'XMLHttpRequest',
+              'x-currency': req.cookies.get('pz-currency')?.value ?? '',
+              'Accept-Language': selectedLanguageValue ?? ''
             }
           }
         );

package/middlewares/oauth-login.ts

@@ -60,7 +60,10 @@ const withOauthLogin =
 
     const currentSessionId = req.cookies.get('osessionid');
 
-    if (req.cookies.get('messages')?.value.includes('Successfully signed in') || currentSessionId) {
+    if (
+      req.cookies.get('messages')?.value.includes('Successfully signed in') ||
+      (currentSessionId && req.cookies.get('messages'))
+    ) {
       let redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
         '/auth/oauth-login',
         req.cookies.get('pz-locale')?.value

package/package.json

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

package/redux/middlewares/checkout.ts

@@ -230,7 +230,7 @@ export const contextListMiddleware: Middleware = ({
             isMobileApp ||
             /iPad|iPhone|iPod|Android/i.test(navigator.userAgent);
           const isIframePaymentOptionExcluded =
-            !settings.checkout?.iframeExcludedPaymentOptions?.includes(
+            settings.checkout?.iframeExcludedPaymentOptions?.includes(
               result.payload?.pre_order?.payment_option?.slug
             );
           urlObj.searchParams.set('t', new Date().getTime().toString());