@akinon/next 1.91.0 → 1.92.0-rc.11

package/middlewares/default.ts

@@ -11,7 +11,8 @@ import {
   withRedirectionPayment,
   withSavedCardRedirection,
   withThreeDRedirection,
-  withUrlRedirection
+  withUrlRedirection,
+  withWalletCompleteRedirection
 } from '.';
 import { urlLocaleMatcherRegex } from '../utils';
 import withCurrency from './currency';
@@ -228,144 +229,168 @@ const withPzDefault =
                     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'
-                                ) &&
-                                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,
+                          withWalletCompleteRedirection(
+                            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,
                                     ''
                                   );
-                              }
 
-                              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 +
-                                  (/\/$/.test(url.pathname) ? '' : '/') +
-                                  `searchparams|${encodeURIComponent(
-                                    url.searchParams.toString()
-                                  )}`;
-                              }
+                                middlewareResult = (await middleware(
+                                  req,
+                                  event
+                                )) as NextResponse | void;
 
-                              if (
-                                !req.middlewareParams.found &&
-                                Settings.customNotFoundEnabled
-                              ) {
-                                const pathname = url.pathname
-                                  .replace(/\/+$/, '')
-                                  .split('/');
-                                url.pathname = url.pathname.replace(
-                                  pathname.pop(),
-                                  'pz-not-found'
-                                );
-                              }
-
-                              Settings.rewrites.forEach((rewrite) => {
-                                url.pathname = url.pathname.replace(
-                                  rewrite.source,
-                                  rewrite.destination
-                                );
-                              });
+                                let customRewriteUrlDiff = '';
 
-                              // 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 instanceof NextResponse &&
                                   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'
+                                    '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 (
+                                  Settings.usePrettyUrlRoute &&
+                                  url.searchParams.toString().length > 0 &&
+                                  !Object.entries(ROUTES).find(([, value]) =>
+                                    new RegExp(`^${value}/?$`).test(
+                                      pathnameWithoutLocale
+                                    )
+                                  )
                                 ) {
+                                  url.pathname =
+                                    url.pathname +
+                                    (/\/$/.test(url.pathname) ? '' : '/') +
+                                    `searchparams|${encodeURIComponent(
+                                      url.searchParams.toString()
+                                    )}`;
+                                }
+
+                                if (
+                                  !req.middlewareParams.found &&
+                                  Settings.customNotFoundEnabled
+                                ) {
+                                  const pathname = url.pathname
+                                    .replace(/\/+$/, '')
+                                    .split('/');
+                                  url.pathname = url.pathname.replace(
+                                    pathname.pop(),
+                                    'pz-not-found'
+                                  );
+                                }
+
+                                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 (
+                                    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
+
                                   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);
-                              }
+                                const { localeUrlStrategy } =
+                                  Settings.localization;
+
+                                const fallbackHost =
+                                  req.headers.get('x-forwarded-host') ||
+                                  req.headers.get('host');
+                                const hostname =
+                                  process.env.NEXT_PUBLIC_URL ||
+                                  `https://${fallbackHost}`;
+                                const rootHostname =
+                                  localeUrlStrategy ===
+                                  LocaleUrlStrategy.Subdomain
+                                    ? getRootHostname(hostname)
+                                    : null;
+
+                                if (
+                                  !url.pathname.startsWith(
+                                    `/${currency}/orders`
+                                  )
+                                ) {
+                                  middlewareResult.cookies.set(
+                                    'pz-locale',
+                                    locale?.length > 0
+                                      ? locale
+                                      : defaultLocaleValue,
+                                    {
+                                      domain: rootHostname,
+                                      sameSite: 'none',
+                                      secure: true,
+                                      expires: new Date(
+                                        Date.now() + 1000 * 60 * 60 * 24 * 7
+                                      ) // 7 days
+                                    }
+                                  );
+                                }
 
-                              const { localeUrlStrategy } =
-                                Settings.localization;
-
-                              const fallbackHost =
-                                req.headers.get('x-forwarded-host') ||
-                                req.headers.get('host');
-                              const hostname =
-                                process.env.NEXT_PUBLIC_URL ||
-                                `https://${fallbackHost}`;
-                              const rootHostname =
-                                localeUrlStrategy ===
-                                LocaleUrlStrategy.Subdomain
-                                  ? getRootHostname(hostname)
-                                  : null;
-
-                              if (
-                                !url.pathname.startsWith(`/${currency}/orders`)
-                              ) {
                                 middlewareResult.cookies.set(
-                                  'pz-locale',
-                                  locale?.length > 0
-                                    ? locale
-                                    : defaultLocaleValue,
+                                  'pz-currency',
+                                  currency,
                                   {
                                     domain: rootHostname,
                                     sameSite: 'none',
@@ -375,82 +400,69 @@ const withPzDefault =
                                     ) // 7 days
                                   }
                                 );
-                              }
 
-                              middlewareResult.cookies.set(
-                                'pz-currency',
-                                currency,
-                                {
-                                  domain: rootHostname,
-                                  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
+                                  });
                                 }
-                              );
-
-                              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(
-                                  'acc-app-version',
-                                  process.env.ACC_APP_VERSION
+                                  'pz-url',
+                                  req.nextUrl.toString()
                                 );
