@akinon/next 1.13.1 → 1.14.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.
- package/.editorconfig +7 -0
- package/.eslintrc.js +40 -40
- package/.prettierrc +13 -13
- package/CHANGELOG.md +13 -0
- package/api/auth.ts +231 -231
- package/api/cache.ts +44 -44
- package/api/client.ts +174 -174
- package/api/logout.ts +42 -42
- package/assets/styles/index.scss +28 -28
- package/bin/pz-check-dependencies.js +98 -98
- package/bin/pz-install-plugins.js +33 -33
- package/bin/pz-install-theme.js +58 -58
- package/bin/pz-postbuild.js +1 -1
- package/bin/pz-postdev.js +1 -1
- package/bin/pz-postinstall.js +6 -6
- package/bin/pz-poststart.js +1 -1
- package/bin/pz-prebuild.js +4 -4
- package/bin/pz-predev.js +4 -4
- package/bin/pz-prestart.js +1 -1
- package/bin/run-script.js +44 -44
- package/components/accordion.tsx +52 -0
- package/components/button.tsx +46 -0
- package/components/client-root.tsx +19 -19
- package/components/icon.tsx +18 -18
- package/components/image.tsx +133 -133
- package/components/index.ts +17 -1
- package/components/input.tsx +110 -0
- package/components/lazy-component.tsx +33 -33
- package/components/loader-spinner.tsx +23 -23
- package/components/mobile-app-toggler.tsx +26 -26
- package/components/oauth-login.tsx +24 -24
- package/components/plugin-module.tsx +11 -8
- package/components/price.tsx +55 -0
- package/components/pz-providers.tsx +24 -24
- package/components/pz-root.tsx +21 -21
- package/components/radio.tsx +18 -18
- package/components/react-portal.tsx +45 -45
- package/components/redirect-three-d/content/index.tsx +74 -74
- package/components/redirect-three-d/index.tsx +17 -17
- package/components/selected-payment-option-view.tsx +7 -0
- package/components/trans.tsx +39 -39
- package/data/client/account.ts +208 -208
- package/data/client/address.ts +107 -107
- package/data/client/api.ts +85 -84
- package/data/client/b2b.ts +106 -106
- package/data/client/basket.ts +82 -82
- package/data/client/checkout.ts +516 -479
- package/data/client/misc.ts +101 -101
- package/data/client/product.ts +89 -89
- package/data/client/user.ts +99 -99
- package/data/client/wishlist.ts +118 -88
- package/data/server/category.ts +132 -128
- package/data/server/flatpage.ts +21 -21
- package/data/server/form.ts +22 -22
- package/data/server/index.ts +10 -10
- package/data/server/landingpage.ts +24 -24
- package/data/server/list.ts +67 -62
- package/data/server/menu.ts +35 -35
- package/data/server/product.ts +86 -86
- package/data/server/seo.ts +48 -48
- package/data/server/special-page.ts +47 -47
- package/data/server/widget.ts +27 -27
- package/data/urls.ts +221 -210
- package/hocs/client/index.ts +1 -1
- package/hocs/client/with-segment-defaults.tsx +25 -25
- package/hocs/server/index.ts +1 -1
- package/hocs/server/with-segment-defaults.tsx +85 -85
- package/hooks/index.ts +10 -10
- package/hooks/use-captcha.tsx +76 -76
- package/hooks/use-common-product-attributes.ts +36 -36
- package/hooks/use-debounce.ts +20 -20
- package/hooks/use-localization.ts +78 -78
- package/hooks/use-media-query.ts +36 -36
- package/hooks/use-mobile-iframe-handler.ts +23 -23
- package/hooks/use-on-click-outside.tsx +28 -28
- package/hooks/use-payment-options.ts +2 -1
- package/hooks/use-router.ts +45 -45
- package/hooks/use-translation.ts +14 -14
- package/lib/cache.ts +215 -215
- package/localization/index.ts +5 -5
- package/localization/provider.tsx +58 -58
- package/middlewares/currency.ts +100 -100
- package/middlewares/default.ts +256 -256
- package/middlewares/index.ts +29 -29
- package/middlewares/locale.ts +68 -68
- package/middlewares/oauth-login.ts +79 -79
- package/middlewares/pretty-url.ts +104 -104
- package/middlewares/redirection-payment.ts +160 -160
- package/middlewares/three-d-redirection.ts +159 -159
- package/middlewares/url-redirection.ts +65 -65
- package/package.json +2 -2
- package/plugins.js +2 -1
- package/redux/hooks.ts +7 -7
- package/redux/middlewares/checkout.ts +265 -260
- package/redux/middlewares/index.ts +50 -50
- package/redux/reducers/checkout.ts +184 -171
- package/redux/reducers/config.ts +28 -28
- package/redux/reducers/header.ts +59 -59
- package/redux/reducers/index.ts +14 -14
- package/redux/reducers/root.ts +61 -61
- package/sentry/index.ts +27 -27
- package/tailwind/rtl.js +137 -137
- package/types/commerce/account.ts +64 -64
- package/types/commerce/address.ts +94 -94
- package/types/commerce/b2b.ts +117 -117
- package/types/commerce/basket.ts +43 -43
- package/types/commerce/category.ts +114 -114
- package/types/commerce/checkout.ts +143 -136
- package/types/commerce/flatpage.ts +7 -7
- package/types/commerce/form.ts +66 -66
- package/types/commerce/index.ts +12 -12
- package/types/commerce/landingpage.ts +7 -7
- package/types/commerce/misc.ts +127 -127
- package/types/commerce/order.ts +119 -119
- package/types/commerce/product.ts +109 -109
- package/types/commerce/widget.ts +28 -28
- package/types/gtm.ts +16 -16
- package/types/index.ts +274 -237
- package/types/metadata.ts +7 -7
- package/types/next-auth.d.ts +24 -24
- package/utils/app-fetch.ts +69 -69
- package/utils/deep-merge.js +24 -24
- package/utils/generate-commerce-search-params.ts +22 -22
- package/utils/get-currency.ts +29 -29
- package/utils/image-loader.ts +31 -31
- package/utils/index.ts +150 -150
- package/utils/localization.ts +29 -29
- package/utils/log.ts +138 -138
- package/utils/menu-generator.ts +27 -27
- package/utils/mobile-3d-iframe.ts +77 -77
- package/utils/server-translation.ts +57 -57
- package/utils/server-variables.ts +9 -9
- package/with-pz-config.js +94 -94
package/middlewares/currency.ts
CHANGED
|
@@ -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;
|