@akinon/next 1.25.0-rc.2 → 1.25.0-rc.3

package/CHANGELOG.md

@@ -1,5 +1,15 @@
 # @akinon/next
 
+## 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

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/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

@@ -139,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-rc.2",
+  "version": "1.25.0-rc.3",
   "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 = {