@akinon/next 1.13.1 → 1.14.0

package/middlewares/locale.ts

@@ -1,68 +1,68 @@
-import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
-import settings from 'settings';
-import { PzNextRequest } from '.';
-import { LocaleUrlStrategy } from '../localization';
-import { urlLocaleMatcherRegex } from '../utils';
-import logger from '../utils/log';
-
-const getMatchedLocale = (pathname: string) => {
-  let matchedLocale = pathname.match(urlLocaleMatcherRegex)?.[0] ?? '';
-  matchedLocale = matchedLocale.replace('/', '');
-
-  if (!matchedLocale.length) {
-    if (
-      settings.localization.localeUrlStrategy !==
-      LocaleUrlStrategy.ShowAllLocales
-    ) {
-      matchedLocale = settings.localization.defaultLocaleValue;
-    }
-  }
-
-  return matchedLocale;
-};
-
-const withLocale =
-  (middleware: NextMiddleware) =>
-  async (req: PzNextRequest, event: NextFetchEvent) => {
-    const ip = req.headers.get('x-forwarded-for') ?? '';
-
-    try {
-      const url = req.nextUrl.clone();
-      const matchedLocale = getMatchedLocale(url.pathname);
-      let { localeUrlStrategy, defaultLocaleValue, redirectToDefaultLocale } =
-        settings.localization;
-
-      localeUrlStrategy =
-        localeUrlStrategy ?? LocaleUrlStrategy.HideDefaultLocale;
-
-      if (!defaultLocaleValue) {
-        logger.error('Default locale value is not defined in settings.', {
-          ip
-        });
-        throw new Error(
-          'Default locale value is not defined. Use `defaultLocaleValue` property in `localization` object in `settings.js` file.'
-        );
-      }
-
-      if (
-        !matchedLocale?.length &&
-        localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales &&
-        redirectToDefaultLocale &&
-        req.method === 'GET'
-      ) {
-        url.pathname = `/${defaultLocaleValue}${url.pathname}`;
-        return NextResponse.redirect(url);
-      }
-
-      req.middlewareParams.rewrites.locale = matchedLocale;
-    } catch (error) {
-      logger.error('withLocale error', {
-        error,
-        ip
-      });
-    }
-
-    return middleware(req, event);
-  };
-
-export default withLocale;
+import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
+import settings from 'settings';
+import { PzNextRequest } from '.';
+import { LocaleUrlStrategy } from '../localization';
+import { urlLocaleMatcherRegex } from '../utils';
+import logger from '../utils/log';
+
+const getMatchedLocale = (pathname: string) => {
+  let matchedLocale = pathname.match(urlLocaleMatcherRegex)?.[0] ?? '';
+  matchedLocale = matchedLocale.replace('/', '');
+
+  if (!matchedLocale.length) {
+    if (
+      settings.localization.localeUrlStrategy !==
+      LocaleUrlStrategy.ShowAllLocales
+    ) {
+      matchedLocale = settings.localization.defaultLocaleValue;
+    }
+  }
+
+  return matchedLocale;
+};
+
+const withLocale =
+  (middleware: NextMiddleware) =>
+  async (req: PzNextRequest, event: NextFetchEvent) => {
+    const ip = req.headers.get('x-forwarded-for') ?? '';
+
+    try {
+      const url = req.nextUrl.clone();
+      const matchedLocale = getMatchedLocale(url.pathname);
+      let { localeUrlStrategy, defaultLocaleValue, redirectToDefaultLocale } =
+        settings.localization;
+
+      localeUrlStrategy =
+        localeUrlStrategy ?? LocaleUrlStrategy.HideDefaultLocale;
+
+      if (!defaultLocaleValue) {
+        logger.error('Default locale value is not defined in settings.', {
+          ip
+        });
+        throw new Error(
+          'Default locale value is not defined. Use `defaultLocaleValue` property in `localization` object in `settings.js` file.'
+        );
+      }
+
+      if (
+        !matchedLocale?.length &&
+        localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales &&
+        redirectToDefaultLocale &&
+        req.method === 'GET'
+      ) {
+        url.pathname = `/${defaultLocaleValue}${url.pathname}`;
+        return NextResponse.redirect(url);
+      }
+
+      req.middlewareParams.rewrites.locale = matchedLocale;
+    } catch (error) {
+      logger.error('withLocale error', {
+        error,
+        ip
+      });
+    }
+
+    return middleware(req, event);
+  };
+
+export default withLocale;

