@akinon/next 1.92.0-rc.8 → 1.92.0-snapshot-ZERO-3448-20250616104958

package/sentry/index.ts

@@ -13,73 +13,36 @@ const ALLOWED_CLIENT_LOG_TYPES: ClientLogType[] = [
   ClientLogType.CHECKOUT
 ];
 
-const isNetworkError = (exception: unknown): boolean => {
-  if (!(exception instanceof Error)) return false;
-
-  const networkErrorPatterns = [
-    'networkerror',
-    'failed to fetch',
-    'network request failed',
-    'network error',
-    'loading chunk',
-    'chunk load failed'
-  ];
-
-  if (exception.name === 'NetworkError') return true;
-
-  if (exception.name === 'TypeError') {
-    return networkErrorPatterns.some((pattern) =>
-      exception.message.toLowerCase().includes(pattern)
-    );
-  }
-
-  return networkErrorPatterns.some((pattern) =>
-    exception.message.toLowerCase().includes(pattern)
-  );
-};
-
 export const initSentry = (
   type: 'Server' | 'Client' | 'Edge',
   options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {}
 ) => {
-  // TODO: Remove Zero Project DSN
+  // TODO: Handle options with ESLint rules
 
-  const baseConfig = {
+  Sentry.init({
     dsn:
-      SENTRY_DSN ||
       options.dsn ||
+      SENTRY_DSN ||
       'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
     initialScope: {
       tags: {
         APP_TYPE: 'ProjectZeroNext',
-        TYPE: type,
-        ...((options.initialScope as any)?.tags || {})
+        TYPE: type
       }
     },
     tracesSampleRate: 0,
-    integrations: []
-  };
-
-  if (type === 'Server' || type === 'Edge') {
-    Sentry.init(baseConfig);
-  } else if (type === 'Client') {
-    Sentry.init({
-      ...baseConfig,
-      beforeSend: (event, hint) => {
-        if (
-          !ALLOWED_CLIENT_LOG_TYPES.includes(
-            event.tags?.LOG_TYPE as ClientLogType
-          )
-        ) {
-          return null;
-        }
-
-        if (isNetworkError(hint?.originalException)) {
-          return null;
-        }
-
-        return event;
+    integrations: [],
+    beforeSend: (event, hint) => {
+      if (
+        type === 'Client' &&
+        !ALLOWED_CLIENT_LOG_TYPES.includes(
+          event.tags?.LOG_TYPE as ClientLogType
+        )
+      ) {
+        return null;
       }
-    });
-  }
+
+      return event;
+    }
+  });
 };

package/types/commerce/order.ts

@@ -114,7 +114,6 @@ export interface Order {
     pk: number;
     name: string;
     slug: string;
-    logo: string;
     [key: string]: any;
   };
 }

package/types/index.ts

@@ -218,6 +218,14 @@ export interface CacheOptions {
   useProxy?: boolean;
 }
 
+export interface SetCookieOptions {
+  expires?: number; // days
+  path?: string;
+  domain?: string;
+  secure?: boolean;
+  sameSite?: 'strict' | 'lax' | 'none';
+}
+
 export interface ClientRequestOptions {
   useTrailingSlash?: boolean;
   useFormData?: boolean;
@@ -283,13 +291,7 @@ export interface ButtonProps
   target?: '_blank' | '_self' | '_parent' | '_top';
 }
 
