@akinon/next 1.48.0 → 1.50.0-rc.0

package/CHANGELOG.md

@@ -1,5 +1,74 @@
 # @akinon/next
 
+## 1.50.0-rc.0
+
+### Minor Changes
+
+- 90282b53: ZERO-2729: Audit packages for yarn and npm and also update app-template
+- 572d2e84: ZERO-2667: Add iframe support for redirection payment methods
+- 5dfeea0: 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
+- 2d9b2b2: ZERO-2816: Add segment to headers
+- c53ea3e6: ZERO-2609: Reset additional form fields when selectedFormType is not company
+- d93a507: ZERO-2900: Fix pretty url rewrite
+- 8d9ac9a: ZERO-2794: Add field to order type
+- eaf97d6: ZERO-2909: Add deleteCollectionItem query to wishlistApi
+- 70279e7: ZERO-2817: Add metrics endpoint in default middleware
+- 6c25f66: ZERO-2551: Check CACHE_HOST variable
+- bc2b411: ZERO-2825: Add attribute-based shipping options to checkout page
+- 3bf2dd9: ZERO-2551: Fix search page
+- e9541a1: 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.
+- 9d94f7e: ZERO-2820: update parent pk usage for menu generator
+- 2e6104d: ZERO-2888:Edit the numbering in the pagination and the visibility of the prev and next buttons
+- 64699d3: ZERO-2761: Fix invalid import for plugin module
+- 0d3a913e: ZERO-2725: Update decimal scale in Price component
+- 1448a96e: ZERO-2612: add errors type in CheckoutState
+- 1ec2e9d: ZERO-2895: Update app-fetch to include cookies in headers
+- d6edb1d: ZERO-2551: Fix searchparams handling for list and other routes
+- d3474c64: ZERO-2655: Add data source shipping option
+- 75080fd6: ZERO-2630: Add max limit to postcode area
+- 17f8752: ZERO-2816: Make the incoming currency lowercase
+- c45b62c: 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
+- 4920742: Disable getCachedTranslations
+- 12a873e: ZERO-2846:Edit the siteKey regex in the response from GetCaptcha
+- 7e56d6b: ZERO-2841: Update api tagTypes
+- 94b6928: ZERO-2551: Add cache handler check in url-redirection middleware
+- 98bb8dcd: ZERO-2706: Cache getTranlations method
+- 46b7aad7: ZERO-2775: Add condition and logger for menuitemmodel data
+- dcc8a150: ZERO-2694: added build step to RC branch pipeline
+- 8f47cca: ZERO-2829: fix and add nested JSON support for useFormData in api/client route
+- fad27689: ZERO-2739: add gpay to payment plugin map
+- dff0d595: ZERO-2659: add formData support to proxy api requests
+- fdd0b41: ZERO-2706: Add optimized translation support
+- eecb282: ZERO-2607: Update address-related functions to include invalidateTag option
+- f2c325c: ZERO-2838: Move file input component into @akinon/next
+- 9e25a64: ZERO-2835: Update category page layout with breadcrumb
+- beb499e6: ZERO-2551: Add new tsconfig paths
+- 146ea391: ZERO-2774: Update imports
+- f2c92d5: ZERO-2816: Update cookie name
+- 7bd3d99: ZERO-2801: Refactor locale middleware to handle single locale configuration
+- c47be30d: ZERO-2744: Update Order and OrderItem types
+- e9a46acb: ZERO-2738: add CVC input to registered cards in Masterpass
+- f046f8e0: ZERO-2575: update version for react-number-format
+- b9273fd: ZERO-2889: add host headers to requests
+- 86d25315: ZERO-2693: resolve dependency collision warning for eslint-config-next
+- c670bd4: ZERO-2900: Add middleware rewrite functionality
+- 3f9b8d7: ZERO-2761: Update plugins.js for akinon-next
+
+## 1.49.0
+
+### Minor Changes
+
+- 26b809f: ZERO-2898: Add bags_fee property to PreOrder interface
+- 20da358: ZERO-2898: Add setDeliveryBags mutation to checkout api
+- 04115e5: ZERO-2898: Update PreOrder type
+- fa88889: ZERO-2898: Make bags_fee property optional in PreOrder interface
+
 ## 1.48.0
 
 ## 1.47.0
