@akinon/next 1.25.0 → 1.26.0-rc.1

package/CHANGELOG.md

@@ -1,5 +1,35 @@
 # @akinon/next
 
+## 1.26.0-rc.1
+
+### Minor Changes
+
+- a7e432f: ZERO-2534: Fix for recapthca regex for replacing the special chars.
+
+### Patch Changes
+
+- @akinon/eslint-plugin-projectzero@1.26.0-rc.1
+
+## 1.26.0-rc.0
+
+### Minor Changes
+
+- 6d4aadb: ZERO-2476: Auto install recommendenent extension
+- 7e41bdc: BRDG-9158: Remove redirect-three-d page endpoint
+- 1289982: ZERO-2521: Add x-forwarded-for header to requests
+- 3690d3b: ZERO-2485: Check ESLint peerDependency version
+- b4452e9: ZERO-2463: Refactor Sentry initialization and add Sentry DSN option to settings
+- b2da5e4: Revert ZERO-2435
+- f76f079: ZERO-2493: Add redirect util function
+
+### Patch Changes
+
+- da1e501: ZERO-2296: Fix ROUTES import
+- 2e44646: ZERO-2434: Fix category URL in getCategoryDataHandler function
+- 183674f: BRDG-9158: Handle locale prefix
+- 8c7f5bc: ZERO-2440: Pipeline test
+  - @akinon/eslint-plugin-projectzero@1.26.0-rc.0
+
 ## 1.25.0
 
 ### Minor Changes
@@ -17,7 +47,83 @@
 
 ### Patch Changes
 
+- da1e501: ZERO-2296: Fix ROUTES import
+- 2e44646: ZERO-2434: Fix category URL in getCategoryDataHandler function
+- 183674f: BRDG-9158: Handle locale prefix
+- 8c7f5bc: ZERO-2440: Pipeline test
+  - @akinon/eslint-plugin-projectzero@1.25.0-rc.5
+
+## 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
+
+### 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
+- 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
+
+### 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
 
 ## 1.24.0
 

package/api/auth.ts

@@ -80,14 +80,21 @@ 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
+            formType: credentials.formType,
+            userIp
           });
 
           const apiRequest = await fetch(
@@ -99,7 +106,9 @@ const nextAuthOptions = (req: NextApiRequest, res: NextApiResponse) => {
             }
           );
 
-          logger.info(`Login/Register request result: ${apiRequest.status}`);
+          logger.info(`Login/Register request result: ${apiRequest.status}`, {
+            userIp
+          });
 
           const response = (await apiRequest.json()) as {
             key: string;
@@ -220,6 +229,17 @@ 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,7 +51,6 @@ 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,6 +23,21 @@ 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')
@@ -34,7 +49,7 @@ try {
     fs.readFileSync(akinonNextPackagePath, 'utf8')
   );
 
-  const projectZeroNextPackagePath = path.join(BASE_DIR, 'package.json');
+  const projectZeroNextPackagePath = getProjectZeroNextPackagePath();
 
   const projectZeroNextPackage = JSON.parse(
     fs.readFileSync(projectZeroNextPackagePath, 'utf8')

package/bin/pz-install-extensions.js

@@ -0,0 +1,27 @@
+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/bin/pz-predev.js

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

package/data/client/user.ts

@@ -22,9 +22,9 @@ const userApi = api.injectEndpoints({
     getCaptcha: build.query<GetCaptchaResponse, void>({
       query: () => buildClientRequestUrl(user.captcha),
       transformResponse: (response: { html: string }) => {
-        const siteKeyMatch = response.html.match(/sitekey=["|']\w+/gi);
+        const siteKeyMatch = response.html.match(/sitekey=["|'][^"']+/gi);
         const csrfTokenMatch = response.html.match(
-          /name=['|"]csrfmiddlewaretoken['|"] value=['|"]\w+/gi
+          /name=['|"]csrfmiddlewaretoken['|"] value=['|"][^'"]+/gi
         );
         const siteKey = siteKeyMatch?.[0].replace(/sitekey=["|']/, '') || '';
         const csrfToken =

package/middlewares/complete-gpay.ts

@@ -43,7 +43,8 @@ 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-currency': req.cookies.get('pz-currency')?.value ?? '',
+      'x-forwarded-for': ip
     };
 
     try {

package/middlewares/complete-masterpass.ts

@@ -43,7 +43,8 @@ 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-currency': req.cookies.get('pz-currency')?.value ?? '',
+      'x-forwarded-for': ip
     };
 
     try {

package/middlewares/default.ts

@@ -97,6 +97,12 @@ 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/$')) &&
@@ -133,7 +139,8 @@ const withPzDefault =
               Cookie: req.headers.get('cookie') || '',
               Accept: 'application/json',
               'Content-Type': 'application/json',
-              'X-Requested-With': 'XMLHttpRequest'
+              'X-Requested-With': 'XMLHttpRequest',
+              'x-forwarded-for': ip
             }
           }
         );

package/middlewares/oauth-login.ts

@@ -15,11 +15,13 @@ 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-currency': req.cookies.get('pz-currency')?.value ?? '',
+      'x-forwarded-for': ip
     };
 
     if (loginUrlMatcherRegex.test(url.pathname)) {

package/middlewares/redirection-payment.ts

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

package/middlewares/three-d-redirection.ts

@@ -43,7 +43,8 @@ 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-currency': req.cookies.get('pz-currency')?.value ?? '',
+      'x-forwarded-for': ip
     };
 
     try {

package/middlewares/url-redirection.ts

@@ -31,6 +31,9 @@ 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",
+  "version": "1.26.0-rc.1",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -34,5 +34,8 @@
     "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,27 +1,33 @@
 import * as Sentry from '@sentry/nextjs';
+import settings from 'settings';
 
 const SENTRY_DSN: string =
-  process.env.SENTRY_DSN || process.env.NEXT_PUBLIC_SENTRY_DSN;
+  settings.sentryDsn ||
+  process.env.SENTRY_DSN ||
+  process.env.NEXT_PUBLIC_SENTRY_DSN;
 
 export const initSentry = (
   type: 'Server' | 'Client' | 'Edge',
-  options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {}
+  options: Sentry.BrowserOptions | Sentry.NodeOptions | Sentry.EdgeOptions = {
+    dsn: SENTRY_DSN,
+    integrations: [],
+    tracesSampleRate: 1.0
+  }
 ) => {
-  // TODO: Handle options with ESLint rules
-
-  // TODO: Remove Zero Project DSN
-
-  Sentry.init({
-    dsn:
-      SENTRY_DSN ||
-      'https://d8558ef8997543deacf376c7d8d7cf4b@o64293.ingest.sentry.io/4504338423742464',
+  const initOptions = {
+    ...options,
     initialScope: {
       tags: {
+        ...((
+          options.initialScope as {
+            tags?: Record<string, string>;
+          }
+        )?.tags ?? {}),
         APP_TYPE: 'ProjectZeroNext',
         TYPE: type
       }
-    },
-    tracesSampleRate: 1.0,
-    integrations: []
-  });
+    }
+  };
+
+  Sentry.init(initOptions);
 };

package/types/index.ts

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

package/utils/redirect.ts

@@ -0,0 +1,30 @@
+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);
+  }
+};

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

@@ -1,74 +0,0 @@
-'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

@@ -1,17 +0,0 @@
-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;