-export interface FileInputProps extends React.HTMLProps<HTMLInputElement> {
-  fileClassName?: string;
-  fileNameWrapperClassName?: string;
-  fileInputClassName?: string;
-  onChange?: (event: React.ChangeEvent<HTMLInputElement>) => void;
-  buttonClassName?: string;
-}
+export type FileInputProps = React.HTMLProps<HTMLInputElement>;
 
 export interface PriceProps {
   currencyCode?: string;
@@ -310,19 +312,15 @@ export interface InputProps extends React.HTMLProps<HTMLInputElement> {
 
 export interface AccordionProps {
   isCollapse?: boolean;
-  collapseClassName?: string;
   title?: string;
   subTitle?: string;
   icons?: string[];
   iconSize?: number;
   iconColor?: string;
   children?: ReactNode;
-  headerClassName?: string;
   className?: string;
   titleClassName?: string;
-  subTitleClassName?: string;
   dataTestId?: string;
-  contentClassName?: string;
 }
 
 export interface PluginModuleComponentProps {
@@ -347,20 +345,3 @@ export interface PaginationProps {
   direction?: 'next' | 'prev';
   isLoading?: boolean;
 }
-
-export interface ModalProps {
-  portalId: string;
-  children?: React.ReactNode;
-  open?: boolean;
-  setOpen?: (open: boolean) => void;
-  title?: React.ReactNode;
-  showCloseButton?: React.ReactNode;
-  className?: string;
-  overlayClassName?: string;
-  headerWrapperClassName?: string;
-  titleClassName?: string;
-  closeButtonClassName?: string;
-  iconName?: string;
-  iconSize?: number;
-  iconClassName?: string;
-}

package/utils/app-fetch.ts

@@ -43,12 +43,12 @@ const appFetch = async <T>({
     const requestURL = `${decodeURIComponent(commerceUrl)}${url}`;
 
     init.headers = {
-      cookie: nextCookies.toString(),
       ...(init.headers ?? {}),
       ...(ServerVariables.globalHeaders ?? {}),
       'Accept-Language': currentLocale.apiValue,
       'x-currency': currency,
-      'x-forwarded-for': ip
+      'x-forwarded-for': ip,
+      cookie: nextCookies.toString()
     };
 
     init.next = {

package/utils/index.ts

@@ -1,6 +1,7 @@
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../localization';
-import { CDNOptions, ClientRequestOptions } from '../types';
+import { CDNOptions, ClientRequestOptions, SetCookieOptions } from '../types';
+import getRootHostname from './get-root-hostname';
 
 export * from './get-currency';
 export * from './menu-generator';
@@ -20,14 +21,40 @@ export function getCookie(name: string) {
   }
 }
 
-export function setCookie(name: string, val: string) {
-  const date = new Date();
-  const value = val;
+export function setCookie(
+  name: string,
+  value: string,
+  options: SetCookieOptions = {}
+) {
+  const cookieParts = [`${name}=${value}`];
+
+  if (options.expires) {
+    const date = new Date();
+    date.setTime(date.getTime() + options.expires * 24 * 60 * 60 * 1000);
+    cookieParts.push(`expires=${date.toUTCString()}`);
+  }
 
-  date.setTime(date.getTime() + 7 * 24 * 60 * 60 * 1000);
+  cookieParts.push(`path=${options.path ?? '/'}`);
 
-  document.cookie =
-    name + '=' + value + '; expires=' + date.toUTCString() + '; path=/';
+  if (options.secure) {
+    cookieParts.push('secure');
+  }
+
+  if (options.sameSite) {
+    cookieParts.push(`sameSite=${options.sameSite}`);
+  }
+
+  const domain =
+    options.domain ??
+    (settings.localization.localeUrlStrategy === LocaleUrlStrategy.Subdomain
+      ? getRootHostname(document.location.href)
+      : null);
+
+  if (domain) {
+    cookieParts.push(`domain=${domain}`);
+  }
+
+  document.cookie = cookieParts.join('; ');
 }
 
 export function removeCookie(name: string) {
@@ -152,9 +179,6 @@ export function buildCDNUrl(url: string, config?: CDNOptions) {
   return `${rootWithoutOptions}${options}${fileExtension}`;
 }
 
-const { locales, localeUrlStrategy, defaultLocaleValue } =
-  settings.localization;
-
 export const urlLocaleMatcherRegex = new RegExp(
   `^/(${settings.localization.locales
     .filter((l) =>

package/utils/redirect.ts

@@ -3,23 +3,21 @@ import Settings from 'settings';
 import { headers } from 'next/headers';
 import { ServerVariables } from '@akinon/next/utils/server-variables';
 import { getUrlPathWithLocale } from '@akinon/next/utils/localization';
-import { urlLocaleMatcherRegex } from '@akinon/next/utils';
 
 export const redirect = (path: string, type?: RedirectType) => {
   const nextHeaders = headers();
   const pageUrl = new URL(
-    nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL ?? ''
+    nextHeaders.get('pz-url') ?? process.env.NEXT_PUBLIC_URL
   );
 
   const currentLocale = Settings.localization.locales.find(
     (locale) => locale.value === ServerVariables.locale
   );
 
-  const callbackUrl = pageUrl.pathname.replace(urlLocaleMatcherRegex, '');
-
+  const callbackUrl = pageUrl.pathname;
   const redirectUrlWithLocale = getUrlPathWithLocale(
     path,
-    currentLocale?.value
+    currentLocale.localePath ?? currentLocale.value
   );
 
   const redirectUrl = `${redirectUrlWithLocale}?callbackUrl=${callbackUrl}`;

package/with-pz-config.js

@@ -16,8 +16,12 @@ const defaultConfig = {
     remotePatterns: [
       {
         protocol: 'https',
-        hostname: '**'
+        hostname: '**.akinoncloud.com'
       },
+      {
+        protocol: 'https',
+        hostname: '**.akinoncdn.com'
+      }
     ]
   },
   modularizeImports: {

package/data/server/basket.ts

@@ -1,72 +0,0 @@
-import { Cache, CacheKey } from '../../lib/cache';
-import { basket } from '../../data/urls';
-import { Basket } from '../../types';
-import appFetch from '../../utils/app-fetch';
-import { ServerVariables } from '../../utils/server-variables';
-import logger from '../../utils/log';
-
-type GetBasketParams = {
-  locale?: string;
-  currency?: string;
-  namespace?: string;
-};
-
-const getBasketDataHandler = ({
-  locale,
-  currency,
-  namespace
-}: GetBasketParams) => {
-  return async function () {
-    try {
-      const url = namespace
-        ? basket.getBasketDetail(namespace)
-        : basket.getBasket;
-
-      const basketData = await appFetch<{ basket: Basket }>({
-        url,
-        locale,
-        currency,
-        init: {
-          headers: {
-            Accept: 'application/json',
-            'Content-Type': 'application/json'
-          }
-        }
-      });
-
-      if (!basketData?.basket) {
-        logger.warn('Basket data is undefined', {
-          handler: 'getBasketDataHandler',
-          namespace
-        });
-      }
-
-      return basketData;
-    } catch (error) {
-      logger.error('Error fetching basket data', {
-        handler: 'getBasketDataHandler',
-        error,
-        namespace
-      });
-      throw error;
-    }
-  };
-};
-
-export const getBasketData = async ({
-  locale = ServerVariables.locale,
-  currency = ServerVariables.currency,
-  namespace
-}: GetBasketParams = {}) => {
-  return Cache.wrap(
-    CacheKey.Basket(namespace),
-    locale,
-    getBasketDataHandler({ locale, currency, namespace }),
-    {
-      expire: 0,
-      cache: false
-    }
-  );
-};
-
-

package/hooks/use-loyalty-availability.ts

@@ -1,21 +0,0 @@
-import { useAppSelector } from '../redux/hooks';
-
-export const useLoyaltyAvailability = () => {
-  const { paymentOptions, unavailablePaymentOptions } = useAppSelector(
-    (state) => state.checkout
-  );
-
-  const hasLoyaltyInAvailable = paymentOptions.some(
-    (option) =>
-      option.payment_type === 'loyalty_money' ||
-      option.payment_type === 'loyalty'
-  );
-
-  const hasLoyaltyInUnavailable = unavailablePaymentOptions.some(
-    (option) =>
-      option.payment_type === 'loyalty_money' ||
-      option.payment_type === 'loyalty'
-  );
-
-  return hasLoyaltyInAvailable || hasLoyaltyInUnavailable;
-};

package/middlewares/wallet-complete-redirection.ts

@@ -1,179 +0,0 @@
-import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
-import Settings from 'settings';
-import { Buffer } from 'buffer';
-import logger from '../utils/log';
-import { getUrlPathWithLocale } from '../utils/localization';
-import { PzNextRequest } from '.';
-
-const streamToString = async (stream: ReadableStream<Uint8Array> | null) => {
-  if (stream) {
-    const chunks = [];
-    let result = '';
-
-    try {
-      for await (const chunk of stream as any) {
-        chunks.push(Buffer.from(chunk));
-      }
-
-      result = Buffer.concat(chunks).toString('utf-8');
-    } catch (error) {
-      logger.error('Error while reading body stream', {
-        middleware: 'wallet-complete-redirection',
-        error
-      });
-    }
-
-    return result;
-  }
-  return null;
-};
-
-const withWalletCompleteRedirection =
-  (middleware: NextMiddleware) =>
-  async (req: PzNextRequest, event: NextFetchEvent) => {
-    const url = req.nextUrl.clone();
-    const ip = req.headers.get('x-forwarded-for') ?? '';
-    const sessionId = req.cookies.get('osessionid');
-
-    if (url.search.indexOf('WalletCompletePage') === -1) {
-      return middleware(req, event);
-    }
-
-    const requestUrl = `${Settings.commerceUrl}/orders/checkout/${url.search}`;
-    const requestHeaders = {
-      'X-Requested-With': 'XMLHttpRequest',
-      'Content-Type': 'application/x-www-form-urlencoded',
-      Cookie: req.headers.get('cookie') ?? '',
-      'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
-    };
-
-    try {
-      const body = await streamToString(req.body);
-
-      if (!sessionId) {
-        logger.warn(
-          'Make sure that the SESSION_COOKIE_SAMESITE environment variable is set to None in Commerce.',
-          {
-            middleware: 'wallet-complete-redirection',
-            ip
-          }
-        );
-
-        return NextResponse.redirect(
-          `${url.origin}${getUrlPathWithLocale(
-            '/orders/checkout/',
-            req.cookies.get('pz-locale')?.value
-          )}`,
-          303
-        );
-      }
-
-      const request = await fetch(requestUrl, {
-        method: 'POST',
-        headers: requestHeaders,
-        body
-      });
-
-      logger.info('Complete wallet payment request', {
-        requestUrl,
-        status: request.status,
-        requestHeaders,
-        ip
-      });
-
-      const response = await request.json();
-
-      const { context_list: contextList, errors } = response;
-      const redirectionContext = contextList?.find(
-        (context) => context.page_context?.redirect_url
-      );
-      const redirectUrl = redirectionContext?.page_context?.redirect_url;
-
-      if (errors && Object.keys(errors).length) {
-        logger.error('Error while completing wallet payment', {
-          middleware: 'wallet-complete-redirection',
-          errors,
-          requestHeaders,
-          ip
-        });
-
-        return NextResponse.redirect(
-          `${url.origin}${getUrlPathWithLocale(
-            '/orders/checkout/',
-            req.cookies.get('pz-locale')?.value
-          )}`,
-          {
-            status: 303,
-            headers: {
-              'Set-Cookie': `pz-pos-error=${JSON.stringify(errors)}; path=/;`
-            }
-          }
-        );
-      }
-
-      logger.info('Order success page context list', {
-        middleware: 'wallet-complete-redirection',
-        contextList,
-        ip
-      });
-
-      if (!redirectUrl) {
-        logger.warn(
-          'No redirection url for order success page found in page_context. Redirecting to checkout page.',
-          {
-            middleware: 'wallet-complete-redirection',
-            requestHeaders,
-            response: JSON.stringify(response),
-            ip
-          }
-        );
-
-        const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
-          '/orders/checkout/',
-          req.cookies.get('pz-locale')?.value
-        )}`;
-
-        return NextResponse.redirect(redirectUrlWithLocale, 303);
-      }
-
-      const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
-        redirectUrl,
-        req.cookies.get('pz-locale')?.value
-      )}`;
-
-      logger.info('Redirecting to order success page', {
-        middleware: 'wallet-complete-redirection',
-        redirectUrlWithLocale,
-        ip
-      });
-
-      // Using POST method while redirecting causes an error,
-      // So we use 303 status code to change the method to GET
-      const nextResponse = NextResponse.redirect(redirectUrlWithLocale, 303);
-
-      nextResponse.headers.set(
-        'Set-Cookie',
-        request.headers.get('set-cookie') ?? ''
-      );
-
-      return nextResponse;
-    } catch (error) {
-      logger.error('Error while completing wallet payment', {
-        middleware: 'wallet-complete-redirection',
-        error,
-        requestHeaders,
-        ip
-      });
-
-      return NextResponse.redirect(
-        `${url.origin}${getUrlPathWithLocale(
-          '/orders/checkout/',
-          req.cookies.get('pz-locale')?.value
-        )}`,
-        303
-      );
-    }
-  };
-
-export default withWalletCompleteRedirection;

package/utils/redirect-ignore.ts

@@ -1,35 +0,0 @@
-import settings from 'settings';
-import { getUrlPathWithLocale } from './localization';
-
-type IgnorePath = string | RegExp;
-
-const defaultIgnoreList: string[] = [];
-
-const extraIgnores: IgnorePath[] = Array.isArray(
-  settings.commerceRedirectionIgnoreList
-)
-  ? settings.commerceRedirectionIgnoreList.map((path) => {
-      if (path === '/users/reset') {
-        return /^\/users\/reset\/[^/]+\/[^/]+\/$/;
-      }
-      return path;
-    })
-  : [];
-
-export function shouldIgnoreRedirect(
-  pathname: string,
-  locale: string
-): boolean {
-  if (!pathname) return false;
-
-  const rawIgnoreList: IgnorePath[] = [...defaultIgnoreList, ...extraIgnores];
-
-  return rawIgnoreList.some((ignorePath) => {
-    if (ignorePath instanceof RegExp) {
-      return ignorePath.test(pathname);
-    }
-
-    const localized = getUrlPathWithLocale(ignorePath, locale);
-    return localized === pathname;
-  });
-}