@akinon/next 1.60.0-rc.9 → 1.60.0

package/hocs/server/with-segment-defaults.tsx

@@ -2,6 +2,7 @@ import settings from 'settings';
 import { LayoutProps, PageProps, RootLayoutProps } from '../../types';
 import { redirect } from 'next/navigation';
 import { ServerVariables } from '../../utils/server-variables';
+import { getTranslations } from '../../utils/server-translation';
 import { ROUTES } from 'routes';
 import logger from '../../utils/log';
 
@@ -49,11 +50,7 @@ const addRootLayoutProps = async (componentProps: RootLayoutProps) => {
     return redirect(ROUTES.HOME);
   }
 
-  const { getTranslations } = settings.useOptimizedTranslations
-    ? require('translations')
-    : require('../../utils/server-translation');
   const translations = await getTranslations(params.locale);
-
   componentProps.translations = translations;
 
   const locale = settings.localization.locales.find(

package/hooks/index.ts

@@ -8,5 +8,4 @@ export * from './use-media-query';
 export * from './use-on-click-outside';
 export * from './use-mobile-iframe-handler';
 export * from './use-payment-options';
-export * from './use-pagination';
-export * from './use-message-listener';
+export * from './use-pagination';

package/hooks/use-pagination.ts

@@ -116,7 +116,7 @@ export default function usePagination(
       urlSearchParams.set('page', (Number(state.page) - 1).toString());
       return `${pathname}?${urlSearchParams.toString()}`;
     }
-    return null;
+    return '#';
   }, [state.page, pathname, urlSearchParams]);
 
   const next = useMemo(() => {
@@ -124,7 +124,7 @@ export default function usePagination(
       urlSearchParams.set('page', (Number(state.page) + 1).toString());
       return `${pathname}?${urlSearchParams.toString()}`;
     }
-    return null;
+    return '#';
   }, [state.page, state.last, pathname, urlSearchParams]);
 
   return {

package/hooks/use-payment-options.ts

@@ -19,8 +19,7 @@ export const usePaymentOptions = () => {
     bkm_express: 'pz-bkm',
     credit_payment: 'pz-credit-payment',
     masterpass: 'pz-masterpass',
-    gpay: 'pz-gpay',
-    saved_card: 'pz-saved-card'
+    gpay: 'pz-gpay'
   };
 
   const isInitialTypeIncluded = (type: string) => initialTypes.has(type);

package/lib/cache.ts

@@ -3,6 +3,7 @@ import { RedisClientType } from 'redis';
 import Settings from 'settings';
 import { CacheOptions } from '../types';
 import logger from '../utils/log';
+import { ServerVariables } from '../utils/server-variables';
 
 const hashCacheKey = (object?: Record<string, string>) => {
   if (!object) {
@@ -58,8 +59,10 @@ export const CacheKey = {
 export class Cache {
   static PROXY_URL = `${process.env.NEXT_PUBLIC_URL}/api/cache`;
 
-  static formatKey(key: string, locale: string) {
-    return encodeURIComponent(`${Settings.commerceUrl}_${locale}_${key}`);
+  static formatKey(key: string) {
+    return encodeURIComponent(
+      `${Settings.commerceUrl}_${ServerVariables.locale}_${key}`
+    );
   }
 
   static clientPool: Pool<RedisClientType> = createPool(
@@ -152,7 +155,6 @@ export class Cache {
 
   static async wrap<T = any>(
     key: string,
-    locale: string,
     handler: () => Promise<T>,
     options?: CacheOptions
   ): Promise<T> {
@@ -176,7 +178,7 @@ export class Cache {
     };
 
     const _options = Object.assign(defaultOptions, options);
-    const formattedKey = Cache.formatKey(key, locale);
+    const formattedKey = Cache.formatKey(key);
 
     logger.debug('Cache wrap', { key, formattedKey, _options });
 

package/middlewares/currency.ts

@@ -75,7 +75,7 @@ const withCurrency =
         url.pathname.match(urlLocaleMatcherRegex) &&
         !url.search.includes('mobile_app=true') &&
         !url.search.includes('page=CreditCardThreeDSecurePage') &&
-        !url.search.includes('page=RedirectionPageCompletePage')
+        settings.resetBasketOnCurrencyChange !== false
       ) {
         logger.info('Currency changed. Resetting basket...', {
           sessionid: req.cookies.get('osessionid')?.value ?? '',

package/middlewares/default.ts

@@ -9,7 +9,6 @@ import {
   withOauthLogin,
   withPrettyUrl,
   withRedirectionPayment,
-  withSavedCardRedirection,
   withThreeDRedirection,
   withUrlRedirection
 } from '.';
@@ -97,44 +96,14 @@ const withPzDefault =
       req.nextUrl.pathname.includes('/orders/hooks/') ||
       req.nextUrl.pathname.includes('/orders/checkout-with-token/')
     ) {
-      const segment = url.searchParams.get('segment');
-      const currency = url.searchParams.get('currency')?.toLowerCase();
-
-      const headers = {};
-
-      if (segment) {
-        headers['X-Segment-Id'] = segment;
-      }
-
-      if (currency) {
-        headers['x-currency'] = currency;
-      }
-
-      const response = NextResponse.rewrite(
+      return NextResponse.rewrite(
         new URL(
           `${Settings.commerceUrl}${req.nextUrl.pathname.replace(
             urlLocaleMatcherRegex,
             ''
           )}`
-        ),
-        {
-          headers
-        }
+        )
       );
-
-      if (segment) {
-        response.cookies.set('pz-segment', segment);
-      }
-
-      if (currency) {
-        response.cookies.set('pz-currency', currency, {
-          sameSite: 'none',
-          secure: true,
-          expires: new Date(Date.now() + 1000 * 60 * 60 * 24 * 7) // 7 days
-        });
-      }
-
-      return response;
     }
 
     if (req.nextUrl.pathname.startsWith('/orders/redirection/')) {
@@ -149,14 +118,6 @@ const withPzDefault =
       );
     }
 
-    if (req.nextUrl.pathname.includes('/orders/saved-card-redirect')) {
-      return NextResponse.rewrite(
-        new URL(
-          `${encodeURI(Settings.commerceUrl)}/orders/saved-card-redirect/`
-        )
-      );
-    }
-
     // If commerce redirects to /orders/checkout/ without locale
     if (
       req.nextUrl.pathname.match(new RegExp('^/orders/checkout/$')) &&
@@ -174,25 +135,6 @@ const withPzDefault =
       return NextResponse.redirect(redirectUrlWithLocale, 303);
     }
 
-    // Dynamically handle any payment gateway without specifying names
-    const paymentGatewayRegex = new RegExp('^/payment-gateway/([^/]+)/$');
-    const gatewayMatch = req.nextUrl.pathname.match(paymentGatewayRegex);
-
-    if (
-      gatewayMatch && // Check if the URL matches the /payment-gateway/<gateway> pattern
-      getUrlPathWithLocale(
-        `/payment-gateway/${gatewayMatch[1]}/`,
-        req.cookies.get('pz-locale')?.value
-      ) !== req.nextUrl.pathname
-    ) {
-      const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
-        `/payment-gateway/${gatewayMatch[1]}/`,
-        req.cookies.get('pz-locale')?.value
-      )}?${req.nextUrl.searchParams.toString()}`;
-
-      return NextResponse.redirect(redirectUrlWithLocale);
-    }
-
     if (req.nextUrl.pathname.startsWith('/orders/checkout-provider/')) {
       try {
         const data = await req.json();
@@ -240,141 +182,129 @@ const withPzDefault =
                   withUrlRedirection(
                     withCompleteGpay(
                       withCompleteMasterpass(
-                        withSavedCardRedirection(
-                          async (req: PzNextRequest, event: NextFetchEvent) => {
-                            let middlewareResult: NextResponse | void =
-                              NextResponse.next();
-
-                            try {
-                              const { locale, prettyUrl, currency } =
-                                req.middlewareParams.rewrites;
-                              const { defaultLocaleValue } =
-                                Settings.localization;
-                              const url = req.nextUrl.clone();
-                              const pathnameWithoutLocale = url.pathname.replace(
-                                urlLocaleMatcherRegex,
-                                ''
-                              );
-
-                              middlewareResult = (await middleware(
-                                req,
-                                event
-                              )) as NextResponse | void;
-
-                              let customRewriteUrlDiff = '';
-
-                              if (
-                                middlewareResult instanceof NextResponse &&
-                                middlewareResult.headers.get(
-                                  'pz-override-response'
-                                ) &&
+                        async (req: PzNextRequest, event: NextFetchEvent) => {
+                          let middlewareResult: NextResponse | void =
+                            NextResponse.next();
+
+                          try {
+                            const { locale, prettyUrl, currency } =
+                              req.middlewareParams.rewrites;
+                            const { defaultLocaleValue } =
+                              Settings.localization;
+                            const url = req.nextUrl.clone();
+                            const pathnameWithoutLocale = url.pathname.replace(
+                              urlLocaleMatcherRegex,
+                              ''
+                            );
+
+                            middlewareResult = (await middleware(
+                              req,
+                              event
+                            )) as NextResponse | void;
+
+                            let customRewriteUrlDiff = '';
+
+                            if (
+                              middlewareResult instanceof NextResponse &&
+                              middlewareResult.headers.get(
+                                'pz-override-response'
+                              ) &&
+                              middlewareResult.headers.get(
+                                'x-middleware-rewrite'
+                              )
+                            ) {
+                              const rewriteUrl = new URL(
                                 middlewareResult.headers.get(
                                   'x-middleware-rewrite'
                                 )
-                              ) {
-                                const rewriteUrl = new URL(
-                                  middlewareResult.headers.get(
-                                    'x-middleware-rewrite'
-                                  )
-                                );
-                                const originalUrl = new URL(req.url);
-                                customRewriteUrlDiff =
-                                  rewriteUrl.pathname.replace(
-                                    originalUrl.pathname,
-                                    ''
-                                  );
-                              }
-
-                              url.basePath = `/${commerceUrl}`;
-                              url.pathname = `/${
-                                locale.length ? `${locale}/` : ''
-                              }${currency}/${customRewriteUrlDiff}${
-                                prettyUrl ?? pathnameWithoutLocale
-                              }`.replace(/\/+/g, '/');
-
-                              if (
-                                !req.middlewareParams.found &&
-                                Settings.customNotFoundEnabled
-                              ) {
-                                let pathname = url.pathname
-                                  .replace(/\/+$/, '')
-                                  .split('/');
-                                url.pathname = url.pathname.replace(
-                                  pathname.pop(),
-                                  'pz-not-found'
+                              );
+                              const originalUrl = new URL(req.url);
+                              customRewriteUrlDiff =
+                                rewriteUrl.pathname.replace(
+                                  originalUrl.pathname,
+                                  ''
                                 );
-                              }
+                            }
 
-                              if (
-                                Settings.usePrettyUrlRoute &&
-                                url.searchParams.toString().length > 0 &&
-                                !Object.entries(ROUTES).find(([, value]) =>
-                                  new RegExp(`^${value}/?$`).test(
-                                    pathnameWithoutLocale
-                                  )
+                            url.basePath = `/${commerceUrl}`;
+                            url.pathname = `/${
+                              locale.length ? `${locale}/` : ''
+                            }${currency}/${customRewriteUrlDiff}${
+                              prettyUrl ?? pathnameWithoutLocale
+                            }`.replace(/\/+/g, '/');
+
+                            if (
+                              Settings.usePrettyUrlRoute &&
+                              url.searchParams.toString().length > 0 &&
+                              !Object.entries(ROUTES).find(([, value]) =>
+                                new RegExp(`^${value}/?$`).test(
+                                  pathnameWithoutLocale
                                 )
-                              ) {
-                                url.pathname =
-                                  url.pathname +
-                                  `searchparams|${url.searchParams.toString()}`;
-                              }
-
-                              Settings.rewrites.forEach((rewrite) => {
-                                url.pathname = url.pathname.replace(
-                                  rewrite.source,
-                                  rewrite.destination
-                                );
-                              });
+                              )
+                            ) {
+                              url.pathname =
+                                url.pathname +
+                                (/\/$/.test(url.pathname) ? '' : '/') +
+                                `searchparams|${url.searchParams.toString()}`;
+                            }
 
-                              // if middleware.ts has a return value for current url
-                              if (middlewareResult instanceof NextResponse) {
-                                // pz-override-response header is used to prevent 404 page for custom responses.
-                                if (
-                                  middlewareResult.headers.get(
-                                    'pz-override-response'
-                                  ) !== 'true'
-                                ) {
-                                  middlewareResult.headers.set(
-                                    'x-middleware-rewrite',
-                                    url.href
-                                  );
-                                } else if (
-                                  middlewareResult.headers.get(
-                                    'x-middleware-rewrite'
-                                  ) &&
-                                  middlewareResult.headers.get(
-                                    'pz-override-response'
-                                  ) === 'true'
-                                ) {
-                                  middlewareResult = NextResponse.rewrite(url);
-                                }
-                              } else {
-                                // if middleware.ts doesn't have a return value.
-                                // e.g. NextResponse.next() doesn't exist in middleware.ts
+                            if (
+                              !req.middlewareParams.found &&
+                              Settings.customNotFoundEnabled
+                            ) {
+                              let pathname = url.pathname
+                                .replace(/\/+$/, '')
+                                .split('/');
+                              url.pathname = url.pathname.replace(
+                                pathname.pop(),
+                                'pz-not-found'
+                              );
+                            }
 
-                                middlewareResult = NextResponse.rewrite(url);
-                              }
+                            Settings.rewrites.forEach((rewrite) => {
+                              url.pathname = url.pathname.replace(
+                                rewrite.source,
+                                rewrite.destination
+                              );
+                            });
 
+                            // if middleware.ts has a return value for current url
+                            if (middlewareResult instanceof NextResponse) {
+                              // pz-override-response header is used to prevent 404 page for custom responses.
                               if (
-                                !url.pathname.startsWith(`/${currency}/orders`)
+                                middlewareResult.headers.get(
+                                  'pz-override-response'
+                                ) !== 'true'
                               ) {
-                                middlewareResult.cookies.set(
-                                  'pz-locale',
-                                  locale?.length > 0
-                                    ? locale
-                                    : defaultLocaleValue,
-                                  {
-                                    sameSite: 'none',
-                                    secure: true,
-                                    expires: new Date(
-                                      Date.now() + 1000 * 60 * 60 * 24 * 7
-                                    ) // 7 days
-                                  }
+                                middlewareResult.headers.set(
+                                  'x-middleware-rewrite',
+                                  url.href
                                 );
+                              } else if (
+                                middlewareResult.headers.get(
+                                  'x-middleware-rewrite'
+                                ) &&
+                                middlewareResult.headers.get(
+                                  'pz-override-response'
+                                ) === 'true'
+                              ) {
+                                middlewareResult = NextResponse.rewrite(url);
                               }
+                            } else {
+                              // if middleware.ts doesn't have a return value.
+                              // e.g. NextResponse.next() doesn't exist in middleware.ts
+
+                              middlewareResult = NextResponse.rewrite(url);
+                            }
+
+                            if (
+                              !url.pathname.startsWith(`/${currency}/orders`)
+                            ) {
                               middlewareResult.cookies.set(
-                                'pz-currency',
-                                currency,
+                                'pz-locale',
+                                locale?.length > 0
+                                  ? locale
+                                  : defaultLocaleValue,
                                 {
                                   sameSite: 'none',
                                   secure: true,
@@ -383,65 +313,76 @@ const withPzDefault =
                                   ) // 7 days
                                 }
                               );
-
-                              if (
-                                req.cookies.get('pz-locale') &&
-                                req.cookies.get('pz-locale').value !== locale
-                              ) {
-                                logger.debug('Locale changed', {
-                                  locale,
-                                  oldLocale: req.cookies.get('pz-locale')?.value,
-                                  ip
-                                });
+                            }
+                            middlewareResult.cookies.set(
+                              'pz-currency',
+                              currency,
+                              {
+                                sameSite: 'none',
+                                secure: true,
+                                expires: new Date(
+                                  Date.now() + 1000 * 60 * 60 * 24 * 7
+                                ) // 7 days
                               }
+                            );
+
+                            if (
+                              req.cookies.get('pz-locale') &&
+                              req.cookies.get('pz-locale').value !== locale
+                            ) {
+                              logger.debug('Locale changed', {
+                                locale,
+                                oldLocale: req.cookies.get('pz-locale')?.value,
+                                ip
+                              });
+                            }
 
+                            middlewareResult.headers.set(
+                              'pz-url',
+                              req.nextUrl.toString()
+                            );
+
+                            if (req.cookies.get('pz-set-currency')) {
+                              middlewareResult.cookies.delete(
+                                'pz-set-currency'
+                              );
+                            }
+
+                            if (process.env.ACC_APP_VERSION) {
                               middlewareResult.headers.set(
-                                'pz-url',
-                                req.nextUrl.toString()
+                                'acc-app-version',
+                                process.env.ACC_APP_VERSION
                               );
+                            }
 
-                              if (req.cookies.get('pz-set-currency')) {
-                                middlewareResult.cookies.delete(
-                                  'pz-set-currency'
-                                );
-                              }
+                            // Set CSRF token if not set
+                            try {
+                              const url = `${Settings.commerceUrl}${user.csrfToken}`;
 
-                              if (process.env.ACC_APP_VERSION) {
-                                middlewareResult.headers.set(
-                                  'acc-app-version',
-                                  process.env.ACC_APP_VERSION
+                              if (!req.cookies.get('csrftoken')) {
+                                const { csrf_token } = await (
+                                  await fetch(url)
+                                ).json();
+                                middlewareResult.cookies.set(
+                                  'csrftoken',
+                                  csrf_token
                                 );
                               }
-
-                              // Set CSRF token if not set
-                              try {
-                                const url = `${Settings.commerceUrl}${user.csrfToken}`;
-
-                                if (!req.cookies.get('csrftoken')) {
-                                  const { csrf_token } = await (
-                                    await fetch(url)
-                                  ).json();
-                                  middlewareResult.cookies.set(
-                                    'csrftoken',
-                                    csrf_token
-                                  );
-                                }
-                              } catch (error) {
-                                logger.error('CSRF Error', {
-                                  error,
-                                  ip
-                                });
-                              }
                             } catch (error) {
-                              logger.error('withPzDefault Error', {
+                              logger.error('CSRF Error', {
                                 error,
                                 ip
                               });
                             }
-
-                            return middlewareResult;
+                          } catch (error) {
+                            logger.error('withPzDefault Error', {
+                              error,
+                              ip
+                            });
                           }
-                        )
+
+                          return middlewareResult;
+                        }
                       )
                     )
                   )

package/middlewares/index.ts

@@ -8,7 +8,6 @@ import withUrlRedirection from './url-redirection';
 import withCompleteGpay from './complete-gpay';
 import withCompleteMasterpass from './complete-masterpass';
 import withCheckoutProvider from './checkout-provider';
-import withSavedCardRedirection from './saved-card-redirection';
 import { NextRequest } from 'next/server';
 
 export {
@@ -21,8 +20,7 @@ export {
   withUrlRedirection,
   withCompleteGpay,
   withCompleteMasterpass,
-  withCheckoutProvider,
-  withSavedCardRedirection
+  withCheckoutProvider
 };
 
 export interface PzNextRequest extends NextRequest {

package/middlewares/oauth-login.ts

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

package/middlewares/pretty-url.ts

@@ -43,14 +43,9 @@ const resolvePrettyUrlHandler =
     return prettyUrlResult;
   };
 
-const resolvePrettyUrl = async (
-  pathname: string,
-  locale: string,
-  ip: string | null
-) => {
+const resolvePrettyUrl = async (pathname: string, ip: string | null) => {
   return Cache.wrap(
     CacheKey.PrettyUrl(pathname),
-    locale,
     resolvePrettyUrlHandler(pathname, ip),
     {
       useProxy: true
@@ -93,7 +88,6 @@ const withPrettyUrl =
       )
         ? url.pathname
         : prettyUrlPathname,
-      matchedLanguagePrefix,
       ip
     );
 

package/package.json

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

package/plugins.d.ts

@@ -21,10 +21,4 @@ declare module '@akinon/pz-otp' {
 
 declare module '@akinon/pz-otp/src/redux/reducer' {
   export const showPopup: any;
-  export const hidePopup: any;
-}
-
-declare module '@akinon/pz-saved-card' {
-  export const savedCardReducer: any;
-  export const SavedCardOption: any;
 }