@akinon/next 1.25.0-rc.4 → 1.25.0

package/CHANGELOG.md

@@ -1,76 +1,23 @@
 # @akinon/next
 
-## 1.25.0-rc.4
-
-### Patch Changes
-
-- 183674f: BRDG-9158: Handle locale prefix
-  - @akinon/eslint-plugin-projectzero@1.25.0-rc.4
-
-## 1.25.0-rc.3
+## 1.25.0
 
 ### Minor Changes
 
-- 1289982: ZERO-2521: Add x-forwarded-for header to requests
-
-### Patch Changes
-
-- @akinon/eslint-plugin-projectzero@1.25.0-rc.3
-
-## 1.25.0-rc.2
-
-### Minor Changes
-
-- 7e41bdc: BRDG-9158: Remove redirect-three-d page endpoint
-
-### Patch Changes
-
-- @akinon/eslint-plugin-projectzero@1.25.0-rc.2
-
-## 1.25.0-rc.1
-
-### Minor Changes
-
-- 6d4aadb: ZERO-2476: Auto install recommendenent extension
+- eae7644: ZERO-2479: optimize Link component with useMemo for href formatting
 - e20b27f: ZERO-2454:add otp login
 - e0a945e: ZERO-2494:Add LiveCommerce for managing basket and product actions
 - a4674c6: ZERO-2461: add optional chaining for referrer header and add locale value for redirect url
 - 1ec9775: ZERO-2462:add custom span to logs
 - ab5a493: ZERO-2475:add types [key: string]: any; for unknown attributes
-- 3690d3b: ZERO-2485: Check ESLint peerDependency version
 - 92094d4: ZERO-2477: Update Sentry version and add hideSourceMaps option
-- b4452e9: ZERO-2463: Refactor Sentry initialization and add Sentry DSN option to settings
-- b2da5e4: Revert ZERO-2435
 - d3edd3a: ZERO-2499:add style prop in link component
-- f76f079: ZERO-2493: Add redirect util function
-
-### Patch Changes
-
-- da1e501: ZERO-2296: Fix ROUTES import
-- 95510c7: ZERO-2508: Enable rc branch pipeline and add check-publish-version step
-- 2e44646: ZERO-2434: Fix category URL in getCategoryDataHandler function
-- 8c7f5bc: ZERO-2440: Pipeline test
-- Updated dependencies [95510c7]
-  - @akinon/eslint-plugin-projectzero@1.25.0-rc.1
 
-## 1.25.0-rc.0
-
-### Minor Changes
-
-- 6d4aadb: ZERO-2476: Auto install recommendenent extension
-- e20b27f: ZERO-2454:add otp login
-- a4674c6: ZERO-2461: add optional chaining for referrer header and add locale value for redirect url
-- 1ec9775: ZERO-2462:add custom span to logs
-- 3690d3b: ZERO-2485: Check ESLint peerDependency version
-- b4452e9: ZERO-2463: Refactor Sentry initialization and add Sentry DSN option to settings
-- b2da5e4: Revert ZERO-2435
+## 1.24.1
 
 ### Patch Changes
 
-- da1e501: ZERO-2296: Fix ROUTES import
-- 2e44646: ZERO-2434: Fix category URL in getCategoryDataHandler function
-- 8c7f5bc: ZERO-2440: Pipeline test
-  - @akinon/eslint-plugin-projectzero@1.25.0-rc.0
+- 95510c7: ZERO-2508: Enable rc branch pipeline and add check-publish-version step
 
 ## 1.24.0
 

package/api/auth.ts

@@ -80,21 +80,14 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
           const language = Settings.localization.locales.find(
             (item) => item.value === credentials.locale
           ).apiValue;
-          const userIp = req.headers['x-forwarded-for']?.toString() ?? '';
 
           headers.set('Content-Type', 'application/json');
           headers.set('cookie', `${req.headers.cookie}`);
           headers.set('Accept-Language', `${language}`);
           headers.set('x-currency', req.cookies['pz-currency'] ?? '');
-          headers.set('x-forwarded-for', userIp);
-          headers.set(
-            'x-app-device',
-            req.headers['x-app-device']?.toString() ?? ''
-          );
 
           logger.debug('Trying to login/register', {
-            formType: credentials.formType,
-            userIp
+            formType: credentials.formType
           });
 
           const apiRequest = await fetch(
@@ -106,9 +99,7 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
             }
           );
 
-          logger.info(`Login/Register request result: ${apiRequest.status}`, {
-            userIp
-          });
+          logger.info(`Login/Register request result: ${apiRequest.status}`);
 
           const response = (await apiRequest.json()) as {
             key: string;
@@ -229,17 +220,6 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
     pages: {
       signIn: ROUTES.AUTH,
       error: ROUTES.AUTH
-    },
-    cookies: {
-      sessionToken: {
-        name: `__Secure-next-auth.session-token`,
-        options: {
-          httpOnly: true,
-          sameSite: 'none',
-          path: '/',
-          secure: true
-        }
-      }
     }
   };
 };

