@akinon/next 1.14.0 → 1.15.0

package/middlewares/default.ts

@@ -1,256 +1,259 @@
-import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
-import Settings from 'settings';
-import {
-  PzNextRequest,
-  withOauthLogin,
-  withPrettyUrl,
-  withRedirectionPayment,
-  withThreeDRedirection,
-  withUrlRedirection
-} from '.';
-import { urlLocaleMatcherRegex } from '../utils';
-import withCurrency from './currency';
-import withLocale from './locale';
-import logger from '../utils/log';
-import { user } from '../data/urls';
-import { getUrlPathWithLocale } from '../utils/localization';
-
-const withPzDefault =
-  (middleware: NextMiddleware) =>
-  async (req: PzNextRequest, event: NextFetchEvent) => {
-    const url = req.nextUrl.clone();
-    const commerceUrl = encodeURIComponent(decodeURI(Settings.commerceUrl)); // encodeURI doesn't work as expected in middleware
-    const searchParams = new URLSearchParams(url.search);
-    const ip = req.headers.get('x-forwarded-for') ?? '';
-
-    logger.debug('withPzDefault', {
-      url: url.href,
-      middlewareParams: req.middlewareParams,
-      ip
-    });
-
-    // Support legacy ?format=json query param
-    if (searchParams.has('json') || searchParams.get('format') === 'json') {
-      try {
-        searchParams.set('format', 'json');
-
-        const request = await fetch(
-          `${encodeURI(Settings.commerceUrl)}${url.pathname.replace(
-            urlLocaleMatcherRegex,
-            ''
-          )}?${searchParams.toString()}`,
-          {
-            next: {
-              revalidate: 0
-            },
-            headers: {
-              Cookie: req.headers.get('cookie') || '',
-              Accept: 'application/json',
-              'X-Requested-With': 'XMLHttpRequest'
-            }
-          }
-        );
-
-        return NextResponse.json(await request.json());
-      } catch (error) {
-        logger.error('?format=json error', {
-          error,
-          ip
-        });
-        return NextResponse.next();
-      }
-    }
-
-    if (url.pathname === '/healthz') {
-      return NextResponse.json({ status: 'ok' });
-    }
-
-    if (req.nextUrl.pathname.startsWith('/.well-known')) {
-      const url = new URL(`${Settings.commerceUrl}${req.nextUrl.pathname}`);
-      const req_ = await fetch(url.toString());
-
-      if (req_.ok) {
-        return NextResponse.rewrite(url);
-      } else {
-        return NextResponse.next();
-      }
-    }
-
-    if (req.nextUrl.pathname.includes('/orders/hooks/')) {
-      return NextResponse.rewrite(
-        new URL(
-          `${Settings.commerceUrl}${req.nextUrl.pathname.replace(
-            urlLocaleMatcherRegex,
-            ''
-          )}`
-        )
-      );
-    }
-
-    if (req.nextUrl.pathname.startsWith('/orders/redirection/')) {
-      return NextResponse.rewrite(
-        new URL(`${encodeURI(Settings.commerceUrl)}/orders/redirection/`)
-      );
-    }
-
-    // If commerce redirects to /orders/checkout/ without locale
-    if (
-      req.nextUrl.pathname.match(new RegExp('^/orders/checkout/$')) &&
-      req.nextUrl.searchParams.size === 0 &&
-      getUrlPathWithLocale(
-        '/orders/checkout/',
-        req.cookies.get('pz-locale')?.value
-      ) !== req.nextUrl.pathname
-    ) {
-      const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
-        '/orders/checkout/',
-        req.cookies.get('pz-locale')?.value
-      )}`;
-
-      return NextResponse.redirect(redirectUrlWithLocale, 303);
-    }
-
-    req.middlewareParams = {
-      commerceUrl,
-      rewrites: {}
-    };
-
-    return withOauthLogin(
-      withLocale(
-        withCurrency(
-          withPrettyUrl(
-            withRedirectionPayment(
-              withThreeDRedirection(
-                withUrlRedirection(
-                  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}${prettyUrl ?? pathnameWithoutLocale}`;
-
-                      Settings.rewrites.forEach((rewrite) => {
-                        url.pathname = url.pathname.replace(
-                          rewrite.source,
-                          rewrite.destination
-                        );
-                      });
-
-                      middlewareResult = (await middleware(
-                        req,
-                        event
-                      )) as NextResponse | void;
-
-                      // 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 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-locale',
-                          locale?.length > 0 ? locale : defaultLocaleValue,
-                          {
-                            sameSite: 'none',
-                            secure: true,
-                            expires: new Date(
-                              Date.now() + 1000 * 60 * 60 * 24 * 7
-                            ) // 7 days
-                          }
-                        );
-                      }
-                      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(
-                          '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);
-                        }
-                      } catch (error) {
-                        logger.error('CSRF Error', {
-                          error,
-                          ip
-                        });
-                      }
-                    } catch (error) {
-                      logger.error('withPzDefault Error', {
-                        error,
-                        ip
-                      });
-                    }
-
-                    return middlewareResult;
-                  }
-                )
-              )
-            )
-          )
-        )
-      )
-    )(req, event);
-  };
-
-export default withPzDefault;
+import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
+import Settings from 'settings';
+import {
+  PzNextRequest,
+  withCompleteGpay,
+  withOauthLogin,
+  withPrettyUrl,
+  withRedirectionPayment,
+  withThreeDRedirection,
+  withUrlRedirection
+} from '.';
+import { urlLocaleMatcherRegex } from '../utils';
+import withCurrency from './currency';
+import withLocale from './locale';
+import logger from '../utils/log';
+import { user } from '../data/urls';
+import { getUrlPathWithLocale } from '../utils/localization';
+
+const withPzDefault =
+  (middleware: NextMiddleware) =>
+  async (req: PzNextRequest, event: NextFetchEvent) => {
+    const url = req.nextUrl.clone();
+    const commerceUrl = encodeURIComponent(decodeURI(Settings.commerceUrl)); // encodeURI doesn't work as expected in middleware
+    const searchParams = new URLSearchParams(url.search);
+    const ip = req.headers.get('x-forwarded-for') ?? '';
+
+    logger.debug('withPzDefault', {
+      url: url.href,
+      middlewareParams: req.middlewareParams,
+      ip
+    });
+
+    // Support legacy ?format=json query param
+    if (searchParams.has('json') || searchParams.get('format') === 'json') {
+      try {
+        searchParams.set('format', 'json');
+
+        const request = await fetch(
+          `${encodeURI(Settings.commerceUrl)}${url.pathname.replace(
+            urlLocaleMatcherRegex,
+            ''
+          )}?${searchParams.toString()}`,
+          {
+            next: {
+              revalidate: 0
+            },
+            headers: {
+              Cookie: req.headers.get('cookie') || '',
+              Accept: 'application/json',
+              'X-Requested-With': 'XMLHttpRequest'
+            }
+          }
+        );
+
+        return NextResponse.json(await request.json());
+      } catch (error) {
+        logger.error('?format=json error', {
+          error,
+          ip
+        });
+        return NextResponse.next();
+      }
+    }
+
+    if (url.pathname === '/healthz') {
+      return NextResponse.json({ status: 'ok' });
+    }
+
+    if (req.nextUrl.pathname.startsWith('/.well-known')) {
+      const url = new URL(`${Settings.commerceUrl}${req.nextUrl.pathname}`);
+      const req_ = await fetch(url.toString());
+
+      if (req_.ok) {
+        return NextResponse.rewrite(url);
+      } else {
+        return NextResponse.next();
+      }
+    }
+
+    if (req.nextUrl.pathname.includes('/orders/hooks/')) {
+      return NextResponse.rewrite(
+        new URL(
+          `${Settings.commerceUrl}${req.nextUrl.pathname.replace(
+            urlLocaleMatcherRegex,
+            ''
+          )}`
+        )
+      );
+    }
+
+    if (req.nextUrl.pathname.startsWith('/orders/redirection/')) {
+      return NextResponse.rewrite(
+        new URL(`${encodeURI(Settings.commerceUrl)}/orders/redirection/`)
+      );
+    }
+
+    // If commerce redirects to /orders/checkout/ without locale
+    if (
+      req.nextUrl.pathname.match(new RegExp('^/orders/checkout/$')) &&
+      req.nextUrl.searchParams.size === 0 &&
+      getUrlPathWithLocale(
+        '/orders/checkout/',
+        req.cookies.get('pz-locale')?.value
+      ) !== req.nextUrl.pathname
+    ) {
+      const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
+        '/orders/checkout/',
+        req.cookies.get('pz-locale')?.value
+      )}`;
+
+      return NextResponse.redirect(redirectUrlWithLocale, 303);
+    }
+
+    req.middlewareParams = {
+      commerceUrl,
+      rewrites: {}
+    };
+
+    return withOauthLogin(
+      withLocale(
+        withCurrency(
+          withPrettyUrl(
+            withRedirectionPayment(
+              withThreeDRedirection(
+                withUrlRedirection(
+                  withCompleteGpay(
+                    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}${prettyUrl ?? pathnameWithoutLocale}`;
+
+                        Settings.rewrites.forEach((rewrite) => {
+                          url.pathname = url.pathname.replace(
+                            rewrite.source,
+                            rewrite.destination
+                          );
+                        });
+
+                        middlewareResult = (await middleware(
+                          req,
+                          event
+                        )) as NextResponse | void;
+
+                        // 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 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-locale',
+                            locale?.length > 0 ? locale : defaultLocaleValue,
+                            {
+                              sameSite: 'none',
+                              secure: true,
+                              expires: new Date(
+                                Date.now() + 1000 * 60 * 60 * 24 * 7
+                              ) // 7 days
+                            }
+                          );
+                        }
+                        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(
+                            '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);
+                          }
+                        } catch (error) {
+                          logger.error('CSRF Error', {
+                            error,
+                            ip
+                          });
+                        }
+                      } catch (error) {
+                        logger.error('withPzDefault Error', {
+                          error,
+                          ip
+                        });
+                      }
+
+                      return middlewareResult;
+                    }
+                  )
+                )
+              )
+            )
+          )
+        )
+      )
+    )(req, event);
+  };
+
+export default withPzDefault;

