@akinon/next 1.14.0 → 1.15.0

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.
Files changed (127) hide show
  1. package/.editorconfig +7 -7
  2. package/.eslintrc.js +40 -40
  3. package/.gitattributes +15 -0
  4. package/.prettierrc +13 -13
  5. package/CHANGELOG.md +14 -0
  6. package/api/auth.ts +231 -231
  7. package/api/cache.ts +44 -44
  8. package/api/client.ts +174 -174
  9. package/api/logout.ts +42 -42
  10. package/bin/pz-check-dependencies.js +98 -98
  11. package/bin/pz-install-plugins.js +33 -33
  12. package/bin/pz-install-theme.js +58 -58
  13. package/bin/pz-postbuild.js +1 -1
  14. package/bin/pz-postdev.js +1 -1
  15. package/bin/pz-postinstall.js +6 -6
  16. package/bin/pz-poststart.js +1 -1
  17. package/bin/pz-prebuild.js +4 -4
  18. package/bin/pz-predev.js +4 -4
  19. package/bin/pz-prestart.js +1 -1
  20. package/bin/run-script.js +44 -44
  21. package/components/accordion.tsx +52 -52
  22. package/components/button.tsx +46 -46
  23. package/components/client-root.tsx +19 -19
  24. package/components/icon.tsx +18 -18
  25. package/components/image.tsx +133 -133
  26. package/components/index.ts +1 -0
  27. package/components/input.tsx +110 -110
  28. package/components/lazy-component.tsx +33 -33
  29. package/components/loader-spinner.tsx +23 -23
  30. package/components/mobile-app-toggler.tsx +26 -26
  31. package/components/modal.tsx +66 -0
  32. package/components/oauth-login.tsx +24 -24
  33. package/components/plugin-module.tsx +5 -0
  34. package/components/price.tsx +55 -55
  35. package/components/pz-providers.tsx +24 -24
  36. package/components/pz-root.tsx +21 -21
  37. package/components/radio.tsx +18 -18
  38. package/components/react-portal.tsx +45 -45
  39. package/components/redirect-three-d/content/index.tsx +74 -74
  40. package/components/redirect-three-d/index.tsx +17 -17
  41. package/components/selected-payment-option-view.tsx +1 -1
  42. package/components/trans.tsx +39 -39
  43. package/data/client/account.ts +208 -208
  44. package/data/client/api.ts +85 -85
  45. package/data/client/basket.ts +82 -82
  46. package/data/client/misc.ts +101 -101
  47. package/data/client/product.ts +89 -89
  48. package/data/client/user.ts +99 -99
  49. package/data/client/wishlist.ts +118 -118
  50. package/data/server/category.ts +132 -132
  51. package/data/server/flatpage.ts +21 -21
  52. package/data/server/form.ts +22 -22
  53. package/data/server/index.ts +10 -10
  54. package/data/server/landingpage.ts +24 -24
  55. package/data/server/list.ts +67 -67
  56. package/data/server/menu.ts +35 -35
  57. package/data/server/product.ts +86 -86
  58. package/data/server/seo.ts +48 -48
  59. package/data/server/special-page.ts +47 -47
  60. package/data/server/widget.ts +27 -27
  61. package/data/urls.ts +221 -221
  62. package/hocs/client/index.ts +1 -1
  63. package/hocs/client/with-segment-defaults.tsx +25 -25
  64. package/hocs/server/index.ts +1 -1
  65. package/hocs/server/with-segment-defaults.tsx +85 -85
  66. package/hooks/index.ts +10 -10
  67. package/hooks/use-captcha.tsx +76 -76
  68. package/hooks/use-common-product-attributes.ts +36 -36
  69. package/hooks/use-debounce.ts +20 -20
  70. package/hooks/use-localization.ts +78 -78
  71. package/hooks/use-media-query.ts +36 -36
  72. package/hooks/use-mobile-iframe-handler.ts +23 -23
  73. package/hooks/use-on-click-outside.tsx +28 -28
  74. package/hooks/use-payment-options.ts +3 -1
  75. package/hooks/use-router.ts +45 -45
  76. package/hooks/use-translation.ts +14 -14
  77. package/lib/cache.ts +215 -215
  78. package/localization/index.ts +5 -5
  79. package/localization/provider.tsx +58 -58
  80. package/middlewares/complete-gpay.ts +159 -0
  81. package/middlewares/currency.ts +100 -100
  82. package/middlewares/default.ts +259 -256
  83. package/middlewares/index.ts +31 -29
  84. package/middlewares/locale.ts +68 -68
  85. package/middlewares/oauth-login.ts +79 -79
  86. package/middlewares/pretty-url.ts +104 -104
  87. package/middlewares/redirection-payment.ts +160 -160
  88. package/middlewares/three-d-redirection.ts +159 -159
  89. package/middlewares/url-redirection.ts +65 -65
  90. package/package.json +2 -2
  91. package/plugins.js +1 -0
  92. package/redux/hooks.ts +7 -7
  93. package/redux/middlewares/index.ts +50 -50
  94. package/redux/reducers/checkout.ts +184 -184
  95. package/redux/reducers/config.ts +28 -28
  96. package/redux/reducers/header.ts +59 -59
  97. package/redux/reducers/root.ts +61 -61
  98. package/sentry/index.ts +27 -27
  99. package/tailwind/rtl.js +137 -137
  100. package/types/commerce/account.ts +64 -64
  101. package/types/commerce/address.ts +94 -94
  102. package/types/commerce/basket.ts +43 -43
  103. package/types/commerce/category.ts +114 -114
  104. package/types/commerce/checkout.ts +143 -143
  105. package/types/commerce/flatpage.ts +7 -7
  106. package/types/commerce/form.ts +66 -66
  107. package/types/commerce/index.ts +12 -12
  108. package/types/commerce/landingpage.ts +7 -7
  109. package/types/commerce/misc.ts +127 -127
  110. package/types/commerce/order.ts +119 -119
  111. package/types/commerce/product.ts +109 -109
  112. package/types/commerce/widget.ts +28 -28
  113. package/types/gtm.ts +16 -16
  114. package/types/index.ts +274 -274
  115. package/types/metadata.ts +7 -7
  116. package/types/next-auth.d.ts +24 -24
  117. package/utils/app-fetch.ts +69 -69
  118. package/utils/deep-merge.js +24 -24
  119. package/utils/image-loader.ts +31 -31
  120. package/utils/index.ts +150 -150
  121. package/utils/localization.ts +29 -29
  122. package/utils/log.ts +138 -138
  123. package/utils/menu-generator.ts +27 -27
  124. package/utils/mobile-3d-iframe.ts +77 -77
  125. package/utils/server-translation.ts +57 -57
  126. package/utils/server-variables.ts +9 -9
  127. package/with-pz-config.js +94 -94