@@ -15,7 +84,126 @@
 
 ### Minor Changes
 
+- 90282b5: ZERO-2729: Audit packages for yarn and npm and also update app-template
+- 572d2e8: ZERO-2667: Add iframe support for redirection payment methods
+- a4c8d6a9: ZERO-2663: Fix the image url for gif and svgs and return them without options
+- fda5b92: ZERO-2725: fix invalid import
+- 2d9b2b2: ZERO-2816: Add segment to headers
+- c53ea3e: ZERO-2609: Reset additional form fields when selectedFormType is not company
+- 8d9ac9a: ZERO-2794: Add field to order type
+- 70279e7: ZERO-2817: Add metrics endpoint in default middleware
+- 6c25f66: ZERO-2551: Check CACHE_HOST variable
+- bc2b411: ZERO-2825: Add attribute-based shipping options to checkout page
+- 3bf2dd9: ZERO-2551: Fix search page
+- e9541a1: 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.
+- 9d94f7e: ZERO-2820: update parent pk usage for menu generator
+- 64699d3: ZERO-2761: Fix invalid import for plugin module
+- 0d3a913: ZERO-2725: Update decimal scale in Price component
+- 1448a96e: ZERO-2612: add errors type in CheckoutState
+- d6edb1d: ZERO-2551: Fix searchparams handling for list and other routes
+- d3474c6: ZERO-2655: Add data source shipping option
+- 75080fd6: ZERO-2630: Add max limit to postcode area
+- 17f8752: ZERO-2816: Make the incoming currency lowercase
+- c45b62c: 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
+- d409996: ZERO-2781: Refactor buildClientRequestUrl function to support caching and options
+- 4920742: Disable getCachedTranslations
+- 7e56d6b: ZERO-2841: Update api tagTypes
+- 94b6928: ZERO-2551: Add cache handler check in url-redirection middleware
+- 98bb8dc: ZERO-2706: Cache getTranlations method
+- 46b7aad: ZERO-2775: Add condition and logger for menuitemmodel data
+- dcc8a15: ZERO-2694: added build step to RC branch pipeline
+- 8f47cca: ZERO-2829: fix and add nested JSON support for useFormData in api/client route
+- fad2768: ZERO-2739: add gpay to payment plugin map
+- dff0d595: ZERO-2659: add formData support to proxy api requests
+- eecb282: ZERO-2607: Update address-related functions to include invalidateTag option
+- f2c325c: ZERO-2838: Move file input component into @akinon/next
+- 9e25a64: ZERO-2835: Update category page layout with breadcrumb
+- beb499e6: ZERO-2551: Add new tsconfig paths
+- 948eb42: ZERO-2852: Add out of stock endpoints
+- 146ea39: ZERO-2774: Update imports
+- f2c92d5: ZERO-2816: Update cookie name
+- 7bd3d99: ZERO-2801: Refactor locale middleware to handle single locale configuration
+- c47be30: ZERO-2744: Update Order and OrderItem types
+- e9a46ac: ZERO-2738: add CVC input to registered cards in Masterpass
+- f046f8e0: ZERO-2575: update version for react-number-format
+- 86d2531: ZERO-2693: resolve dependency collision warning for eslint-config-next
+- 3f9b8d7: ZERO-2761: Update plugins.js for akinon-next
+
+## 1.45.0-rc.4
+
+### Minor Changes
+
+- 8f47cca: ZERO-2829: fix and add nested JSON support for useFormData in api/client route
+
+## 1.45.0-rc.3
+
+### Minor Changes
+
+- 948eb42: ZERO-2852: Add out of stock endpoints
+
+## 1.45.0-rc.2
+
+### Minor Changes
+
+- c45b62c: ZERO-2818: Add upload and download support for b2b package
+- f2c325c: ZERO-2838: Move file input component into @akinon/next
+
+## 1.45.0-rc.1
+
+### Minor Changes
+
+- 7e56d6b: ZERO-2841: Update api tagTypes
+
+## 1.45.0-rc.0
+
+### Minor Changes
+
+- 90282b5: ZERO-2729: Audit packages for yarn and npm and also update app-template
+- 572d2e8: ZERO-2667: Add iframe support for redirection payment methods
+- a4c8d6a9: ZERO-2663: Fix the image url for gif and svgs and return them without options
+- fda5b92: ZERO-2725: fix invalid import
+- 2d9b2b2: ZERO-2816: Add segment to headers
+- c53ea3e: ZERO-2609: Reset additional form fields when selectedFormType is not company
+- 8d9ac9a: ZERO-2794: Add field to order type
+- 70279e7: ZERO-2817: Add metrics endpoint in default middleware
+- 6c25f66: ZERO-2551: Check CACHE_HOST variable
+- bc2b411: ZERO-2825: Add attribute-based shipping options to checkout page
+- 3bf2dd9: ZERO-2551: Fix search page
+- e9541a1: 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.
+- 9d94f7e: ZERO-2820: update parent pk usage for menu generator
+- 64699d3: ZERO-2761: Fix invalid import for plugin module
+- 0d3a913: ZERO-2725: Update decimal scale in Price component
+- 1448a96: ZERO-2612: add errors type in CheckoutState
 - 2ab6e08: ZERO-2841: Update getBasketDetail query
