@akinon/next 1.26.0 → 1.27.0

package/CHANGELOG.md

@@ -1,5 +1,14 @@
 # @akinon/next
 
+## 1.27.0
+
+### Minor Changes
+
+- 9b48372: ZERO-2564:fix eslint shortland warning
+- 7e41bdc: BRDG-9158: Remove redirect-three-d page endpoint
+- 1289982: ZERO-2521: Add x-forwarded-for header to requests
+- d6d2533: ZERO-2560: Add installment count to masterpass payment forms
+
 ## 1.26.0
 
 ### Minor Changes

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;

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/data/client/checkout.ts

@@ -103,7 +103,8 @@ const completeMasterpassPayment = async (
     merchantId: credentials?.merchant_id ?? null,
     msisdn,
     amount: preOrder?.unpaid_amount?.replace('.', '') ?? '',
-    additionalParams: additionalParams ?? extras?.additionalParams
+    additionalParams: additionalParams ?? extras?.additionalParams,
+    installmentCount: preOrder?.installment?.installment_count ?? 1
   };
 
   const form = isDirectPurchase

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.26.0",
+  "version": "1.27.0",
   "private": false,
   "license": "MIT",
   "bin": {

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/log.ts

@@ -85,9 +85,9 @@ function createCustomSpan({ level, message, payload }: Message) {
   const span = tracer.startSpan('custom-operation-log');
 
   span.setAttributes({
-    level: level,
-    message: message,
-    payload: payload
+    level,
+    message,
+    payload
   });
 
   span.end();

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;