@akinon/next 2.0.10-rc.0 → 2.0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/CHANGELOG.md CHANGED
@@ -1,30 +1,10 @@
1
1
  # @akinon/next
2
2
 
3
- ## 2.0.10-rc.0
3
+ ## 2.0.10
4
4
 
5
5
  ### Patch Changes
6
6
 
7
- - 0cf9ea23: BRDG-16491: Prevent redirect when iframe payment is active
8
- - 324f97d5: ZERO-4219: replace masterpass-rest-complete with masterpass-rest-callback
9
- - 51ea0688: ZERO-4377: Fix checkout card type state being cleared after valid bin number responses.
10
- - ZERO-4160: Enhance oauth-login middleware with improved request handling and logging
11
- - b55acb768: ZERO-2577: Fix pagination bug and update usePagination hook and ensure pagination controls rendering correctly
12
- - 760258c1: ZERO-4160: Enhance oauth-login middleware to handle fetch errors and improve response handling
13
- - 143be2b9d: ZERO-3457: Crop styles are customizable and logic improved for rendering similar products modal
14
- - 7889b08f: ZERO-4276: Enhance route generation by adding .env loading and custom skip segments support
15
- - 9f8cd3bc5: ZERO-3449: AI Search Active Filters & Crop Style changes have been implemented
16
- - bfafa3f4: ZERO-4160: Refactor oauth-login middleware to use fetchCommerce for API calls and improve cookie handling
17
- - 57d7eb30: ZERO-4276: Refactor route generation logic by removing environment loading and simplifying skip segments handling
18
- - d99a6a7d5: ZERO-3457_1: Fixed the settings prop and made sure everything is customizable.
19
- - 9db81a71: ZERO-4365: Remove brand `@theme/*` alias imports from library packages
20
- - 591e345e: ZERO-3855: Enhance credit card payment handling in checkout middlewares
21
- - 4de5303c5: ZERO-2504: add cookie filter to api client request
22
- - 95b139dc1: ZERO-3795: Remove duplicate entry for SavedCard in PluginComponents map
23
- - 1d00f2d0: BRDG-16664: Set secure flag for CSRF token cookies in useCaptcha and default middleware
24
- - 4ac7b2a1: ZERO-4219: fix masterpass-rest callback route format and double-encoded error cookie
25
- - 4998a963: ZERO-4168: Add server-side payload optimization
26
- - 3909d322: Edit the duplicate Plugin.SimilarProducts in the plugin-module.
27
- - e18836b2: ZERO-4160: Restore scope in Sentry addon configuration in akinon.json
7
+ - 31f07bd7: ZERO-4459: Move migrate-eslint codemod into @akinon/projectzero and integrate into upgrade-to-2
28
8
 
29
9
  ## 2.0.9
30
10
 
@@ -6,7 +6,6 @@ const findBaseDir = require('../utils/find-base-dir');
6
6
 
