@akinon/next 1.14.0 → 1.14.1

package/middlewares/redirection-payment.ts

@@ -1,160 +1,160 @@
-import { Buffer } from 'buffer';
-import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
-import Settings from 'settings';
-import logger from '../utils/log';
-import { PzNextRequest } from '.';
-import { getUrlPathWithLocale } from '../utils/localization';
-
-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: 'redirection-payment',
-        error
-      });
-    }
-
-    return result;
-  }
-  return null;
-};
-
-const withRedirectionPayment =
-  (middleware: NextMiddleware) =>
-  async (req: PzNextRequest, event: NextFetchEvent) => {
-    const url = req.nextUrl.clone();
-    const searchParams = new URLSearchParams(url.search);
-    const ip = req.headers.get('x-forwarded-for') ?? '';
-
-    if (searchParams.get('page') !== 'RedirectionPageCompletePage') {
-      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 ?? ''
-    };
-
-    try {
-      const body = await streamToString(req.body);
-
-      const request = await fetch(requestUrl, {
-        method: 'POST',
-        headers: requestHeaders,
-        body
-      });
-
-      logger.info('Complete redirection 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 redirection payment', {
-          middleware: 'redirection-payment',
-          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: 'redirection-payment',
-        contextList,
-        ip
-      });
-
-      if (!redirectUrl) {
-        logger.warn(
-          'No redirection url for order success page found in page_context',
-          {
-            middleware: 'redirection-payment',
-            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: 'redirection-payment',
-        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 redirection payment', {
-        middleware: 'redirection-payment',
-        error,
-        requestHeaders,
-        ip
-      });
-
-      return NextResponse.redirect(
-        `${url.origin}${getUrlPathWithLocale(
-          '/orders/checkout/',
-          req.cookies.get('pz-locale')?.value
-        )}`,
-        303
-      );
-    }
-  };
-
-export default withRedirectionPayment;
+import { Buffer } from 'buffer';
+import { NextFetchEvent, NextMiddleware, NextResponse } from 'next/server';
+import Settings from 'settings';
+import logger from '../utils/log';
+import { PzNextRequest } from '.';
+import { getUrlPathWithLocale } from '../utils/localization';
+
+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: 'redirection-payment',
+        error
+      });
+    }
+
+    return result;
+  }
+  return null;
+};
+
+const withRedirectionPayment =
+  (middleware: NextMiddleware) =>
+  async (req: PzNextRequest, event: NextFetchEvent) => {
+    const url = req.nextUrl.clone();
+    const searchParams = new URLSearchParams(url.search);
+    const ip = req.headers.get('x-forwarded-for') ?? '';
+
+    if (searchParams.get('page') !== 'RedirectionPageCompletePage') {
+      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 ?? ''
+    };
+
+    try {
+      const body = await streamToString(req.body);
+
+      const request = await fetch(requestUrl, {
+        method: 'POST',
+        headers: requestHeaders,
+        body
+      });
+
+      logger.info('Complete redirection 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 redirection payment', {
+          middleware: 'redirection-payment',
+          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: 'redirection-payment',
+        contextList,
+        ip
+      });
+
+      if (!redirectUrl) {
+        logger.warn(
+          'No redirection url for order success page found in page_context',
+          {
+            middleware: 'redirection-payment',
+            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: 'redirection-payment',
+        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 redirection payment', {
+        middleware: 'redirection-payment',
+        error,
+        requestHeaders,
+        ip
+      });
+
+      return NextResponse.redirect(
+        `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`,
+        303
+      );
+    }
+  };
+
+export default withRedirectionPayment;

package/middlewares/three-d-redirection.ts

@@ -1,159 +1,159 @@
-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: 'three-d-redirection',
-        error
-      });
-    }
-
-    return result;
-  }
-  return null;
-};
-
-const withThreeDRedirection =
-  (middleware: NextMiddleware) =>
-  async (req: PzNextRequest, event: NextFetchEvent) => {
-    const url = req.nextUrl.clone();
-    const ip = req.headers.get('x-forwarded-for') ?? '';
-
-    if (url.search.indexOf('CreditCardThreeDSecurePage') === -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: `osessionid=${req.cookies.get('osessionid')?.value ?? ''}`,
-      'x-currency': req.cookies.get('pz-currency')?.value ?? ''
-    };
-
-    try {
-      const body = await streamToString(req.body);
-
-      const request = await fetch(requestUrl, {
-        method: 'POST',
-        headers: requestHeaders,
-        body
-      });
-
-      logger.info('Complete 3D 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 3D payment', {
-          middleware: 'three-d-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: 'three-d-redirection',
-        contextList,
-        ip
-      });
-
-      if (!redirectUrl) {
-        logger.warn(
-          'No redirection url for order success page found in page_context. Redirecting to checkout page.',
-          {
-            middleware: 'three-d-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: 'three-d-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 3D payment', {
-        middleware: 'three-d-redirection',
-        error,
-        requestHeaders,
-        ip
-      });
-
-      return NextResponse.redirect(
-        `${url.origin}${getUrlPathWithLocale(
-          '/orders/checkout/',
-          req.cookies.get('pz-locale')?.value
-        )}`,
-        303
-      );
-    }
-  };
-
-export default withThreeDRedirection;
+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: 'three-d-redirection',
+        error
+      });
+    }
+
+    return result;
+  }
+  return null;
+};
+
+const withThreeDRedirection =
+  (middleware: NextMiddleware) =>
+  async (req: PzNextRequest, event: NextFetchEvent) => {
+    const url = req.nextUrl.clone();
+    const ip = req.headers.get('x-forwarded-for') ?? '';
+
+    if (url.search.indexOf('CreditCardThreeDSecurePage') === -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: `osessionid=${req.cookies.get('osessionid')?.value ?? ''}`,
+      'x-currency': req.cookies.get('pz-currency')?.value ?? ''
+    };
+
+    try {
+      const body = await streamToString(req.body);
+
+      const request = await fetch(requestUrl, {
+        method: 'POST',
+        headers: requestHeaders,
+        body
+      });
+
+      logger.info('Complete 3D 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 3D payment', {
+          middleware: 'three-d-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: 'three-d-redirection',
+        contextList,
+        ip
+      });
+
+      if (!redirectUrl) {
+        logger.warn(
+          'No redirection url for order success page found in page_context. Redirecting to checkout page.',
+          {
+            middleware: 'three-d-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: 'three-d-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 3D payment', {
+        middleware: 'three-d-redirection',
+        error,
+        requestHeaders,
+        ip
+      });
+
+      return NextResponse.redirect(
+        `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`,
+        303
+      );
+    }
+  };
+
+export default withThreeDRedirection;