package/middlewares/oauth-login.ts

@@ -1,79 +1,79 @@
-import {
-  NextFetchEvent,
-  NextMiddleware,
-  NextRequest,
-  NextResponse
-} from 'next/server';
-import Settings from 'settings';
-import { getUrlPathWithLocale } from '../utils/localization';
-
-const withOauthLogin =
-  (middleware: NextMiddleware) =>
-  async (req: NextRequest, event: NextFetchEvent) => {
-    const url = req.nextUrl.clone();
-    const loginUrlMatcherRegex = new RegExp(/^\/(\w+)\/login\/?$/);
-    const loginCallbackUrlMatcherRegex = new RegExp(
-      /^\/(\w+)\/login\/callback\/?$/
-    );
-
-    const headers = {
-      'x-forwarded-host':
-        req.headers.get('x-forwarded-host') || req.headers.get('host') || '',
-      'x-currency': req.cookies.get('pz-currency')?.value ?? ''
-    };
-
-    if (loginUrlMatcherRegex.test(url.pathname)) {
-      const provider = url.pathname.match(loginUrlMatcherRegex)[1];
-      const response = NextResponse.rewrite(
-        `${Settings.commerceUrl}/${provider}/login/`,
-        {
-          headers
-        }
-      );
-
-      if (req.headers.get('referer')) {
-        response.cookies.set(
-          'pz-oauth-callback-url',
-          req.headers.get('referer')
-        );
-      }
-
-      return response;
-    }
-
-    if (loginCallbackUrlMatcherRegex.test(url.pathname)) {
-      const provider = url.pathname.match(loginCallbackUrlMatcherRegex)[1];
-
-      return NextResponse.rewrite(
-        `${Settings.commerceUrl}/${provider}/login/callback/${url.search}`,
-        {
-          headers
-        }
-      );
-    }
-
-    if (!url.pathname.startsWith('/baskets/basket')) {
-      return middleware(req, event);
-    }
-
-    if (req.cookies.get('messages')?.value.includes('Successfully signed in')) {
-      let redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
-        '/auth/oauth-login',
-        req.cookies.get('pz-locale')?.value
-      )}`;
-      let callbackUrl = req.cookies.get('pz-oauth-callback-url')?.value ?? '';
-
-      if (callbackUrl.length) {
-        redirectUrlWithLocale += `?next=${encodeURIComponent(callbackUrl)}`;
-      }
-
-      const response = NextResponse.redirect(redirectUrlWithLocale);
-      response.cookies.delete('messages');
-      response.cookies.delete('pz-oauth-callback-url');
-      return response;
-    }
-
-    return middleware(req, event);
-  };
-
-export default withOauthLogin;
+import {
+  NextFetchEvent,
+  NextMiddleware,
+  NextRequest,
+  NextResponse
+} from 'next/server';
+import Settings from 'settings';
+import { getUrlPathWithLocale } from '../utils/localization';
+
+const withOauthLogin =
+  (middleware: NextMiddleware) =>
+  async (req: NextRequest, event: NextFetchEvent) => {
+    const url = req.nextUrl.clone();
+    const loginUrlMatcherRegex = new RegExp(/^\/(\w+)\/login\/?$/);
+    const loginCallbackUrlMatcherRegex = new RegExp(
+      /^\/(\w+)\/login\/callback\/?$/
+    );
+
+    const headers = {
+      'x-forwarded-host':
+        req.headers.get('x-forwarded-host') || req.headers.get('host') || '',
+      'x-currency': req.cookies.get('pz-currency')?.value ?? ''
+    };
+
+    if (loginUrlMatcherRegex.test(url.pathname)) {
+      const provider = url.pathname.match(loginUrlMatcherRegex)[1];
+      const response = NextResponse.rewrite(
+        `${Settings.commerceUrl}/${provider}/login/`,
+        {
+          headers
+        }
+      );
+
+      if (req.headers.get('referer')) {
+        response.cookies.set(
+          'pz-oauth-callback-url',
+          req.headers.get('referer')
+        );
+      }
+
+      return response;
+    }
+
+    if (loginCallbackUrlMatcherRegex.test(url.pathname)) {
+      const provider = url.pathname.match(loginCallbackUrlMatcherRegex)[1];
+
+      return NextResponse.rewrite(
+        `${Settings.commerceUrl}/${provider}/login/callback/${url.search}`,
+        {
+          headers
+        }
+      );
+    }
+
+    if (!url.pathname.startsWith('/baskets/basket')) {
+      return middleware(req, event);
+    }
+
+    if (req.cookies.get('messages')?.value.includes('Successfully signed in')) {
+      let redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
+        '/auth/oauth-login',
+        req.cookies.get('pz-locale')?.value
+      )}`;
+      let callbackUrl = req.cookies.get('pz-oauth-callback-url')?.value ?? '';
+
+      if (callbackUrl.length) {
+        redirectUrlWithLocale += `?next=${encodeURIComponent(callbackUrl)}`;
+      }
+
+      const response = NextResponse.redirect(redirectUrlWithLocale);
+      response.cookies.delete('messages');
+      response.cookies.delete('pz-oauth-callback-url');
+      return response;
+    }
+
+    return middleware(req, event);
+  };
+
+export default withOauthLogin;