@@ -0,0 +1,159 @@
1
+ import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
2
+ import Settings from 'settings';
3
+ import { Buffer } from 'buffer';
4
+ import logger from '../utils/log';
5
+ import { getUrlPathWithLocale } from '../utils/localization';
6
+ import { PzNextRequest } from '.';
7
+
8
+ const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
9
+ if (stream) {
10
+ const chunks = [];
11
+ let result = '';
12
+
13
+ try {
14
+ for await (const chunk of stream as any) {
15
+ chunks.push(Buffer.from(chunk));
16
+ }
17
+
18
+ result = Buffer.concat(chunks).toString('utf-8');
19
+ } catch (error) {
20
+ logger.error('Error while reading body stream', {
21
+ middleware: 'complete-gpay',
22
+ error
23
+ });
24
+ }
25
+
26
+ return result;
27
+ }
28
+ return null;
29
+ };
30
+
31
+ const withCompleteGpay =
32
+ (middleware: NextMiddleware) =>
33
+ async (req: PzNextRequest, event: NextFetchEvent) => {
34
+ const url = req.nextUrl.clone();
35
+ const ip = req.headers.get('x-forwarded-for') ?? '';
36
+
37
+ if (url.search.indexOf('GPayCompletePage') === -1) {
38
+ return middleware(req, event);
39
+ }
40
+
41
+ const requestUrl = `${Settings.commerceUrl}/orders/checkout/${url.search}`;
42
+ const requestHeaders = {
43
+ 'X-Requested-With': 'XMLHttpRequest',
44
+ 'Content-Type': 'application/x-www-form-urlencoded',
45
+ Cookie: `osessionid=${req.cookies.get('osessionid')?.value ?? ''}`,
46
+ 'x-currency': req.cookies.get('pz-currency')?.value ?? ''
47
+ };
48
+
49
+ try {
50
+ const body = await streamToString(req.body);
51
+
52
+ const request = await fetch(requestUrl, {
53
+ method: 'POST',
54
+ headers: requestHeaders,
55
+ body
56
+ });
57
+
58
+ logger.info('Complete GPay payment request', {
59
+ requestUrl,
60
+ status: request.status,
61
+ requestHeaders,
62
+ ip
63
+ });
64
+
65
+ const response = await request.json();
66
+
67
+ const { context_list: contextList, errors } = response;
68
+ const redirectionContext = contextList?.find(
69
+ (context) => context.page_context?.redirect_url
70
+ );
71
+ const redirectUrl = redirectionContext?.page_context?.redirect_url;
72
+
73
+ if (errors && Object.keys(errors).length) {
74
+ logger.error('Error while completing GPay payment', {
75
+ middleware: 'complete-gpay',
76
+ errors,
77
+ requestHeaders,
78
+ ip
79
+ });
80
+
81
+ return NextResponse.redirect(
82
+ `${url.origin}${getUrlPathWithLocale(
83
+ '/orders/checkout/',
84
+ req.cookies.get('pz-locale')?.value
85
+ )}`,
86
+ {
87
+ status: 303,
88
+ headers: {
89
+ 'Set-Cookie': `pz-pos-error=${JSON.stringify(errors)}; path=/;`
90
+ }
91
+ }
92
+ );
93
+ }
94
+
95
+ logger.info('Order success page context list', {
96
+ middleware: 'complete-gpay',
97
+ contextList,
98
+ ip
99
+ });
100
+
101
+ if (!redirectUrl) {
102
+ logger.warn(
103
+ 'No redirection url for order success page found in page_context. Redirecting to checkout page.',
104
+ {
105
+ middleware: 'complete-gpay',
106
+ requestHeaders,
107
+ response: JSON.stringify(response),
108
+ ip
109
+ }
110
+ );
111
+
112
+ const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
113
+ '/orders/checkout/',
114
+ req.cookies.get('pz-locale')?.value
115
+ )}`;
116
+
117
+ return NextResponse.redirect(redirectUrlWithLocale, 303);
118
+ }
119
+
120
+ const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
121
+ redirectUrl,
122
+ req.cookies.get('pz-locale')?.value
123
+ )}`;
124
+
125
+ logger.info('Redirecting to order success page', {
126
+ middleware: 'complete-gpay',
127
+ redirectUrlWithLocale,
128
+ ip
129
+ });
130
+
131
+ // Using POST method while redirecting causes an error,
132
+ // So we use 303 status code to change the method to GET
133
+ const nextResponse = NextResponse.redirect(redirectUrlWithLocale, 303);
134
+
135
+ nextResponse.headers.set(
136
+ 'Set-Cookie',
137
+ request.headers.get('set-cookie') ?? ''
138
+ );
139
+
140
+ return nextResponse;
141
+ } catch (error) {
142
+ logger.error('Error while completing GPay payment', {
143
+ middleware: 'complete-gpay',
144
+ error,
145
+ requestHeaders,
146
+ ip
147
+ });
148
+
149
+ return NextResponse.redirect(
150
+ `${url.origin}${getUrlPathWithLocale(
151
+ '/orders/checkout/',
152
+ req.cookies.get('pz-locale')?.value
153
+ )}`,
154
+ 303
155
+ );
156
+ }
157
+ };
158
+
159
+ export default withCompleteGpay;
@@ -1,100 +1,100 @@
1
- import { NextFetchEvent, NextMiddleware } from 'next/server';
2
- import settings from 'settings';
3
- import { PzNextRequest } from '.';
4
- import logger from '../utils/log';
5
- import { basket } from '../data/urls';
6
- import { urlLocaleMatcherRegex } from '../utils';
7
-
8
- const resetBasket = async (req: PzNextRequest) => {
9
- await fetch(`${settings.commerceUrl}${basket.getBasket}`, {
10
- method: 'DELETE',
11
- headers: {
12
- Cookie: req.headers.get('cookie') || '',
13
- 'Content-Type': 'application/json',
14
- 'X-CSRFToken': req.cookies.get('csrftoken')?.value ?? '',
15
- Referer: settings.commerceUrl
16
- }
17
- });
18
- };
19
-
20
- const withCurrency =
21
- (middleware: NextMiddleware) =>
22
- async (req: PzNextRequest, event: NextFetchEvent) => {
23
- const ip = req.headers.get('x-forwarded-for') ?? '';
24
-
25
- try {
26
- const { currencies, defaultCurrencyCode, defaultLocaleValue } =
27
- settings.localization;
28
- const locale = req.middlewareParams.rewrites.locale ?? defaultLocaleValue;
29
- const url = req.nextUrl.clone();
30
-
31
- if (!defaultCurrencyCode) {
32
- logger.error('Default currency code is not defined in settings.', {
33
- ip
34
- });
35
- throw new Error(
36
- 'Default currency code is not defined. Use `defaultCurrencyCode` property in `localization` object in `settings.js` file.'
37
- );
38
- }
39
-
40
- const getActiveCurrencyCode =
41
- settings.localization.getActiveCurrencyCode ??
42
- (({ req }) => {
43
- return (
44
- req.cookies.get('pz-currency')?.value ??
45
- settings.localization.defaultCurrencyCode
46
- );
47
- });
48
-
49
- let activeCurrency = getActiveCurrencyCode({
50
- req,
51
- locale,
52
- defaultCurrencyCode
53
- });
54
-
55
- if (req.cookies.get('pz-set-currency')) {
56
- activeCurrency = req.cookies.get('pz-set-currency')?.value;
57
- }
58
-
59
- if (
60
- !activeCurrency ||
61
- !currencies.find((c) => c.code === activeCurrency)
62
- ) {
63
- logger.warn(
64
- `Currency ${activeCurrency} is not defined in settings. Using default currency ${defaultCurrencyCode} instead.`,
65
- {
66
- ip
67
- }
68
- );
69
- activeCurrency = defaultCurrencyCode;
70
- }
71
-
72
- if (
73
- req.cookies.get('pz-currency') &&
74
- req.cookies.get('pz-currency')?.value !== activeCurrency &&
75
- url.pathname.match(urlLocaleMatcherRegex) &&
76
- !url.search.includes('mobile_app=true') &&
77
- !url.search.includes('page=CreditCardThreeDSecurePage')
78
- ) {
79
- logger.info('Currency changed. Resetting basket...', {
80
- sessionid: req.cookies.get('osessionid')?.value ?? '',
81
- oldCurrency: req.cookies.get('pz-currency')?.value,
82
- newCurrency: activeCurrency,
83
- ip
84
- });
85
-
86
- resetBasket(req);
87
- }
88
-
89
- req.middlewareParams.rewrites.currency = activeCurrency;
90
- } catch (error) {
91
- logger.error('withCurrency error', {
92
- error,
93
- ip
94
- });
95
- }
96
-
97
- return middleware(req, event);
98
- };
99
-
100
- export default withCurrency;
1
+ import { NextFetchEvent, NextMiddleware } from 'next/server';
2
+ import settings from 'settings';
3
+ import { PzNextRequest } from '.';
4
+ import logger from '../utils/log';
5
+ import { basket } from '../data/urls';
6
+ import { urlLocaleMatcherRegex } from '../utils';
7
+
8
+ const resetBasket = async (req: PzNextRequest) => {
9
+ await fetch(`${settings.commerceUrl}${basket.getBasket}`, {
10
+ method: 'DELETE',
11
+ headers: {
12
+ Cookie: req.headers.get('cookie') || '',
13
+ 'Content-Type': 'application/json',
14
+ 'X-CSRFToken': req.cookies.get('csrftoken')?.value ?? '',
15
+ Referer: settings.commerceUrl
16
+ }
17
+ });
18
+ };
19
+
20
+ const withCurrency =
21
+ (middleware: NextMiddleware) =>
22
+ async (req: PzNextRequest, event: NextFetchEvent) => {
23
+ const ip = req.headers.get('x-forwarded-for') ?? '';
24
+
25
+ try {
26
+ const { currencies, defaultCurrencyCode, defaultLocaleValue } =
27
+ settings.localization;
28
+ const locale = req.middlewareParams.rewrites.locale ?? defaultLocaleValue;
29
+ const url = req.nextUrl.clone();
30
+
31
+ if (!defaultCurrencyCode) {
32
+ logger.error('Default currency code is not defined in settings.', {
33
+ ip
34
+ });
35
+ throw new Error(
36
+ 'Default currency code is not defined. Use `defaultCurrencyCode` property in `localization` object in `settings.js` file.'
37
+ );
38
+ }
39
+
40
+ const getActiveCurrencyCode =
41
+ settings.localization.getActiveCurrencyCode ??
42
+ (({ req }) => {
43
+ return (
44
+ req.cookies.get('pz-currency')?.value ??
45
+ settings.localization.defaultCurrencyCode
46
+ );
47
+ });
48
+
49
+ let activeCurrency = getActiveCurrencyCode({
50
+ req,
51
+ locale,
52
+ defaultCurrencyCode
53
+ });
54
+
55
+ if (req.cookies.get('pz-set-currency')) {
56
+ activeCurrency = req.cookies.get('pz-set-currency')?.value;
57
+ }
58
+
59
+ if (
60
+ !activeCurrency ||
61
+ !currencies.find((c) => c.code === activeCurrency)
62
+ ) {
63
+ logger.warn(
64
+ `Currency ${activeCurrency} is not defined in settings. Using default currency ${defaultCurrencyCode} instead.`,
65
+ {
66
+ ip
67
+ }
68
+ );
69
+ activeCurrency = defaultCurrencyCode;
70
+ }
71
+
72
+ if (
73
+ req.cookies.get('pz-currency') &&
74
+ req.cookies.get('pz-currency')?.value !== activeCurrency &&
75
+ url.pathname.match(urlLocaleMatcherRegex) &&
76
+ !url.search.includes('mobile_app=true') &&
77
+ !url.search.includes('page=CreditCardThreeDSecurePage')
78
+ ) {
79
+ logger.info('Currency changed. Resetting basket...', {
80
+ sessionid: req.cookies.get('osessionid')?.value ?? '',
81
+ oldCurrency: req.cookies.get('pz-currency')?.value,
82
+ newCurrency: activeCurrency,
83
+ ip
84
+ });
85
+
86
+ resetBasket(req);
87
+ }
88
+
89
+ req.middlewareParams.rewrites.currency = activeCurrency;
90
+ } catch (error) {
91
+ logger.error('withCurrency error', {
92
+ error,
93
+ ip
94
+ });
95
+ }
96
+
97
+ return middleware(req, event);
98
+ };
99
+
100
+ export default withCurrency;