+- d6edb1d: ZERO-2551: Fix searchparams handling for list and other routes
+- d3474c6: ZERO-2655: Add data source shipping option
+- 75080fd: ZERO-2630: Add max limit to postcode area
+- 17f8752: ZERO-2816: Make the incoming currency lowercase
+- 91265bb: ZERO-2551: Improve pretty url and caching performance
+- bbe18b9: ZERO-2575: Fix build error
+- d409996: ZERO-2781: Refactor buildClientRequestUrl function to support caching and options
+- 4920742: Disable getCachedTranslations
+- 94b6928: ZERO-2551: Add cache handler check in url-redirection middleware
+- 98bb8dc: ZERO-2706: Cache getTranlations method
+- 46b7aad: ZERO-2775: Add condition and logger for menuitemmodel data
+- dcc8a15: ZERO-2694: added build step to RC branch pipeline
+- fad2768: ZERO-2739: add gpay to payment plugin map
+- dff0d59: ZERO-2659: add formData support to proxy api requests
+- eecb282: ZERO-2607: Update address-related functions to include invalidateTag option
+- 9e25a64: ZERO-2835: Update category page layout with breadcrumb
+- beb499e: ZERO-2551: Add new tsconfig paths
+- 146ea39: ZERO-2774: Update imports
+- f2c92d5: ZERO-2816: Update cookie name
+- 7bd3d99: ZERO-2801: Refactor locale middleware to handle single locale configuration
+- c47be30: ZERO-2744: Update Order and OrderItem types
+- e9a46ac: ZERO-2738: add CVC input to registered cards in Masterpass
+- f046f8e0: ZERO-2575: update version for react-number-format
+- 86d2531: ZERO-2693: resolve dependency collision warning for eslint-config-next
+- 3f9b8d7: ZERO-2761: Update plugins.js for akinon-next
 
 ## 1.44.0
 
@@ -23,7 +211,201 @@
 
 ### Minor Changes
 