package/middlewares/index.ts

@@ -1,29 +1,31 @@
-import withPzDefault from './default';
-import withPrettyUrl from './pretty-url';
-import withThreeDRedirection from './three-d-redirection';
-import withRedirectionPayment from './redirection-payment';
-import withLocale from './locale';
-import withOauthLogin from './oauth-login';
-import withUrlRedirection from './url-redirection';
-import { NextRequest } from 'next/server';
-
-export {
-  withPzDefault,
-  withPrettyUrl,
-  withThreeDRedirection,
-  withRedirectionPayment,
-  withLocale,
-  withOauthLogin,
-  withUrlRedirection
-};
-
-export interface PzNextRequest extends NextRequest {
-  middlewareParams: {
-    commerceUrl: string;
-    rewrites: {
-      locale?: string;
-      prettyUrl?: string;
-      currency?: string;
-    };
-  };
-}
+import withPzDefault from './default';
+import withPrettyUrl from './pretty-url';
+import withThreeDRedirection from './three-d-redirection';
+import withRedirectionPayment from './redirection-payment';
+import withLocale from './locale';
+import withOauthLogin from './oauth-login';
+import withUrlRedirection from './url-redirection';
+import withCompleteGpay from './complete-gpay';
+import { NextRequest } from 'next/server';
+
+export {
+  withPzDefault,
+  withPrettyUrl,
+  withThreeDRedirection,
+  withRedirectionPayment,
+  withLocale,
+  withOauthLogin,
+  withUrlRedirection,
+  withCompleteGpay
+};
+
+export interface PzNextRequest extends NextRequest {
+  middlewareParams: {
+    commerceUrl: string;
+    rewrites: {
+      locale?: string;
+      prettyUrl?: string;
+      currency?: string;
+    };
+  };
+}