-                              }
 
-                              // Set CSRF token if not set
-                              try {
-                                const url = `${Settings.commerceUrl}${user.csrfToken}`;
+                                if (req.cookies.get('pz-set-currency')) {
+                                  middlewareResult.cookies.delete(
+                                    'pz-set-currency'
+                                  );
+                                }
 
-                                if (!req.cookies.get('csrftoken')) {
-                                  const { csrf_token } = await (
-                                    await fetch(url)
-                                  ).json();
-                                  middlewareResult.cookies.set(
-                                    'csrftoken',
-                                    csrf_token,
-                                    {
-                                      domain: rootHostname
-                                    }
+                                if (process.env.ACC_APP_VERSION) {
+                                  middlewareResult.headers.set(
+                                    'acc-app-version',
+                                    process.env.ACC_APP_VERSION
                                   );
                                 }
+
+                                // 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,
+                                      {
+                                        domain: rootHostname
+                                      }
+                                    );
+                                  }
+                                } catch (error) {
+                                  logger.error('CSRF Error', {
+                                    error,
+                                    ip
+                                  });
+                                }
                               } catch (error) {
-                                logger.error('CSRF Error', {
+                                logger.error('withPzDefault Error', {
                                   error,
                                   ip
                                 });
                               }
-                            } catch (error) {
-                              logger.error('withPzDefault Error', {
-                                error,
-                                ip
-                              });
-                            }
 
-                            return middlewareResult;
-                          }
+                              return middlewareResult;
+                            }
+                          )
                         )
                       )
                     )

package/middlewares/index.ts

@@ -9,6 +9,7 @@ import withCompleteGpay from './complete-gpay';
 import withCompleteMasterpass from './complete-masterpass';
 import withCheckoutProvider from './checkout-provider';
 import withSavedCardRedirection from './saved-card-redirection';
+import withWalletCompleteRedirection from './wallet-complete-redirection';
 import { NextRequest } from 'next/server';
 
 export {
@@ -22,7 +23,8 @@ export {
   withCompleteGpay,
   withCompleteMasterpass,
   withCheckoutProvider,
-  withSavedCardRedirection
+  withSavedCardRedirection,
+  withWalletCompleteRedirection
 };
 
 export interface PzNextRequest extends NextRequest {

package/middlewares/locale.ts

@@ -23,7 +23,15 @@ const getMatchedLocale = (pathname: string, req: PzNextRequest) => {
       );
 
       if (subDomainLocaleMatched && subDomainLocaleMatched[0]) {
-        matchedLocale = subDomainLocaleMatched[0].slice(1);
+        const subdomainLocale = subDomainLocaleMatched[0].slice(1);
+
+        const isValidSubdomainLocale = settings.localization.locales.find(
+          (l) => l.value === subdomainLocale
+        );
+
+        if (isValidSubdomainLocale) {
+          matchedLocale = subdomainLocale;
+        }
       }
     }
   }

package/middlewares/redirection-payment.ts

@@ -146,7 +146,8 @@ const withRedirectionPayment =
       logger.info('Redirecting to order success page', {
         middleware: 'redirection-payment',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/saved-card-redirection.ts

@@ -145,7 +145,8 @@ const withSavedCardRedirection =
       logger.info('Redirecting to order success page', {
         middleware: 'saved-card-redirection',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/three-d-redirection.ts

@@ -145,7 +145,8 @@ const withThreeDRedirection =
       logger.info('Redirecting to order success page', {
         middleware: 'three-d-redirection',
         redirectUrlWithLocale,
-        ip
+        ip,
+        setCookie: request.headers.get('set-cookie')
       });
 
       // Using POST method while redirecting causes an error,

package/middlewares/url-redirection.ts

@@ -4,6 +4,7 @@ import { PzNextRequest } from '.';
 import logger from '../utils/log';
 import { urlLocaleMatcherRegex } from '../utils';
 import { getUrlPathWithLocale } from '../utils/localization';
+import { shouldIgnoreRedirect } from '../utils/redirect-ignore';
 import { ROUTES } from 'routes';
 
 // This middleware is used to handle url redirections set in Omnitron
@@ -50,7 +51,7 @@ const withUrlRedirection =
         const location = request.headers.get('location');
         const redirectUrl = new URL(
           request.headers.get('location'),
-          location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
+          location.startsWith('http') ? '' : url.origin
         );
 
         redirectUrl.pathname = getUrlPathWithLocale(
@@ -60,20 +61,13 @@ const withUrlRedirection =
 
         const setCookies = request.headers.getSetCookie();
 
-        if (settings.commerceRedirectionIgnoreList) {
-          const shouldIgnoreRedirect =
-            settings.commerceRedirectionIgnoreList.some((ignorePath) =>
-              redirectUrl.pathname.startsWith(
-                getUrlPathWithLocale(
-                  ignorePath,
-                  req.middlewareParams.rewrites.locale
-                )
-              )
-            );
-
-          if (shouldIgnoreRedirect) {
-            return middleware(req, event);
-          }
+        if (
+          shouldIgnoreRedirect(
+            url.pathname,
+            req.middlewareParams.rewrites.locale
+          )
+        ) {
+          return middleware(req, event);
         }
 
         const response = NextResponse.redirect(redirectUrl.toString(), {