+- 90282b5: ZERO-2729: Audit packages for yarn and npm and also update app-template
+- 572d2e8: ZERO-2667: Add iframe support for redirection payment methods
+- a4c8d6a9: ZERO-2663: Fix the image url for gif and svgs and return them without options
+- fda5b92: ZERO-2725: fix invalid import
+- 2d9b2b2: ZERO-2816: Add segment to headers
+- c53ea3e: ZERO-2609: Reset additional form fields when selectedFormType is not company
+- 8d9ac9a: ZERO-2794: Add field to order type
+- 70279e7: ZERO-2817: Add metrics endpoint in default middleware
+- 6c25f66: ZERO-2551: Check CACHE_HOST variable
+- bc2b411: ZERO-2825: Add attribute-based shipping options to checkout page
+- 3bf2dd9: ZERO-2551: Fix search page
+- e9541a1: 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.
+- 9d94f7e: ZERO-2820: update parent pk usage for menu generator
+- 64699d3: ZERO-2761: Fix invalid import for plugin module
+- 0d3a913: ZERO-2725: Update decimal scale in Price component
+- 1448a96: ZERO-2612: add errors type in CheckoutState
+- d6edb1d: ZERO-2551: Fix searchparams handling for list and other routes
+- d3474c6: ZERO-2655: Add data source shipping option
+- 75080fd: ZERO-2630: Add max limit to postcode area
+- 17f8752: ZERO-2816: Make the incoming currency lowercase
+- 91265bb: ZERO-2551: Improve pretty url and caching performance
+- bbe18b9: ZERO-2575: Fix build error
+- d409996: ZERO-2781: Refactor buildClientRequestUrl function to support caching and options
+- 4920742: Disable getCachedTranslations
+- 94b6928: ZERO-2551: Add cache handler check in url-redirection middleware
+- 98bb8dc: ZERO-2706: Cache getTranlations method
+- 46b7aad: ZERO-2775: Add condition and logger for menuitemmodel data
+- dcc8a15: ZERO-2694: added build step to RC branch pipeline
+- fad2768: ZERO-2739: add gpay to payment plugin map
+- dff0d59: ZERO-2659: add formData support to proxy api requests
+- eecb282: ZERO-2607: Update address-related functions to include invalidateTag option
+- 9e25a64: ZERO-2835: Update category page layout with breadcrumb
+- beb499e: ZERO-2551: Add new tsconfig paths
+- 146ea39: ZERO-2774: Update imports
+- f2c92d5: ZERO-2816: Update cookie name
+- 7bd3d99: ZERO-2801: Refactor locale middleware to handle single locale configuration
+- c47be30: ZERO-2744: Update Order and OrderItem types
+- e9a46ac: ZERO-2738: add CVC input to registered cards in Masterpass
+- f046f8e0: ZERO-2575: update version for react-number-format
+- 86d2531: ZERO-2693: resolve dependency collision warning for eslint-config-next
+- 3f9b8d7: ZERO-2761: Update plugins.js for akinon-next
+
+## 1.43.0-rc.15
+
+## 1.43.0-rc.14
+
+### Minor Changes
+
+- 3bf2dd9: ZERO-2551: Fix search page
+
+## 1.43.0-rc.13
+
+### Minor Changes
+
+- 9e25a64: ZERO-2835: Update category page layout with breadcrumb
+
+## 1.43.0-rc.12
+
+### Minor Changes
+
+- 4920742: Disable getCachedTranslations
+
+## 1.43.0-rc.11
+
+### Minor Changes
+
+- 6c25f66: ZERO-2551: Check CACHE_HOST variable
+
+## 1.43.0-rc.10
+
+### Minor Changes
+
+- d6edb1d: ZERO-2551: Fix searchparams handling for list and other routes
+
+## 1.43.0-rc.9
+
+### Minor Changes
+
+- bc2b411: ZERO-2825: Add attribute-based shipping options to checkout page
+
+## 1.43.0-rc.8
+
+### Minor Changes
+
+- 70279e7: ZERO-2817: Add metrics endpoint in default middleware
+- 9d94f7e: ZERO-2820: update parent pk usage for menu generator
+
+## 1.43.0-rc.7
+
+### Minor Changes
+
+- 7bd3d99: ZERO-2801: Refactor locale middleware to handle single locale configuration
+
+## 1.43.0-rc.6
+
+### Minor Changes
+
+- 90282b5: ZERO-2729: Audit packages for yarn and npm and also update app-template
+- 572d2e8: ZERO-2667: Add iframe support for redirection payment methods
+- a4c8d6a: ZERO-2663: Fix the image url for gif and svgs and return them without options
+- fda5b92: ZERO-2725: fix invalid import
+- 2d9b2b2: ZERO-2816: Add segment to headers
+- c53ea3e: ZERO-2609: Reset additional form fields when selectedFormType is not company
+- 8d9ac9a: ZERO-2794: Add field to order type
+- e9541a1: ZERO-2816: Add headers to url
+- c53ef7b: 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.
+- 64699d3: ZERO-2761: Fix invalid import for plugin module
+- 0d3a913: ZERO-2725: Update decimal scale in Price component
+- 1448a96: ZERO-2612: add errors type in CheckoutState
+- d3474c6: ZERO-2655: Add data source shipping option
+- 75080fd: ZERO-2630: Add max limit to postcode area
+- 17f8752: ZERO-2816: Make the incoming currency lowercase
+- 91265bb: ZERO-2551: Improve pretty url and caching performance
+- bbe18b9: ZERO-2575: Fix build error
+- d409996: ZERO-2781: Refactor buildClientRequestUrl function to support caching and options
+- 94b6928: ZERO-2551: Add cache handler check in url-redirection middleware
+- 98bb8dc: ZERO-2706: Cache getTranlations method
+- 46b7aad: ZERO-2775: Add condition and logger for menuitemmodel data
+- dcc8a15: ZERO-2694: added build step to RC branch pipeline
+- fad2768: ZERO-2739: add gpay to payment plugin map
+- dff0d59: ZERO-2659: add formData support to proxy api requests
+- eecb282: ZERO-2607: Update address-related functions to include invalidateTag option
 - 4a163f2: ZERO-2761: Add condition for basket summary