package/middlewares/pretty-url.ts

@@ -1,104 +1,104 @@
-import { Cache, CacheKey } from '../lib/cache';
-import { NextFetchEvent, NextMiddleware, NextRequest } from 'next/server';
-import { ROUTES } from 'routes';
-import { URLS } from '../data/urls';
-import Settings from 'settings';
-import { urlLocaleMatcherRegex } from '../utils';
-import { PzNextRequest } from '.';
-import logger from '../utils/log';
-
-type PrettyUrlResult = {
-  matched: boolean;
-  path?: string;
-};
-
-const resolvePrettyUrlHandler =
-  (pathname: string, ip: string | null) => async () => {
-    let results = <{ old_path: string }[]>[];
-    let prettyUrlResult: PrettyUrlResult = {
-      matched: false
-    };
-
-    try {
-      const requestUrl = URLS.misc.prettyUrls(pathname);
-
-      logger.debug(`Resolving pretty url`, { pathname, requestUrl, ip });
-
-      const apiResponse = await fetch(requestUrl);
-      const data = await apiResponse.json();
-      ({ results } = data);
-
-      const matched = results.length > 0;
-      const [{ old_path: path } = { old_path: '' }] = results;
-      prettyUrlResult = {
-        matched,
-        path
-      };
-
-      logger.trace('Pretty url result', { prettyUrlResult, ip });
-    } catch (error) {
-      logger.error('Error resolving pretty url', { error, pathname, ip });
-    }
-
-    return prettyUrlResult;
-  };
-
-const resolvePrettyUrl = async (pathname: string, ip: string | null) => {
-  return Cache.wrap(
-    CacheKey.PrettyUrl(pathname),
-    resolvePrettyUrlHandler(pathname, ip),
-    {
-      useProxy: true
-    }
-  );
-};
-
-const withPrettyUrl =
-  (middleware: NextMiddleware) =>
-  async (req: PzNextRequest, event: NextFetchEvent) => {
-    const url = req.nextUrl.clone();
-    const matchedLanguagePrefix = url.pathname.match(
-      urlLocaleMatcherRegex
-    )?.[0];
-    const prettyUrlPathname = url.pathname.replace(matchedLanguagePrefix, '');
-    const isValidPrettyUrlPath = (pathname: string) => {
-      return (
-        new RegExp(/^\/[a-zA-Z0-9/]+(?:-[a-zA-Z0-9/]+)*$/).test(pathname) &&
-        !Object.entries(ROUTES).find(([, value]) =>
-          new RegExp(`^${value}$`).test(pathname)
-        )
-      );
-    };
-    const ip = req.headers.get('x-forwarded-for') ?? '';
-
-    if (
-      !isValidPrettyUrlPath(prettyUrlPathname) ||
-      Settings.commerceUrl === 'default'
-    ) {
-      return middleware(req, event);
-    }
-
-    const prettyUrlResult = await resolvePrettyUrl(
-      Settings.localization.localeIncludedPrettyUrlPattern?.test(
-        prettyUrlPathname
-      )
-        ? url.pathname
-        : prettyUrlPathname,
-      ip
-    );
-
-    if (prettyUrlResult.matched) {
-      req.middlewareParams.rewrites.prettyUrl = prettyUrlResult.path;
-      logger.debug('Resolved pretty url', {
-        source: prettyUrlPathname,
-        dest: prettyUrlResult.path,
-        ip
-      });
-
-      return middleware(req, event);
-    }
-
-    return middleware(req, event);
-  };
-
-export default withPrettyUrl;
+import { Cache, CacheKey } from '../lib/cache';
+import { NextFetchEvent, NextMiddleware, NextRequest } from 'next/server';
+import { ROUTES } from 'routes';
+import { URLS } from '../data/urls';
+import Settings from 'settings';
+import { urlLocaleMatcherRegex } from '../utils';
+import { PzNextRequest } from '.';
+import logger from '../utils/log';
+
+type PrettyUrlResult = {
+  matched: boolean;
+  path?: string;
+};
+
+const resolvePrettyUrlHandler =
+  (pathname: string, ip: string | null) => async () => {
+    let results = <{ old_path: string }[]>[];
+    let prettyUrlResult: PrettyUrlResult = {
+      matched: false
+    };
+
+    try {
+      const requestUrl = URLS.misc.prettyUrls(pathname);
+
+      logger.debug(`Resolving pretty url`, { pathname, requestUrl, ip });
+
+      const apiResponse = await fetch(requestUrl);
+      const data = await apiResponse.json();
+      ({ results } = data);
+
+      const matched = results.length > 0;
+      const [{ old_path: path } = { old_path: '' }] = results;
+      prettyUrlResult = {
+        matched,
+        path
+      };
+
+      logger.trace('Pretty url result', { prettyUrlResult, ip });
+    } catch (error) {
+      logger.error('Error resolving pretty url', { error, pathname, ip });
+    }
+
+    return prettyUrlResult;
+  };
+
+const resolvePrettyUrl = async (pathname: string, ip: string | null) => {
+  return Cache.wrap(
+    CacheKey.PrettyUrl(pathname),
+    resolvePrettyUrlHandler(pathname, ip),
+    {
+      useProxy: true
+    }
+  );
+};
+
+const withPrettyUrl =
+  (middleware: NextMiddleware) =>
+  async (req: PzNextRequest, event: NextFetchEvent) => {
+    const url = req.nextUrl.clone();
+    const matchedLanguagePrefix = url.pathname.match(
+      urlLocaleMatcherRegex
+    )?.[0];
+    const prettyUrlPathname = url.pathname.replace(matchedLanguagePrefix, '');
+    const isValidPrettyUrlPath = (pathname: string) => {
+      return (
+        new RegExp(/^\/[a-zA-Z0-9/]+(?:-[a-zA-Z0-9/]+)*$/).test(pathname) &&
+        !Object.entries(ROUTES).find(([, value]) =>
+          new RegExp(`^${value}$`).test(pathname)
+        )
+      );
+    };
+    const ip = req.headers.get('x-forwarded-for') ?? '';
+
+    if (
+      !isValidPrettyUrlPath(prettyUrlPathname) ||
+      Settings.commerceUrl === 'default'
+    ) {
+      return middleware(req, event);
+    }
+
+    const prettyUrlResult = await resolvePrettyUrl(
+      Settings.localization.localeIncludedPrettyUrlPattern?.test(
+        prettyUrlPathname
+      )
+        ? url.pathname
+        : prettyUrlPathname,
+      ip
+    );
+
+    if (prettyUrlResult.matched) {
+      req.middlewareParams.rewrites.prettyUrl = prettyUrlResult.path;
+      logger.debug('Resolved pretty url', {
+        source: prettyUrlPathname,
+        dest: prettyUrlResult.path,
+        ip
+      });
+
+      return middleware(req, event);
+    }
+
+    return middleware(req, event);
+  };
+
+export default withPrettyUrl;