7
7
  const generateRoutes = () => {
8
8
  const baseDir = findBaseDir();
9
-
10
9
  const srcDir = path.join(baseDir, 'src');
11
10
  const appDir = path.join(srcDir, 'app');
12
11
 
@@ -35,10 +34,8 @@ const generateRoutes = () => {
35
34
  '[segment]',
36
35
  '[url]',
37
36
  '[theme]',
38
- '[member_type]',
39
- '[clienttype]'
37
+ '[member_type]'
40
38
  ];
41
-
42
39
  const skipCatchAllRoutes = ['[...prettyurl]', '[...not_found]'];
43
40
 
44
41
  const walkDirectory = (dir, basePath = '') => {
@@ -116,6 +116,7 @@ const PluginComponents = new Map([
116
116
  ]
117
117
  ],
118
118
  [Plugin.SavedCard, [Component.SavedCard, Component.IyzicoSavedCard]],
119
+ [Plugin.SavedCard, [Component.SavedCard]],
119
120
  [Plugin.FlowPayment, [Component.FlowPayment]],
120
121
  [
121
122
  Plugin.VirtualTryOn,
@@ -738,6 +738,7 @@ export const checkoutApi = api.injectEndpoints({
738
738
  },
739
739
  async onQueryStarted(arg, { dispatch, queryFulfilled }) {
740
740
  dispatch(setPaymentStepBusy(true));
741
+ dispatch(setCardType(arg));
741
742
  await queryFulfilled;
742
743
  dispatch(setPaymentStepBusy(false));
743
744
  }
@@ -7,8 +7,6 @@ import { parse } from 'lossless-json';
7
7
  import logger from '../../utils/log';
8
8
  import { headers as nHeaders } from 'next/headers';
9
9
  import { ServerVariables } from '../../utils/server-variables';
10
- import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
11
- import settings from 'settings';
12
10
 
13
11
  function getCategoryDataHandler(
14
12
  pk: number,
@@ -82,7 +80,7 @@ function getCategoryDataHandler(
82
80
  };
83
81
  }
84
82
 
85
- export const getCategoryData = async ({
83
+ export const getCategoryData = ({
86
84
  pk,
87
85
  searchParams,
88
86
  headers,
@@ -95,7 +93,7 @@ export const getCategoryData = async ({
95
93
  searchParams?: SearchParams;
96
94
  headers?: Record<string, string>;
97
95
  }) => {
98
- const result = await Cache.wrap(
96
+ return Cache.wrap(
99
97
  CacheKey.Category(pk, searchParams, headers),
100
98
  locale,
101
99
  getCategoryDataHandler(pk, locale, currency, searchParams, headers),
@@ -104,16 +102,6 @@ export const getCategoryData = async ({
104
102
  compressed: true
105
103
  }
106
104
  );
107
-
108
- if (settings.payloadOptimization?.enabled && result?.data) {
109
- try {
110
- return { ...result, data: optimizeCategoryResponse(result.data, settings.payloadOptimization) };
111
- } catch (e) {
112
- logger.error('Payload optimization failed for category', { pk, error: (e as Error).message });
113
- }
114
- }
115
-
116
- return result;
117
105
  };
118
106
 
119
107
  function getCategoryBySlugDataHandler(
@@ -6,8 +6,6 @@ import appFetch, { FetchResponseType } from '../../utils/app-fetch';
6
6
  import { parse } from 'lossless-json';
7
7
  import logger from '../../utils/log';
8
8
  import { ServerVariables } from '../../utils/server-variables';
9
- import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
10
- import settings from 'settings';
11
9
 
12
10
  const getListDataHandler = (
13
11
  locale,
@@ -68,7 +66,7 @@ export const getListData = async ({
68
66
  searchParams: SearchParams;
69
67
  headers?: Record<string, string>;
70
68
  }) => {
71
- const result = await Cache.wrap(
69
+ return Cache.wrap(
72
70
  CacheKey.List(searchParams, headers),
73
71
  locale,
74
72
  getListDataHandler(locale, currency, searchParams, headers),
@@ -77,14 +75,4 @@ export const getListData = async ({
77
75
  compressed: true
78
76
  }
79
77
  );
80
-
81
- if (settings.payloadOptimization?.enabled && result) {
82
- try {
83
- return optimizeCategoryResponse(result, settings.payloadOptimization);
84
- } catch (e) {
85
- logger.error('Payload optimization failed for list', { error: (e as Error).message });
86
- }
87
- }
88
-
89
- return result;
90
78
  };
@@ -4,8 +4,6 @@ import { ProductCategoryResult, ProductResult, SearchParams } from '../../types'
4
4
  import appFetch from '../../utils/app-fetch';
5
5
  import { ServerVariables } from '../../utils/server-variables';
6
6
  import logger from '../../utils/log';
7
- import { optimizeProductResponse } from '../../utils/payload-optimizer';
8
- import settings from 'settings';
9
7
 
10
8
  type GetProduct = {
11
9
  pk: number | string;
@@ -165,13 +163,5 @@ export const getProductData = async ({
165
163
  throw error;
166
164
  }
167
165
 
168
- if (settings.payloadOptimization?.enabled && result?.data) {
169
- try {
170
- return { ...result, data: optimizeProductResponse(result.data, settings.payloadOptimization) };
171
- } catch (e) {
172
- logger.error('Payload optimization failed for product', { pk, error: (e as Error).message });
173
- }
174
- }
175
-
176
166
  return result;
177
167
  };
@@ -4,9 +4,6 @@ import { GetCategoryResponse, SearchParams } from '../../types';
4
4
  import { generateCommerceSearchParams } from '../../utils';
5
5
  import appFetch from '../../utils/app-fetch';
6
6
  import { ServerVariables } from '../../utils/server-variables';
7
- import { optimizeCategoryResponse } from '../../utils/payload-optimizer';
8
- import logger from '../../utils/log';
9
- import settings from 'settings';
10
7
 
11
8
  const getSpecialPageDataHandler = (
12
9
  pk: number,
@@ -48,7 +45,7 @@ export const getSpecialPageData = async ({
48
45
  searchParams: SearchParams;
49
46
  headers?: Record<string, string>;
50
47
  }) => {
51
- const result = await Cache.wrap(
48
+ return Cache.wrap(
52
49
  CacheKey.SpecialPage(pk, searchParams, headers),
53
50
  locale,
54
51
  getSpecialPageDataHandler(pk, locale, currency, searchParams, headers),
@@ -57,14 +54,4 @@ export const getSpecialPageData = async ({
57
54
  compressed: true
58
55
  }
59
56
  );
60
-
61
- if (settings.payloadOptimization?.enabled && result) {
62
- try {
63
- return optimizeCategoryResponse(result, settings.payloadOptimization);
64
- } catch (e) {
65
- logger.error('Payload optimization failed for special-page', { pk, error: (e as Error).message });
66
- }
67
- }
68
-
69
- return result;
70
57
  };
@@ -4,9 +4,6 @@ import { CacheOptions, WidgetResultType, WidgetSchemaType } from '../../types';
4
4
  import appFetch from '../../utils/app-fetch';
5
5
  import { widgets } from '../urls';
6
6
  import { ServerVariables } from '../../utils/server-variables';
7
- import { optimizeWidgetResponse } from '../../utils/payload-optimizer';
8
- import logger from '../../utils/log';
9
- import settings from 'settings';
10
7
 
11
8
  const getWidgetDataHandler =
12
9
  (
@@ -56,7 +53,7 @@ export const getWidgetData = async <T>({
56
53
  cacheOptions?: CacheOptions;
57
54
  headers?: Record<string, string>;
58
55
  }): Promise<WidgetResultType<T>> => {
59
- const result = await Cache.wrap(
56
+ return Cache.wrap(
60
57
  CacheKey.Widget(slug),
61
58
  locale,
62
59
  getWidgetDataHandler(slug, locale, currency, headers),
@@ -65,16 +62,6 @@ export const getWidgetData = async <T>({
65
62
  ...cacheOptions
66
63
  }
67
64
  );
68
-
69
- if (settings.payloadOptimization?.enabled && result) {
70
- try {
71
- return optimizeWidgetResponse(result, settings.payloadOptimization) as WidgetResultType<T>;
72
- } catch (e) {
73
- logger.error('Payload optimization failed for widget', { slug, error: (e as Error).message });
74
- }
75
- }
76
-
77
- return result as WidgetResultType<T>;
78
65
  };
79
66
 
80
67
  const getCollectionWidgetDataHandler =
package/data/urls.ts CHANGED
@@ -183,11 +183,7 @@ export const product = {
183
183
  breadcrumbUrl: (menuitemmodel: string) =>
184
184
  `/menus/generate_breadcrumb/?item=${menuitemmodel}&generator_name=menu_item`,
185
185
  bundleProduct: (productPk: string, queryString: string) =>
186
- `/bundle-product/${productPk}/?${queryString}`,
187
- similarProducts: (params?: string) =>
188
- `/similar-products${params ? `?${params}` : ''}`,
189
- similarProductsList: (params?: string) =>
190
- `/similar-product-list${params ? `?${params}` : ''}`
186
+ `/bundle-product/${productPk}/?${queryString}`
191
187
  };
192
188
 
193
189
  export const wishlist = {
@@ -39,7 +39,7 @@ export const useCaptcha = () => {
39
39
  };
40
40
 
41
41
  if (csrfToken) {
42
- setCookie('csrftoken', csrfToken, { secure: true });
42
+ setCookie('csrftoken', csrfToken);
43
43
  }
44
44
 
45
45
  const onCaptchaChange = useCallback(async (response) => {
@@ -547,8 +547,7 @@ const withPzDefault =
547
547
  'csrftoken',
548
548
  csrf_token,
549
549
  {
550
- domain: rootHostname,
551
- secure: true
550
+ domain: rootHostname
552
551
  }
553
552
  );
554
553
  }
@@ -10,23 +10,49 @@ const withMasterpassRestCallback =
10
10
  async (req: PzNextRequest, event: NextFetchEvent) => {
11
11
  const url = req.nextUrl.clone();
12
12
  const ip = req.headers.get('x-forwarded-for') ?? '';
13
+ const sessionId = req.cookies.get('osessionid');
13
14
 
14
- const isMasterpassCompletePage =
15
- url.pathname.includes('/orders/checkout') &&
16
- url.searchParams.get('page') === 'MasterpassRestCompletePage';
17
-
18
- if (!isMasterpassCompletePage) {
15
+ if (!url.pathname.includes('/orders/masterpass-rest-callback')) {
19
16
  return middleware(req, event);
20
17
  }
21
18
 
22
- try {
23
- const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
24
- const requestUrl = new URL(getCheckoutPath(isPostCheckout), Settings.commerceUrl);
19
+ if (req.method !== 'POST') {
20
+ logger.warn('Invalid request method for masterpass REST callback', {
21
+ middleware: 'masterpass-rest-callback',
22
+ method: req.method,
23
+ ip
24
+ });
25
+
26
+ return NextResponse.redirect(
27
+ `${url.origin}${getUrlPathWithLocale(
28
+ '/orders/checkout/',
29
+ req.cookies.get('pz-locale')?.value
30
+ )}`,
31
+ 303
32
+ );
33
+ }
25
34
 
26
- url.searchParams.forEach((value, key) => {
27
- requestUrl.searchParams.set(key, value);
35
+ const responseCode = url.searchParams.get('responseCode');
36
+ const token = url.searchParams.get('token');
37
+
38
+ if (!responseCode || !token) {
39
+ logger.warn('Missing required parameters for masterpass REST callback', {
40
+ middleware: 'masterpass-rest-callback',
41
+ responseCode,
42
+ token,
43
+ ip
28
44
  });
29
45
 
46
+ return NextResponse.redirect(
47
+ `${url.origin}${getUrlPathWithLocale(
48
+ '/orders/checkout/',
49
+ req.cookies.get('pz-locale')?.value
50
+ )}`,
51
+ 303
52
+ );
53
+ }
54
+
55
+ try {
30
56
  const formData = await req.formData();
31
57
  const body: Record<string, string> = {};
32
58
 
@@ -34,6 +60,38 @@ const withMasterpassRestCallback =
34
60
  body[key] = value.toString();
35
61
  });
36
62
 
63
+ if (!sessionId) {
64
+ logger.warn(
65
+ 'Make sure that the SESSION_COOKIE_SAMESITE environment variable is set to None in Commerce.',
66
+ {
67
+ middleware: 'masterpass-rest-callback',
68
+ ip
69
+ }
70
+ );
71
+
72
+ return NextResponse.redirect(
73
+ `${url.origin}${getUrlPathWithLocale(
74
+ '/orders/checkout/',
75
+ req.cookies.get('pz-locale')?.value
76
+ )}`,
77
+ 303
78
+ );
79
+ }
80
+
81
+ const isPostCheckout = req.cookies.get('pz-post-checkout-flow')?.value === 'true';
82
+ const requestUrl = new URL(getCheckoutPath(isPostCheckout), Settings.commerceUrl);
83
+ requestUrl.searchParams.set('page', 'MasterpassRestCompletePage');
84
+ requestUrl.searchParams.set('responseCode', responseCode);
85
+ requestUrl.searchParams.set('token', token);
86
+ requestUrl.searchParams.set(
87
+ 'three_d_secure',
88
+ body.transactionType?.includes('3D') ? 'true' : 'false'
89
+ );
90
+ requestUrl.searchParams.set(
91
+ 'transactionType',
92
+ body.transactionType || ''
93
+ );
94
+
37
95
  const requestHeaders = {
38
96
  'Content-Type': 'application/x-www-form-urlencoded',
39
97
  'X-Requested-With': 'XMLHttpRequest',
@@ -49,13 +107,33 @@ const withMasterpassRestCallback =
49
107
  body: new URLSearchParams(body)
50
108
  });
51
109
 
110
+ logger.info('Masterpass REST callback request', {
111
+ requestUrl: requestUrl.toString(),
112
+ status: request.status,
113
+ requestHeaders,
114
+ ip
115
+ });
116
+
52
117
  const response = await request.json();
53
- const { errors } = response;
118
+
119
+ const { context_list: contextList, errors } = response;
120
+
121
+ let redirectUrl = response.redirect_url;
122
+
123
+ if (!redirectUrl && contextList && contextList.length > 0) {
124
+ for (const context of contextList) {
125
+ if (context.page_context && context.page_context.redirect_url) {
126
+ redirectUrl = context.page_context.redirect_url;
127
+ break;
128
+ }
129
+ }
130
+ }
54
131
 
55
132
  if (errors && Object.keys(errors).length) {
56
- logger.error('Error while processing MasterpassRestCompletePage', {
133
+ logger.error('Error while processing masterpass REST callback', {
57
134
  middleware: 'masterpass-rest-callback',
58
135
  errors,
136
+ requestHeaders,
59
137
  ip
60
138
  });
61
139
 
@@ -64,7 +142,12 @@ const withMasterpassRestCallback =
64
142
  '/orders/checkout/',
65
143
  req.cookies.get('pz-locale')?.value
66
144
  )}`,
67
- 303
145
+ {
146
+ status: 303,
147
+ headers: {
148
+ 'Set-Cookie': `pz-pos-error=${encodeURIComponent(JSON.stringify(errors))}; path=/;`
149
+ }
150
+ }
68
151
  );
69
152
 
70
153
  // Add error cookie
@@ -75,40 +158,70 @@ const withMasterpassRestCallback =
75
158
  return errorResponse;
76
159
  }
77
160
 
78
- const redirectUrl =
79
- response.redirect_url ||
80
- response.context_list?.[0]?.page_context?.redirect_url;
161
+ logger.info('Masterpass REST callback response', {
162
+ middleware: 'masterpass-rest-callback',
163
+ contextList,
164
+ redirectUrl,
165
+ ip
166
+ });
81
167
 
82
- if (redirectUrl) {
83
- const nextResponse = NextResponse.redirect(
84
- `${url.origin}${getUrlPathWithLocale(redirectUrl, req.cookies.get('pz-locale')?.value)}`,
85
- 303
168
+ if (!redirectUrl) {
169
+ logger.warn(
170
+ 'No redirection url found in response. Redirecting to checkout page.',
171
+ {
172
+ middleware: 'masterpass-rest-callback',
173
+ requestHeaders,
174
+ response: JSON.stringify(response),
175
+ ip
176
+ }
86
177
  );
87
178
 
88
- // Forward set-cookie headers from the upstream response
89
- const setCookieHeader = request.headers.get('set-cookie');
90
- if (setCookieHeader) {
91
- setCookieHeader.split(',').forEach((cookie) => {
92
- nextResponse.headers.append('Set-Cookie', cookie.trim());
93
- });
94
- }
179
+ const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
180
+ '/orders/checkout/',
181
+ req.cookies.get('pz-locale')?.value
182
+ )}`;
95
183
 
96
- return nextResponse;
184
+ return NextResponse.redirect(redirectUrlWithLocale, 303);
97
185
  }
98
186
 
99
- return NextResponse.redirect(
100
- `${url.origin}${getUrlPathWithLocale('/orders/checkout/', req.cookies.get('pz-locale')?.value)}`,
101
- 303
102
- );
187
+ const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
188
+ redirectUrl,
189
+ req.cookies.get('pz-locale')?.value
190
+ )}`;
191
+
192
+ logger.info('Redirecting after masterpass REST callback', {
193
+ middleware: 'masterpass-rest-callback',
194
+ redirectUrl: redirectUrlWithLocale,
195
+ ip
196
+ });
197
+
198
+ const nextResponse = NextResponse.redirect(redirectUrlWithLocale, 303);
199
+
200
+ // Forward set-cookie headers from the upstream response
201
+ const setCookieHeader = request.headers.get('set-cookie');
202
+ if (setCookieHeader) {
203
+ setCookieHeader.split(',').forEach((cookie) => {
204
+ nextResponse.headers.append('Set-Cookie', cookie.trim());
205
+ });
206
+ }
207
+
208
+ return nextResponse;
103
209
  } catch (error) {
104
- logger.error('Error while processing MasterpassRestCompletePage', {
210
+ logger.error('Error while processing masterpass REST callback', {
105
211
  middleware: 'masterpass-rest-callback',
106
212
  error,
213
+ requestHeaders: {
214
+ Cookie: req.headers.get('cookie') ?? '',
215
+ 'x-currency': req.cookies.get('pz-currency')?.value ?? ''
216
+ },
107
217
  ip
108
218
  });
109
219
 
110
220
  return NextResponse.redirect(
111
- `${url.origin}${getUrlPathWithLocale('/orders/checkout/', req.cookies.get('pz-locale')?.value)}`,
221
+ `${url.origin}${getUrlPathWithLocale(
222
+ '/orders/checkout/',
223
+ req.cookies.get('pz-locale')?.value
224
+ )}`,
112
225
  303
113
226
  );
114
227
  }
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "@akinon/next",
3
3
  "description": "Core package for Project Zero Next",
4
- "version": "2.0.10-rc.0",
4
+ "version": "2.0.10",
5
5
  "private": false,
6
6
  "license": "MIT",
7
7
  "bin": {
@@ -11,8 +11,7 @@
11
11
  "pz-prestart": "bin/pz-prestart.js",
12
12
  "pz-poststart": "bin/pz-poststart.js",
13
13
  "pz-predev": "bin/pz-predev.js",
14
- "pz-postdev": "bin/pz-postdev.js",
15
- "pz-migrate-eslint": "bin/pz-migrate-eslint.js"
14
+ "pz-postdev": "bin/pz-postdev.js"
16
15
  },
17
16
  "scripts": {
18
17
  "test": "jest"
@@ -37,7 +36,7 @@
37
36
  "set-cookie-parser": "2.6.0"
38
37
  },
39
38
  "devDependencies": {
40
- "@akinon/eslint-plugin-projectzero": "2.0.10-rc.0",
39
+ "@akinon/eslint-plugin-projectzero": "2.0.10",
41
40
  "@babel/core": "7.26.10",
42
41
  "@babel/preset-env": "7.26.9",
43
42
  "@babel/preset-typescript": "7.27.0",
package/plugins.d.ts CHANGED
@@ -37,16 +37,6 @@ declare module '@akinon/pz-cybersource-uc/src/redux/middleware' {
37
37
  export default middleware as any;
38
38
  }
39
39
 
40
- declare module '@akinon/pz-apple-pay' {}
41
-
42
- declare module '@akinon/pz-similar-products' {
43
- export const SimilarProductsModal: any;
44
- export const SimilarProductsFilterSidebar: any;
45
- export const SimilarProductsResultsGrid: any;
46
- export const SimilarProductsPlugin: any;
47
- export const SimilarProductsButtonPlugin: any;
48
- }
49
-
50
40
  declare module '@akinon/pz-cybersource-uc/src/redux/reducer' {
51
41
  export default reducer as any;
52
42
  }
package/plugins.js CHANGED
@@ -16,7 +16,6 @@ module.exports = [
16
16
  'pz-tabby-extension',
17
17
  'pz-apple-pay',
18
18
  'pz-tamara-extension',
19
- 'pz-similar-products',
20
19
  'pz-cybersource-uc',
21
20
  'pz-hepsipay',
22
21
  'pz-flow-payment',
@@ -26,28 +26,13 @@ import {
26
26
  } from '../../redux/reducers/checkout';
27
27
  import { RootState, TypedDispatch } from 'redux/store';
28
28
  import { checkoutApi } from '../../data/client/checkout';
29
- import { CheckoutContext, MiddlewareAction, PreOrder } from '../../types';
29
+ import { CheckoutContext, PreOrder } from '../../types';
30
30
  import { getCookie } from '../../utils';
31
31
  import settings from 'settings';
32
32
  import { LocaleUrlStrategy } from '../../localization';
33
33
  import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
34
34
  import { showRedirectionIframe } from '../../utils/redirection-iframe';
35
35
 
36
- const IFRAME_REDIRECTION_KEY = 'pz-iframe-redirection-active';
37
-
38
- const isIframeRedirectionActive = () =>
39
- typeof window !== 'undefined' &&
40
- sessionStorage.getItem(IFRAME_REDIRECTION_KEY) === 'true';
41
-
42
- const setIframeRedirectionActive = (active: boolean) => {
43
- if (typeof window === 'undefined') return;
44
- if (active) {
45
- sessionStorage.setItem(IFRAME_REDIRECTION_KEY, 'true');
46
- } else {
47
- sessionStorage.removeItem(IFRAME_REDIRECTION_KEY);
48
- }
49
- };
50
-
51
36
  interface CheckoutResult {
52
37
  payload: {
53
38
  errors?: Record<string, string[]>;
@@ -84,7 +69,7 @@ export const redirectUrlMiddleware: Middleware = () => {
84
69
  const result = next(action) as CheckoutResult;
85
70
  const redirectUrl = result?.payload?.redirect_url;
86
71
 
87
- if (redirectUrl && !isIframeRedirectionActive()) {
72
+ if (redirectUrl) {
88
73
  const currentLocale = getCookie('pz-locale');
89
74
 
90
75
  let url = redirectUrl;
@@ -114,15 +99,8 @@ export const contextListMiddleware: Middleware = ({
114
99
  const { isMobileApp, userPhoneNumber } = getState().root;
115
100
  const result = next(action) as CheckoutResult;
116
101
  const preOrder = result?.payload?.pre_order;
117
- const act = action as MiddlewareAction;
118
102
 
119
103
  if (result?.payload?.context_list) {
120
- const endpointName = act.meta?.arg?.endpointName;
121
- const isBinNumberResponse = endpointName === 'setBinNumber';
122
- const hasCardTypeInContextList = result.payload.context_list.some(
123
- (ctx) => ctx.page_context.card_type
124
- );
125
-
126
104
  result.payload.context_list.forEach((context) => {
127
105
  const redirectUrl = context.page_context.redirect_url;
128
106
  const isIframe = context.page_context.is_iframe ?? false;
@@ -156,7 +134,6 @@ export const contextListMiddleware: Middleware = ({
156
134
  if (isMobileDevice && isIframePaymentOptionIncluded) {
157
135
  showMobile3dIframe(urlObj.toString());
158
136
  } else if (isIframe) {
159
- setIframeRedirectionActive(true);
160
137
  showRedirectionIframe(urlObj.toString());
161
138
  } else {
162
139
  window.location.href = urlObj.toString();
@@ -232,34 +209,15 @@ export const contextListMiddleware: Middleware = ({
232
209
  (ctx) => ctx.page_name === 'DeliveryOptionSelectionPage'
233
210
  )
234
211
  ) {
235
- const isCreditCardPayment =
236
- preOrder?.payment_option?.payment_type === 'credit_card' ||
237
- preOrder?.payment_option?.payment_type === 'masterpass';
238
-
239
212
  if (context.page_context.card_type) {
240
213
  dispatch(setCardType(context.page_context.card_type));
241
- } else if (
242
- isCreditCardPayment &&
243
- isBinNumberResponse &&
244
- !hasCardTypeInContextList
245
- ) {
246
- dispatch(setCardType(null));
247
- dispatch(setInstallmentOptions([]));
248
214
  }
249
215
 
250
216
  if (
251
217
  context.page_context.installments &&
252
218
  preOrder?.payment_option?.payment_type !== 'masterpass_rest'
253
219
  ) {
254
- if (
255
- !isCreditCardPayment ||
256
- context.page_context.card_type ||
257
- hasCardTypeInContextList
258
- ) {
259
- dispatch(
260
- setInstallmentOptions(context.page_context.installments)
261
- );
262
- }
220
+ dispatch(setInstallmentOptions(context.page_context.installments));
263
221
  }
264
222
  }
265
223