+- beb499e: ZERO-2551: Add new tsconfig paths
+- 146ea39: ZERO-2774: Update imports
+- f2c92d5: ZERO-2816: Update cookie name
+- c47be30: ZERO-2744: Update Order and OrderItem types
+- e9a46ac: ZERO-2738: add CVC input to registered cards in Masterpass
+- f046f8e: ZERO-2575: update version for react-number-format
+- 86d2531: ZERO-2693: resolve dependency collision warning for eslint-config-next
+- 3f9b8d7: ZERO-2761: Update plugins.js for akinon-next
+
+## 1.43.0-rc.5
+
+### Minor Changes
+
+- 17f8752: ZERO-2816: Make the incoming currency lowercase
+
+## 1.43.0-rc.4
+
+### Minor Changes
+
+- 3f9b8d7: ZERO-2761: Update plugins.js for akinon-next
+
+## 1.43.0-rc.3
+
+### Minor Changes
+
+- 64699d3: ZERO-2761: Fix invalid import for plugin module
+
+## 1.43.0-rc.2
+
+### Minor Changes
+
+- f2c92d5: ZERO-2816: Update cookie name
+
+## 1.43.0-rc.1
+
+### Minor Changes
+
+- eecb282: ZERO-2607: Update address-related functions to include invalidateTag option
+
+## 1.43.0-rc.0
+
+### Minor Changes
+
+- 90282b5: ZERO-2729: Audit packages for yarn and npm and also update app-template
+- 572d2e8: ZERO-2667: Add iframe support for redirection payment methods
+- a4c8d6a: ZERO-2663: Fix the image url for gif and svgs and return them without options
+- fda5b92: ZERO-2725: fix invalid import
+- 2d9b2b2: ZERO-2816: Add segment to headers
+- c53ea3e: ZERO-2609: Reset additional form fields when selectedFormType is not company
+- 8d9ac9a: ZERO-2794: Add field to order type
+- e9541a1: ZERO-2816: Add headers to url
+- c53ef7b: 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.
+- 0d3a913: ZERO-2725: Update decimal scale in Price component
+- 1448a96: ZERO-2612: add errors type in CheckoutState
+- d3474c6: ZERO-2655: Add data source shipping option
+- 75080fd: ZERO-2630: Add max limit to postcode area
+- 91265bb: ZERO-2551: Improve pretty url and caching performance
+- bbe18b9: ZERO-2575: Fix build error
+- d409996: ZERO-2781: Refactor buildClientRequestUrl function to support caching and options
+- 94b6928: ZERO-2551: Add cache handler check in url-redirection middleware
+- 98bb8dc: ZERO-2706: Cache getTranlations method
+- 46b7aad: ZERO-2775: Add condition and logger for menuitemmodel data
+- dcc8a15: ZERO-2694: added build step to RC branch pipeline
+- fad2768: ZERO-2739: add gpay to payment plugin map
+- dff0d59: ZERO-2659: add formData support to proxy api requests
+- beb499e: ZERO-2551: Add new tsconfig paths
+- 146ea39: ZERO-2774: Update imports
+- c47be30: ZERO-2744: Update Order and OrderItem types
+- e9a46ac: ZERO-2738: add CVC input to registered cards in Masterpass
+- f046f8e: ZERO-2575: update version for react-number-format
+- 86d2531: ZERO-2693: resolve dependency collision warning for eslint-config-next
 
 ## 1.42.0
 