package/api/client.ts

@@ -51,6 +51,7 @@ async function proxyRequest(...args) {
 
   [
     'x-forwarded-host',
+    'x-forwarded-for',
     'x-forwarded-proto',
     'x-forwarded-port',
     'x-requested-with',

package/bin/pz-check-dependencies.js

@@ -23,21 +23,6 @@ function checkDir() {
 
 const BASE_DIR = checkDir();
 
-function getProjectZeroNextPackagePath() {
-  const possiblePaths = [
-    path.join(BASE_DIR, 'apps/projectzeronext/package.json'),
-    path.join(BASE_DIR, 'package.json')
-  ];
-
-  for (const packagePath of possiblePaths) {
-    if (fs.existsSync(packagePath)) {
-      return packagePath;
-    }
-  }
-
-  throw new Error('Unable to find package.json in expected locations.');
-}
-
 try {
   const akinonNextPackagePath = fs.existsSync(
     path.join(BASE_DIR, 'packages/akinon-next/package.json')
@@ -49,7 +34,7 @@ try {
     fs.readFileSync(akinonNextPackagePath, 'utf8')
   );
 
-  const projectZeroNextPackagePath = getProjectZeroNextPackagePath();
+  const projectZeroNextPackagePath = path.join(BASE_DIR, 'package.json');
 
   const projectZeroNextPackage = JSON.parse(
     fs.readFileSync(projectZeroNextPackagePath, 'utf8')

package/bin/pz-predev.js

@@ -1,6 +1,4 @@
 #!/usr/bin/env node
 
 const runScript = require('./run-script');
-
-runScript('pz-install-extensions.js');
 runScript('pz-install-theme.js');

package/components/link.tsx

@@ -4,7 +4,7 @@ import { useLocalization } from '@akinon/next/hooks';
 import { LocaleUrlStrategy } from '@akinon/next/localization';
 import { urlLocaleMatcherRegex } from '@akinon/next/utils';
 import NextLink, { LinkProps as NextLinkProps } from 'next/link';
-import { useEffect, useState } from 'react';
+import { useMemo } from 'react';
 
 type LinkProps = Omit<
   React.AnchorHTMLAttributes<HTMLAnchorElement>,
@@ -14,23 +14,24 @@ type LinkProps = Omit<
 
 export const Link = ({ children, href, ...rest }: LinkProps) => {
   const { locale, defaultLocaleValue, localeUrlStrategy } = useLocalization();
-  const [formattedHref, setFormattedHref] = useState(href ?? '#');
-
-  useEffect(() => {
-    if (typeof href !== 'string') return;
-    if (href.startsWith('http')) return;
+  const formattedHref = useMemo(() => {
+    if (typeof href !== 'string' || href.startsWith('http')) {
+      return href;
+    }
 
     const pathnameWithoutLocale = href.replace(urlLocaleMatcherRegex, '');
     const hrefWithLocale = `/${locale}${pathnameWithoutLocale}`;
 
     if (localeUrlStrategy === LocaleUrlStrategy.ShowAllLocales) {
-      setFormattedHref(hrefWithLocale);
+      return hrefWithLocale;
     } else if (
       localeUrlStrategy === LocaleUrlStrategy.HideDefaultLocale &&
       locale !== defaultLocaleValue
     ) {
-      setFormattedHref(hrefWithLocale);
+      return hrefWithLocale;
     }
+
+    return href || '#';
   }, [href, defaultLocaleValue, locale, localeUrlStrategy]);
 
   return (

package/components/redirect-three-d/content/index.tsx

@@ -0,0 +1,74 @@
+'use client';
+
+import { useEffect, useState } from 'react';
+import { ROUTES } from 'routes';
+import { useGet3dRedirectFormQuery } from '@akinon/next/data/client/checkout';
+import { LoaderSpinner } from 'components';
+import { useLocalization } from '../../../hooks/use-localization';
+import { getUrlPathWithLocale } from '../../../utils/localization';
+import { useSearchParams } from 'next/navigation';
+
+interface RedirectThreeDContentProps {
+  sessionId: string;
+}
+
+export default function RedirectThreeDContent({
+  sessionId
+}: RedirectThreeDContentProps) {
+  const searchParams = useSearchParams();
+  const { data } = useGet3dRedirectFormQuery();
+  const [error, setError] = useState(null);
+  const { locale } = useLocalization();
+
+  useEffect(() => {
+    if (data) {
+      const fragment = document.createElement('fragment');
+      fragment.innerHTML = data.result;
+
+      const form = fragment.querySelector('form');
+
+      // a way to determine if response includes a redirection form or not
+      if (fragment.querySelector('link[rel="canonical"]') || !form) {
+        setError('Redirecting to checkout page. Please wait...');
+
+        setTimeout(() => {
+          let checkoutUrl = `${ROUTES.CHECKOUT}`;
+
+          // iframe param is used to prevent header and footer rendering
+          if (searchParams.get('iframe') === 'true') {
+            checkoutUrl = `${checkoutUrl}?iframe=true`;
+          }
+
+          // Use `window.location.href` instead of `router.push`
+          // to capture the url change event in iframe
+          location.href = getUrlPathWithLocale(checkoutUrl, locale);
+        }, 3000);
+        return;
+      }
+
+      const pzParamsInput = document.createElement('input');
+      pzParamsInput.setAttribute('type', 'hidden');
+      pzParamsInput.setAttribute('name', 'pzparams');
+      pzParamsInput.setAttribute(
+        'value',
+        encodeURIComponent(
+          JSON.stringify({
+            session: sessionId,
+            locale
+          })
+        )
+      );
+      form.appendChild(pzParamsInput);
+
+      form.style.display = 'none';
+      document.body.appendChild(form);
+      form.submit();
+    }
+  }, [data]);
+
+  return (
+    <div className="flex items-center justify-center py-20">
+      {error ?? <LoaderSpinner />}
+    </div>
+  );
+}

package/components/redirect-three-d/index.tsx

@@ -0,0 +1,17 @@
+import { cookies } from 'next/headers';
+import { redirect } from 'next/navigation';
+import RedirectThreeDContent from './content';
+import { ROUTES } from 'routes';
+
+const RedirectThreeD = async () => {
+  const nextCookies = cookies();
+  const sessionId = await nextCookies.get('osessionid')?.value;
+
+  if (!sessionId) {
+    return redirect(ROUTES.CHECKOUT);
+  }
+
+  return <RedirectThreeDContent sessionId={sessionId} />;
+};
+
+export default RedirectThreeD;

package/middlewares/complete-gpay.ts

@@ -43,8 +43,7 @@ const withCompleteGpay =
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',
       Cookie: `osessionid=${req.cookies.get('osessionid')?.value ?? ''}`,
-      'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-currency': req.cookies.get('pz-currency')?.value ?? ''
     };
 
     try {

package/middlewares/complete-masterpass.ts

@@ -43,8 +43,7 @@ const withCompleteMasterpass =
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',
       Cookie: `osessionid=${req.cookies.get('osessionid')?.value ?? ''}`,
-      'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-currency': req.cookies.get('pz-currency')?.value ?? ''
     };
 
     try {

package/middlewares/default.ts

@@ -97,12 +97,6 @@ const withPzDefault =
       );
     }
 
-    if (req.nextUrl.pathname.includes('/orders/redirect-three-d')) {
-      return NextResponse.rewrite(
-        new URL(`${encodeURI(Settings.commerceUrl)}/orders/redirect-three-d/`)
-      );
-    }
-
     // If commerce redirects to /orders/checkout/ without locale
     if (
       req.nextUrl.pathname.match(new RegExp('^/orders/checkout/$')) &&
@@ -139,8 +133,7 @@ const withPzDefault =
               Cookie: req.headers.get('cookie') || '',
               Accept: 'application/json',
               'Content-Type': 'application/json',
-              'X-Requested-With': 'XMLHttpRequest',
-              'x-forwarded-for': ip
+              'X-Requested-With': 'XMLHttpRequest'
             }
           }
         );

package/middlewares/oauth-login.ts

@@ -15,13 +15,11 @@ const withOauthLogin =
     const loginCallbackUrlMatcherRegex = new RegExp(
       /^\/(\w+)\/login\/callback\/?$/
     );
-    const ip = req.headers.get('x-forwarded-for') ?? '';
 
     const headers = {
       'x-forwarded-host':
         req.headers.get('x-forwarded-host') || req.headers.get('host') || '',
-      'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-currency': req.cookies.get('pz-currency')?.value ?? ''
     };
 
     if (loginUrlMatcherRegex.test(url.pathname)) {

package/middlewares/redirection-payment.ts

@@ -44,9 +44,7 @@ const withRedirectionPayment =
       '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
-
+      'x-currency': req.cookies.get('pz-currency')?.value ?? ''
     };
 
     try {

package/middlewares/three-d-redirection.ts

@@ -43,8 +43,7 @@ const withThreeDRedirection =
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',
       Cookie: `osessionid=${req.cookies.get('osessionid')?.value ?? ''}`,
-      'x-currency': req.cookies.get('pz-currency')?.value ?? '',
-      'x-forwarded-for': ip
+      'x-currency': req.cookies.get('pz-currency')?.value ?? ''
     };
 
     try {

package/middlewares/url-redirection.ts

@@ -31,9 +31,6 @@ const withUrlRedirection =
       const request = await fetch(
         `${settings.commerceUrl}${pathnameWithoutLocale}${url.search}`,
         {
-          headers: {
-            'x-forwarded-for': ip
-          },
           redirect: 'manual',
           next: {
             revalidate: 0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.25.0-rc.4",
+  "version": "1.25.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -34,8 +34,5 @@
     "eslint": "^8.14.0",
     "@akinon/eslint-plugin-projectzero": "1.24.0",
     "eslint-config-prettier": "8.5.0"
-  },
-  "peerDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.24.0"
   }
 }

package/sentry/index.ts

@@ -1,33 +1,27 @@
 import * as Sentry from '@sentry/nextjs';
-import settings from 'settings';
 
 const SENTRY_DSN: string =
-  settings.sentryDsn ||
-  process.env.SENTRY_DSN ||
-  process.env.NEXT_PUBLIC_SENTRY_DSN;
+  process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
 
 export const initSentry = (
   type: 'Server' | 'Client' | 'Edge',
-  options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {
-    dsn: SENTRY_DSN,
-    integrations: [],
-    tracesSampleRate: 1.0
-  }
+  options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {}
 ) => {
-  const initOptions = {
-    ...options,
+  // TODO: Handle options with ESLint rules
+
+  // TODO: Remove Zero Project DSN
+
+  Sentry.init({
+    dsn:
+      SENTRY_DSN ||
+      'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
     initialScope: {
       tags: {
-        ...((
-          options.initialScope as {
-            tags?: Record<string, string>;
-          }
-        )?.tags ?? {}),
         APP_TYPE: 'ProjectZeroNext',
         TYPE: type
       }
-    }
-  };
-
-  Sentry.init(initOptions);
+    },
+    tracesSampleRate: 1.0,
+    integrations: []
+  });
 };

package/types/index.ts

@@ -71,12 +71,6 @@ export interface Currency {
 
 export interface Settings {
   commerceUrl: string;
-  /**
-   * This option allows you to track Sentry events on the client side, in addition to server and edge environments.
-   *
-   * It overrides process.env.NEXT_PUBLIC_SENTRY_DSN and process.env.SENTRY_DSN.
-   */
-  sentryDsn?: string;
   redis: {
     defaultExpirationTime: number;
   };

package/utils/app-fetch.ts

@@ -36,8 +36,7 @@ const appFetch = async <T>(
     init.headers = {
       ...(init.headers ?? {}),
       'Accept-Language': currentLocale.apiValue,
-      'x-currency': ServerVariables.currency,
-      'x-forwarded-for': ip
+      'x-currency': ServerVariables.currency
     };
 
     init.next = {

package/bin/pz-install-extensions.js

@@ -1,27 +0,0 @@
-const { execSync } = require('child_process');
-const fs = require('fs');
-const path = require('path');
-
-function findBaseDir() {
-  let currentDir = __dirname;
-  while (currentDir !== path.resolve(currentDir, '..')) {
-    if (fs.existsSync(path.join(currentDir, 'turbo.json'))) {
-      return currentDir;
-    }
-    currentDir = path.resolve(currentDir, '..');
-  }
-  return null;
-}
-
-const BASE_DIR = findBaseDir();
-
-if (BASE_DIR) {
-  const extensions = ['bilal-akinon.pznext'];
-  extensions.forEach((extension) => {
-    try {
-      execSync(`code --install-extension ${extension}`, { stdio: 'inherit' });
-    } catch (error) {
-      console.error(`Error installing ${extension}:`);
-    }
-  });
-}

package/utils/redirect.ts

@@ -1,30 +0,0 @@
-import { redirect as nextRedirect, RedirectType } from 'next/navigation';
-import Settings from 'settings';
-import { headers } from 'next/headers';
-import { ServerVariables } from '@akinon/next/utils/server-variables';
-import { getUrlPathWithLocale } from '@akinon/next/utils/localization';
-
-export const redirect = (path: string, type?: RedirectType) => {
-  const nextHeaders = headers();
-  const pageUrl = new 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;
-  const redirectUrlWithLocale = getUrlPathWithLocale(
-    path,
-    currentLocale.localePath ?? currentLocale.value
-  );
-
-  const redirectUrl = `${redirectUrlWithLocale}?callbackUrl=${callbackUrl}`;
-
-  if (type) {
-    return nextRedirect(redirectUrl, type);
-  } else {
-    return nextRedirect(redirectUrl);
-  }
-};