@akinon/next 1.91.0-rc.6 → 1.92.0-rc.10

package/CHANGELOG.md

@@ -1,5 +1,29 @@
 # @akinon/next
 
+## 1.92.0-rc.10
+
+### Minor Changes
+
+- 35dfb8f8: ZERO-3363: Refactor URL handling in checkout and redirection middlewares to use url.origin instead of process.env.NEXT_PUBLIC_URL
+
+## 1.92.0-rc.9
+
+### Minor Changes
+
+- 72ad7bb: ZERO-3422: Add Flow Payment to the list of available plugins
+
+## 1.92.0-rc.8
+
+### Minor Changes
+
+- c806fad: ZERO-3422: Add Flow Payment plugin to the defined plugins list
+
+## 1.92.0-rc.7
+
+### Minor Changes
+
+- 6e6b0a9: ZERO-3422: Add pz-flow-payment package
+
 ## 1.91.0-rc.6
 
 ### Minor Changes

package/components/plugin-module.tsx

@@ -21,7 +21,8 @@ enum Plugin {
   Akifast = 'pz-akifast',
   MultiBasket = 'pz-multi-basket',
   SavedCard = 'pz-saved-card',
-  Hepsipay = 'pz-hepsipay'
+  Hepsipay = 'pz-hepsipay',
+  FlowPayment = 'pz-flow-payment'
 }
 
 export enum Component {
@@ -47,7 +48,8 @@ export enum Component {
   AkifastCheckoutButton = 'CheckoutButton',
   MultiBasket = 'MultiBasket',
   SavedCard = 'SavedCardOption',
-  Hepsipay = 'Hepsipay'
+  Hepsipay = 'Hepsipay',
+  FlowPayment = 'FlowPayment'
 }
 
 const PluginComponents = new Map([
@@ -81,7 +83,8 @@ const PluginComponents = new Map([
   ],
   [Plugin.MultiBasket, [Component.MultiBasket]],
   [Plugin.SavedCard, [Component.SavedCard]],
-  [Plugin.Hepsipay, [Component.Hepsipay]]
+  [Plugin.Hepsipay, [Component.Hepsipay]],
+  [Plugin.FlowPayment, [Component.FlowPayment]]
 ]);
 
 const getPlugin = (component: Component) => {
@@ -148,6 +151,8 @@ export default function PluginModule({
               promise = import(`${'@akinon/pz-saved-card'}`);
             } else if (plugin === Plugin.Hepsipay) {
               promise = import(`${'@akinon/pz-hepsipay'}`);
+            } else if (plugin === Plugin.FlowPayment) {
+              promise = import(`${'@akinon/pz-flow-payment'}`);
             }
           } catch (error) {
             logger.error(error);

package/components/selected-payment-option-view.tsx

@@ -62,6 +62,17 @@ export default function SelectedPaymentOptionView({
               : fallbackView;
           }
 
+          if (
+            payment_option?.payment_type === 'wallet' &&
+            wallet_method === 'checkout_flow'
+          ) {
+            const mod = await import('@akinon/pz-flow-payment');
+
+            return typeof mod?.default === 'function'
+              ? mod.default
+              : fallbackView;
+          }
+
           const view = paymentTypeToView[payment_option?.payment_type] || null;
 
           if (view) {

package/middlewares/checkout-provider.ts

@@ -64,7 +64,7 @@ const withCheckoutProvider =
           const location = request.headers.get('location');
           const redirectUrl = new URL(
             request.headers.get('location'),
-            location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
+            location.startsWith('http') ? '' : url.origin
           );
 
           redirectUrl.pathname = getUrlPathWithLocale(

package/middlewares/default.ts

@@ -11,7 +11,8 @@ import {
   withRedirectionPayment,
   withSavedCardRedirection,
   withThreeDRedirection,
-  withUrlRedirection
+  withUrlRedirection,
+  withWalletCompleteRedirection
 } from '.';
 import { urlLocaleMatcherRegex } from '../utils';
 import withCurrency from './currency';
@@ -228,144 +229,168 @@ const withPzDefault =
                     withCompleteGpay(
                       withCompleteMasterpass(
                         withSavedCardRedirection(
-                          async (req: PzNextRequest, event: NextFetchEvent) => {
-                            let middlewareResult: NextResponse | void =
-                              NextResponse.next();
-
-                            try {
-                              const { locale, prettyUrl, currency } =
-                                req.middlewareParams.rewrites;
-                              const { defaultLocaleValue } =
-                                Settings.localization;
-                              const url = req.nextUrl.clone();
-                              const pathnameWithoutLocale =
-                                url.pathname.replace(urlLocaleMatcherRegex, '');
-
-                              middlewareResult = (await middleware(
-                                req,
-                                event
-                              )) as NextResponse | void;
-
-                              let customRewriteUrlDiff = '';
-
-                              if (
-                                middlewareResult instanceof NextResponse &&
-                                middlewareResult.headers.get(
-                                  'pz-override-response'
-                                ) &&
-                                middlewareResult.headers.get(
-                                  'x-middleware-rewrite'
-                                )
-                              ) {
-                                const rewriteUrl = new URL(
-                                  middlewareResult.headers.get(
-                                    'x-middleware-rewrite'
-                                  )
-                                );
-                                const originalUrl = new URL(req.url);
-                                customRewriteUrlDiff =
-                                  rewriteUrl.pathname.replace(
-                                    originalUrl.pathname,
+                          withWalletCompleteRedirection(
+                            async (
+                              req: PzNextRequest,
+                              event: NextFetchEvent
+                            ) => {
+                              let middlewareResult: NextResponse | void =
+                                NextResponse.next();
+
+                              try {
+                                const { locale, prettyUrl, currency } =
+                                  req.middlewareParams.rewrites;
+                                const { defaultLocaleValue } =
+                                  Settings.localization;
+                                const url = req.nextUrl.clone();
+                                const pathnameWithoutLocale =
+                                  url.pathname.replace(
+                                    urlLocaleMatcherRegex,
                                     ''
                                   );
-                              }
 
-                              url.basePath = `/${commerceUrl}`;
-                              url.pathname = `/${
-                                locale.length ? `${locale}/` : ''
-                              }${currency}/${customRewriteUrlDiff}${
-                                prettyUrl ?? pathnameWithoutLocale
-                              }`.replace(/\/+/g, '/');
-
-                              if (
-                                Settings.usePrettyUrlRoute &&
-                                url.searchParams.toString().length > 0 &&
-                                !Object.entries(ROUTES).find(([, value]) =>
-                                  new RegExp(`^${value}/?$`).test(
-                                    pathnameWithoutLocale
-                                  )
-                                )
-                              ) {
-                                url.pathname =
-                                  url.pathname +
-                                  (/\/$/.test(url.pathname) ? '' : '/') +
-                                  `searchparams|${encodeURIComponent(
-                                    url.searchParams.toString()
-                                  )}`;
-                              }
+                                middlewareResult = (await middleware(
+                                  req,
+                                  event
+                                )) as NextResponse | void;
 
-                              if (
-                                !req.middlewareParams.found &&
-                                Settings.customNotFoundEnabled
-                              ) {
-                                const pathname = url.pathname
-                                  .replace(/\/+$/, '')
-                                  .split('/');
-                                url.pathname = url.pathname.replace(
-                                  pathname.pop(),
-                                  'pz-not-found'
-                                );
-                              }
-
-                              Settings.rewrites.forEach((rewrite) => {
-                                url.pathname = url.pathname.replace(
-                                  rewrite.source,
-                                  rewrite.destination
-                                );
-                              });
+                                let customRewriteUrlDiff = '';
 
-                              // if middleware.ts has a return value for current url
-                              if (middlewareResult instanceof NextResponse) {
-                                // pz-override-response header is used to prevent 404 page for custom responses.
                                 if (
+                                  middlewareResult instanceof NextResponse &&
                                   middlewareResult.headers.get(
                                     'pz-override-response'
-                                  ) !== 'true'
-                                ) {
-                                  middlewareResult.headers.set(
-                                    'x-middleware-rewrite',
-                                    url.href
-                                  );
-                                } else if (
-                                  middlewareResult.headers.get(
-                                    'x-middleware-rewrite'
                                   ) &&
                                   middlewareResult.headers.get(
-                                    'pz-override-response'
-                                  ) === 'true'
+                                    'x-middleware-rewrite'
+                                  )
+                                ) {
+                                  const rewriteUrl = new URL(
+                                    middlewareResult.headers.get(
+                                      'x-middleware-rewrite'
+                                    )
+                                  );
+                                  const originalUrl = new URL(req.url);
+                                  customRewriteUrlDiff =
+                                    rewriteUrl.pathname.replace(
+                                      originalUrl.pathname,
+                                      ''
+                                    );
+                                }
+
+                                url.basePath = `/${commerceUrl}`;
+                                url.pathname = `/${
+                                  locale.length ? `${locale}/` : ''
+                                }${currency}/${customRewriteUrlDiff}${
+                                  prettyUrl ?? pathnameWithoutLocale
+                                }`.replace(/\/+/g, '/');
+
+                                if (
+                                  Settings.usePrettyUrlRoute &&
+                                  url.searchParams.toString().length > 0 &&
+                                  !Object.entries(ROUTES).find(([, value]) =>
+                                    new RegExp(`^${value}/?$`).test(
+                                      pathnameWithoutLocale
+                                    )
+                                  )
                                 ) {
+                                  url.pathname =
+                                    url.pathname +
+                                    (/\/$/.test(url.pathname) ? '' : '/') +
+                                    `searchparams|${encodeURIComponent(
+                                      url.searchParams.toString()
+                                    )}`;
+                                }
+
+                                if (
+                                  !req.middlewareParams.found &&
+                                  Settings.customNotFoundEnabled
+                                ) {
+                                  const pathname = url.pathname
+                                    .replace(/\/+$/, '')
+                                    .split('/');
+                                  url.pathname = url.pathname.replace(
+                                    pathname.pop(),
+                                    'pz-not-found'
+                                  );
+                                }
+
+                                Settings.rewrites.forEach((rewrite) => {
+                                  url.pathname = url.pathname.replace(
+                                    rewrite.source,
+                                    rewrite.destination
+                                  );
+                                });
+
+                                // if middleware.ts has a return value for current url
+                                if (middlewareResult instanceof NextResponse) {
+                                  // pz-override-response header is used to prevent 404 page for custom responses.
+                                  if (
+                                    middlewareResult.headers.get(
+                                      'pz-override-response'
+                                    ) !== 'true'
+                                  ) {
+                                    middlewareResult.headers.set(
+                                      'x-middleware-rewrite',
+                                      url.href
+                                    );
+                                  } else if (
+                                    middlewareResult.headers.get(
+                                      'x-middleware-rewrite'
+                                    ) &&
+                                    middlewareResult.headers.get(
+                                      'pz-override-response'
+                                    ) === 'true'
+                                  ) {
+                                    middlewareResult =
+                                      NextResponse.rewrite(url);
+                                  }
+                                } else {
+                                  // if middleware.ts doesn't have a return value.
+                                  // e.g. NextResponse.next() doesn't exist in middleware.ts
+
                                   middlewareResult = NextResponse.rewrite(url);
                                 }
-                              } else {
-                                // if middleware.ts doesn't have a return value.
-                                // e.g. NextResponse.next() doesn't exist in middleware.ts
 
-                                middlewareResult = NextResponse.rewrite(url);
-                              }
+                                const { localeUrlStrategy } =
+                                  Settings.localization;
+
+                                const fallbackHost =
+                                  req.headers.get('x-forwarded-host') ||
+                                  req.headers.get('host');
+                                const hostname =
+                                  process.env.NEXT_PUBLIC_URL ||
+                                  `https://${fallbackHost}`;
+                                const rootHostname =
+                                  localeUrlStrategy ===
+                                  LocaleUrlStrategy.Subdomain
+                                    ? getRootHostname(hostname)
+                                    : null;
+
+                                if (
+                                  !url.pathname.startsWith(
+                                    `/${currency}/orders`
+                                  )
+                                ) {
+                                  middlewareResult.cookies.set(
+                                    'pz-locale',
+                                    locale?.length > 0
+                                      ? locale
+                                      : defaultLocaleValue,
+                                    {
+                                      domain: rootHostname,
+                                      sameSite: 'none',
+                                      secure: true,
+                                      expires: new Date(
+                                        Date.now() + 1000 * 60 * 60 * 24 * 7
+                                      ) // 7 days
+                                    }
+                                  );
+                                }
 
-                              const { localeUrlStrategy } =
-                                Settings.localization;
-
-                              const fallbackHost =
-                                req.headers.get('x-forwarded-host') ||
-                                req.headers.get('host');
-                              const hostname =
-                                process.env.NEXT_PUBLIC_URL ||
-                                `https://${fallbackHost}`;
-                              const rootHostname =
-                                localeUrlStrategy ===
-                                LocaleUrlStrategy.Subdomain
-                                  ? getRootHostname(hostname)
-                                  : null;
-
-                              if (
-                                !url.pathname.startsWith(`/${currency}/orders`)
-                              ) {
                                 middlewareResult.cookies.set(
-                                  'pz-locale',
-                                  locale?.length > 0
-                                    ? locale
-                                    : defaultLocaleValue,
+                                  'pz-currency',
+                                  currency,
                                   {
                                     domain: rootHostname,
                                     sameSite: 'none',
@@ -375,82 +400,69 @@ const withPzDefault =
                                     ) // 7 days
                                   }
                                 );
-                              }
 
-                              middlewareResult.cookies.set(
-                                'pz-currency',
-                                currency,
-                                {
-                                  domain: rootHostname,
-                                  sameSite: 'none',
-                                  secure: true,
-                                  expires: new Date(
-                                    Date.now() + 1000 * 60 * 60 * 24 * 7
-                                  ) // 7 days
+                                if (
+                                  req.cookies.get('pz-locale') &&
+                                  req.cookies.get('pz-locale').value !== locale
+                                ) {
+                                  logger.debug('Locale changed', {
+                                    locale,
+                                    oldLocale:
+                                      req.cookies.get('pz-locale')?.value,
+                                    ip
+                                  });
                                 }
-                              );
-
-                              if (
-                                req.cookies.get('pz-locale') &&
-                                req.cookies.get('pz-locale').value !== locale
-                              ) {
-                                logger.debug('Locale changed', {
-                                  locale,
-                                  oldLocale:
-                                    req.cookies.get('pz-locale')?.value,
-                                  ip
-                                });
-                              }
-
-                              middlewareResult.headers.set(
-                                'pz-url',
-                                req.nextUrl.toString()
-                              );
-
-                              if (req.cookies.get('pz-set-currency')) {
-                                middlewareResult.cookies.delete(
-                                  'pz-set-currency'
-                                );
-                              }
 
-                              if (process.env.ACC_APP_VERSION) {
                                 middlewareResult.headers.set(
-                                  'acc-app-version',
-                                  process.env.ACC_APP_VERSION
+                                  'pz-url',
+                                  req.nextUrl.toString()
                                 );
-                              }
 
-                              // Set CSRF token if not set
-                              try {
-                                const url = `${Settings.commerceUrl}${user.csrfToken}`;
+                                if (req.cookies.get('pz-set-currency')) {
+                                  middlewareResult.cookies.delete(
+                                    'pz-set-currency'
+                                  );
+                                }
 
-                                if (!req.cookies.get('csrftoken')) {
-                                  const { csrf_token } = await (
-                                    await fetch(url)
-                                  ).json();
-                                  middlewareResult.cookies.set(
-                                    'csrftoken',
-                                    csrf_token,
-                                    {
-                                      domain: rootHostname
-                                    }
+                                if (process.env.ACC_APP_VERSION) {
+                                  middlewareResult.headers.set(
+                                    'acc-app-version',
+                                    process.env.ACC_APP_VERSION
                                   );
                                 }
+
+                                // Set CSRF token if not set
+                                try {
+                                  const url = `${Settings.commerceUrl}${user.csrfToken}`;
+
+                                  if (!req.cookies.get('csrftoken')) {
+                                    const { csrf_token } = await (
+                                      await fetch(url)
+                                    ).json();
+                                    middlewareResult.cookies.set(
+                                      'csrftoken',
+                                      csrf_token,
+                                      {
+                                        domain: rootHostname
+                                      }
+                                    );
+                                  }
+                                } catch (error) {
+                                  logger.error('CSRF Error', {
+                                    error,
+                                    ip
+                                  });
+                                }
                               } catch (error) {
-                                logger.error('CSRF Error', {
+                                logger.error('withPzDefault Error', {
                                   error,
                                   ip
                                 });
                               }
-                            } catch (error) {
-                              logger.error('withPzDefault Error', {
-                                error,
-                                ip
-                              });
-                            }
 
-                            return middlewareResult;
-                          }
+                              return middlewareResult;
+                            }
+                          )
                         )
                       )
                     )

package/middlewares/index.ts

@@ -9,6 +9,7 @@ import withCompleteGpay from './complete-gpay';
 import withCompleteMasterpass from './complete-masterpass';
 import withCheckoutProvider from './checkout-provider';
 import withSavedCardRedirection from './saved-card-redirection';
+import withWalletCompleteRedirection from './wallet-complete-redirection';
 import { NextRequest } from 'next/server';
 
 export {
@@ -22,7 +23,8 @@ export {
   withCompleteGpay,
   withCompleteMasterpass,
   withCheckoutProvider,
-  withSavedCardRedirection
+  withSavedCardRedirection,
+  withWalletCompleteRedirection
 };
 
 export interface PzNextRequest extends NextRequest {

package/middlewares/url-redirection.ts

@@ -51,7 +51,7 @@ const withUrlRedirection =
         const location = request.headers.get('location');
         const redirectUrl = new URL(
           request.headers.get('location'),
-          location.startsWith('http') ? '' : process.env.NEXT_PUBLIC_URL
+          location.startsWith('http') ? '' : url.origin
         );
 
         redirectUrl.pathname = getUrlPathWithLocale(

package/middlewares/wallet-complete-redirection.ts

@@ -0,0 +1,179 @@
+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: 'wallet-complete-redirection',
+        error
+      });
+    }
+
+    return result;
+  }
+  return null;
+};
+
+const withWalletCompleteRedirection =
+  (middleware: NextMiddleware) =>
+  async (req: PzNextRequest, event: NextFetchEvent) => {
+    const url = req.nextUrl.clone();
+    const ip = req.headers.get('x-forwarded-for') ?? '';
+    const sessionId = req.cookies.get('osessionid');
+
+    if (url.search.indexOf('WalletCompletePage') === -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: req.headers.get('cookie') ?? '',
+      'x-currency': req.cookies.get('pz-currency')?.value ?? '',
+      'x-forwarded-for': ip
+    };
+
+    try {
+      const body = await streamToString(req.body);
+
+      if (!sessionId) {
+        logger.warn(
+          'Make sure that the SESSION_COOKIE_SAMESITE environment variable is set to None in Commerce.',
+          {
+            middleware: 'wallet-complete-redirection',
+            ip
+          }
+        );
+
+        return NextResponse.redirect(
+          `${url.origin}${getUrlPathWithLocale(
+            '/orders/checkout/',
+            req.cookies.get('pz-locale')?.value
+          )}`,
+          303
+        );
+      }
+
+      const request = await fetch(requestUrl, {
+        method: 'POST',
+        headers: requestHeaders,
+        body
+      });
+
+      logger.info('Complete wallet 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 wallet payment', {
+          middleware: 'wallet-complete-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: 'wallet-complete-redirection',
+        contextList,
+        ip
+      });
+
+      if (!redirectUrl) {
+        logger.warn(
+          'No redirection url for order success page found in page_context. Redirecting to checkout page.',
+          {
+            middleware: 'wallet-complete-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: 'wallet-complete-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 wallet payment', {
+        middleware: 'wallet-complete-redirection',
+        error,
+        requestHeaders,
+        ip
+      });
+
+      return NextResponse.redirect(
+        `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`,
+        303
+      );
+    }
+  };
+
+export default withWalletCompleteRedirection;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.91.0-rc.6",
+  "version": "1.92.0-rc.10",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -34,7 +34,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.91.0-rc.6",
+    "@akinon/eslint-plugin-projectzero": "1.92.0-rc.10",
     "@babel/core": "7.26.10",
     "@babel/preset-env": "7.26.9",
     "@babel/preset-typescript": "7.27.0",

package/plugins.d.ts

@@ -36,3 +36,5 @@ declare module '@akinon/pz-iyzico-saved-card' {
 }
 
 declare module '@akinon/pz-apple-pay' {}
+
+declare module '@akinon/pz-flow-payment' {}

package/plugins.js

@@ -16,5 +16,6 @@ module.exports = [
   'pz-tabby-extension',
   'pz-apple-pay',
   'pz-tamara-extension',
-  'pz-hepsipay'
+  'pz-hepsipay',
+  'pz-flow-payment'
 ];

package/redux/reducers/checkout.ts

@@ -61,6 +61,8 @@ export interface CheckoutState {
       countryCode: string;
       currencyCode: string;
       version: string;
+      public_key: string;
+      [key: string]: any;
     };
     detail: {
       label: string;