package/api/client.ts

@@ -4,6 +4,7 @@ import settings from 'settings';
 import logger from '../utils/log';
 import formatCookieString from '../utils/format-cookie-string';
 import cookieParser from 'set-cookie-parser';
+import { cookies } from 'next/headers';
 
 interface RouteParams {
   params: {
@@ -51,18 +52,24 @@ async function proxyRequest(...args) {
     extraHeaders[key.toLowerCase()] = value;
   }
 
-  [
+  const excludedHeaders = [
     'x-forwarded-host',
     'x-forwarded-proto',
     'x-forwarded-port',
     'x-requested-with',
     'origin',
-    'host',
     'referer',
     'accept',
     'content-length',
-    'content-type'
-  ].forEach((header) => delete extraHeaders[header]);
+    'content-type',
+    'host'
+  ];
+
+  excludedHeaders.forEach((header) => {
+    if (!settings.includedProxyHeaders?.includes(header)) {
+      delete extraHeaders[header];
+    }
+  });
 
   const fetchOptions = {
     method: req.method,
@@ -74,16 +81,33 @@ async function proxyRequest(...args) {
     }
   } as RequestInit;
 
+  const nextCookies = cookies();
+  const segment = nextCookies.get('pz-segment')?.value;
+  const currency = nextCookies.get('pz-external-currency')?.value;
+
+  if (segment) {
+    fetchOptions.headers['X-Segment-Id'] = segment;
+  }
+
+  if (currency) {
+    fetchOptions.headers = Object.assign({}, fetchOptions.headers, {
+      'x-currency': currency
+    });
+  }
+
   if (options.contentType) {
     fetchOptions.headers['Content-Type'] = options.contentType;
   }
 
+  const isMultipartFormData = req.headers
+    .get('content-type')
+    ?.includes('multipart/form-data;');
+
   if (req.method !== 'GET') {
-    const formData = new URLSearchParams();
-    let body = {};
+    let body: Record<string, any> | FormData = {};
 
     try {
-      body = await req.json();
+      body = isMultipartFormData ? await req.formData() : await req.json();
     } catch (error) {
       logger.error(
         `Client Proxy Request - Error while parsing request body to JSON`,
@@ -94,13 +118,25 @@ async function proxyRequest(...args) {
       );
     }
 
-    Object.keys(body ?? {}).forEach((key) => {
-      if (body[key]) {
-        formData.append(key, body[key]);
-      }
-    });
+    if (isMultipartFormData) {
+      fetchOptions.body = body as FormData;
+    } else {
+      const formData = new FormData();
+
+      Object.keys(body ?? {}).forEach((key) => {
+        if (body[key]) {
+          if (typeof body[key] === 'object' && body[key] !== null) {
+            formData.append(key, JSON.stringify(body[key]));
+          } else {
+            formData.append(key, body[key]);
+          }
+        }
+      });
 
-    fetchOptions.body = !options.useFormData ? JSON.stringify(body) : formData;
+      fetchOptions.body = !options.useFormData
+        ? JSON.stringify(body)
+        : formData;
+    }
   }
 
   let url = `${commerceUrl}/${slug.replace(/,/g, '/')}`;
@@ -116,11 +152,8 @@ async function proxyRequest(...args) {
   try {
     const request = await fetch(url, fetchOptions);
 
-    // Using NextResponse.json with status 204 will cause an error
     if (request.status === 204) {
-      return new Response(null, {
-        status: 204
-      });
+      return new Response(null, { status: 204 });
     }
 
     let response = {} as any;

package/assets/styles/index.css

@@ -0,0 +1,49 @@
+.checkout-payment-iframe-wrapper {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  border: none;
+  z-index: 1000;
+  background-color: white;
+}
+.checkout-payment-iframe-wrapper iframe {
+  width: 100%;
+  height: 100%;
+  border: none;
+  background-color: white;
+}
+.checkout-payment-iframe-wrapper .close-button {
+  position: fixed;
+  top: 16px;
+  right: 16px;
+  width: 32px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1001;
+}
+
+.checkout-payment-redirection-iframe-wrapper {
+  width: 100%;
+  position: relative;
+}
+.checkout-payment-redirection-iframe-wrapper iframe {
+  width: 100%;
+  height: 100%;
+  border: none;
+  background-color: white;
+}
+.checkout-payment-redirection-iframe-wrapper .close-button {
+  position: absolute;
+  top: 16px;
+  right: 16px;
+  width: 32px;
+  height: 32px;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 1001;
+}/*# sourceMappingURL=index.css.map */

package/assets/styles/index.css.map

@@ -0,0 +1 @@
+{"version":3,"sources":["index.scss","index.css"],"names":[],"mappings":"AAAA;EACE,eAAA;EACA,MAAA;EACA,OAAA;EACA,WAAA;EACA,YAAA;EACA,YAAA;EACA,aAAA;EACA,uBAAA;ACCF;ADCE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,uBAAA;ACCJ;ADEE;EACE,eAAA;EACA,SAAA;EACA,WAAA;EACA,WAAA;EACA,YAAA;EACA,aAAA;EACA,mBAAA;EACA,uBAAA;EACA,aAAA;ACAJ;;ADIA;EACE,WAAA;EACA,kBAAA;ACDF;ADGE;EACE,WAAA;EACA,YAAA;EACA,YAAA;EACA,uBAAA;ACDJ;ADIE;EACE,kBAAA;EACA,SAAA;EACA,WAAA;EACA,WAAA;EACA,YAAA;EACA,aAAA;EACA,mBAAA;EACA,uBAAA;EACA,aAAA;ACFJ","file":"index.css"}

package/assets/styles/index.scss

@@ -1,29 +1,53 @@
 .checkout-payment-iframe-wrapper {
-	position: fixed;
-	top: 0;
-	left: 0;
-	width: 100%;
-	height: 100%;
-	border: none;
-	z-index: 1000;
-	background-color: white;
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  border: none;
+  z-index: 1000;
+  background-color: white;
 
-	iframe {
-		width: 100%;
-		height: 100%;
-		border: none;
-		background-color: white;
-	}
+  iframe {
+    width: 100%;
+    height: 100%;
+    border: none;
+    background-color: white;
+  }
 
-	.close-button {
-		position: fixed;
-		top: 16px;
-		right: 16px;
-		width: 32px;
-		height: 32px;
-		display: flex;
-		align-items: center;
-		justify-content: center;
-		z-index: 1001;
-	}
-}
+  .close-button {
+    position: fixed;
+    top: 16px;
+    right: 16px;
+    width: 32px;
+    height: 32px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1001;
+  }
+}
+
+.checkout-payment-redirection-iframe-wrapper {
+  width: 100%;
+  position: relative;
+
+  iframe {
+    width: 100%;
+    height: 100%;
+    border: none;
+    background-color: white;
+  }
+
+  .close-button {
+    position: absolute;
+    top: 16px;
+    right: 16px;
+    width: 32px;
+    height: 32px;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    z-index: 1001;
+  }
+}