@akinon/next 1.66.0 → 1.68.0

package/CHANGELOG.md

@@ -1,5 +1,26 @@
 # @akinon/next
 
+## 1.68.0
+
+### Minor Changes
+
+- 907813c: ZERO-2934: add payment-gateway/<gateway> redirect in middleware
+- c873740: ZERO-2903: add types
+- d899cc7: ZERO-2925: Login by checking the session id
+- 57d1657: ZERO-2925: Update condation
+- 3be7462: ZERO-2934: fix reset basket on redirection payment complete
+- 034b813: ZERO-2903: create saved card plugin
+- 48d508f: ZERO-2989: refine cookie header in payment middlewares
+
+## 1.67.0
+
+### Minor Changes
+
+- bc2b411: ZERO-2825: Add attribute-based shipping options to checkout page
+- 3d2212a: ZERO-2745: Add multi basket support
+- 8f47cca: ZERO-2829: fix and add nested JSON support for useFormData in api/client route
+- 9e25a64: ZERO-2835: Update category page layout with breadcrumb
+
 ## 1.66.0
 
 ### Minor Changes

package/api/client.ts

@@ -4,6 +4,7 @@ import settings from 'settings';
 import logger from '../utils/log';
 import formatCookieString from '../utils/format-cookie-string';
 import cookieParser from 'set-cookie-parser';
+import { cookies } from 'next/headers';
 
 interface RouteParams {
   params: {
@@ -80,11 +81,27 @@ async function proxyRequest(...args) {
     }
   } as RequestInit;
 
+  const nextCookies = cookies();
+  const segment = nextCookies.get('pz-segment')?.value;
+  const currency = nextCookies.get('pz-external-currency')?.value;
+
+  if (segment) {
+    fetchOptions.headers['X-Segment-Id'] = segment;
+  }
+
+  if (currency) {
+    fetchOptions.headers = Object.assign({}, fetchOptions.headers, {
+      'x-currency': currency
+    });
+  }
+
   if (options.contentType) {
     fetchOptions.headers['Content-Type'] = options.contentType;
   }
 
-  const isMultipartFormData = req.headers.get('content-type')?.includes('multipart/form-data;');
+  const isMultipartFormData = req.headers
+    .get('content-type')
+    ?.includes('multipart/form-data;');
 
   if (req.method !== 'GET') {
     let body: Record<string, any> | FormData = {};
@@ -108,7 +125,11 @@ async function proxyRequest(...args) {
 
       Object.keys(body ?? {}).forEach((key) => {
         if (body[key]) {
-          formData.append(key, body[key]);
+          if (typeof body[key] === 'object' && body[key] !== null) {
+            formData.append(key, JSON.stringify(body[key]));
+          } else {
+            formData.append(key, body[key]);
+          }
         }
       });
 

package/components/plugin-module.tsx

@@ -45,7 +45,7 @@ export enum Component {
   AkifastQuickLoginButton = 'QuickLoginButton',
   AkifastCheckoutButton = 'CheckoutButton',
   MultiBasket = 'MultiBasket',
-  SavedCard = 'Option'
+  SavedCard = 'SavedCardOption'
 }
 
 const PluginComponents = new Map([

package/data/client/api.ts

@@ -67,7 +67,7 @@ export const api = createApi({
   baseQuery: customBaseQuery,
   tagTypes: [
     'Basket',
-    'AllBaskets',
+    'MultiBasket',
     'BasketB2b',
     'DraftsB2b',
     'Product',

package/data/client/basket.ts

@@ -28,7 +28,7 @@ export const basketApi = api.injectEndpoints({
       query: ({ namespace }) =>
         buildClientRequestUrl(basket.getBasketDetail(namespace)),
       transformResponse: (response: { basket: Basket }) => response.basket,
-      providesTags: ['AllBaskets']
+      providesTags: ['MultiBasket']
     }),
     getAllBaskets: build.query<Basket[], void>({
       query: () =>
@@ -36,7 +36,7 @@ export const basketApi = api.injectEndpoints({
           contentType: 'application/json'
         }),
       transformResponse: (response: { baskets: Basket[] }) => response.baskets,
-      providesTags: ['AllBaskets']
+      providesTags: ['MultiBasket']
     }),
     removeBasket: build.mutation<Basket, { pk: number }>({
       query: ({ pk }) => ({
@@ -46,7 +46,7 @@ export const basketApi = api.injectEndpoints({
         method: 'DELETE',
         body: { pk }
       }),
-      invalidatesTags: ['AllBaskets', 'Basket']
+      invalidatesTags: ['MultiBasket', 'Basket']
     }),
     selectMainBasket: build.mutation<Basket, { pk: number }>({
       query: ({ pk }) => ({
@@ -57,7 +57,7 @@ export const basketApi = api.injectEndpoints({
         body: { pk }
       }),
       transformResponse: (response: { baskets: Basket }) => response.baskets,
-      invalidatesTags: ['AllBaskets', 'Basket']
+      invalidatesTags: ['MultiBasket', 'Basket']
     }),
     updateQuantity: build.mutation<
       UpdateQuantityResponse,
@@ -69,7 +69,8 @@ export const basketApi = api.injectEndpoints({
         }),
         method: 'PUT',
         body
-      })
+      }),
+      invalidatesTags: ['MultiBasket', 'Basket']
     }),
     clearBasket: build.mutation<Basket, void>({
       query: (body) => ({

package/data/client/checkout.ts

@@ -57,6 +57,7 @@ export interface CompleteCreditCardParams {
   card_month: string;
   card_year: string;
   use_three_d?: boolean;
+  save?: boolean;
 }
 
 interface GetContractResponse {
@@ -228,7 +229,8 @@ export const checkoutApi = api.injectEndpoints({
         card_number,
         card_month,
         card_year,
-        use_three_d = true
+        use_three_d = true,
+        save = undefined
       }) => {
         const paymentOption =
           store.getState().checkout?.preOrder?.payment_option;
@@ -242,20 +244,26 @@ export const checkoutApi = api.injectEndpoints({
           };
         }
 
+        const body: Record<string, string> = {
+          agreement: '1',
+          use_three_d: use_three_d ? '1' : '0',
+          card_cvv,
+          card_holder,
+          card_month,
+          card_number,
+          card_year
+        };
+
+        if (save !== undefined) {
+          body.save = save ? '1' : '0';
+        }
+
         return {
           url: buildClientRequestUrl(checkout.completeCreditCardPayment, {
             useFormData: true
           }),
           method: 'POST',
-          body: {
-            agreement: '1',
-            use_three_d: use_three_d ? '1' : '0',
-            card_cvv,
-            card_holder,
-            card_month,
-            card_number,
-            card_year
-          }
+          body
         };
       },
       async onQueryStarted(args, { dispatch, queryFulfilled }) {
@@ -697,6 +705,25 @@ export const checkoutApi = api.injectEndpoints({
         };
       }
     }),
+    setAttributeBasedShippingOptions: build.mutation<
+      CheckoutResponse,
+      Record<string, number>
+    >({
+      query: (options) => ({
+        url: buildClientRequestUrl(checkout.setAttributeBasedShippingOption, {
+          useFormData: true
+        }),
+        method: 'POST',
+        body: {
+          attribute_based_shipping_options: JSON.stringify(options)
+        }
+      }),
+      async onQueryStarted(arg, { dispatch, queryFulfilled }) {
+        dispatch(setShippingStepBusy(true));
+        await queryFulfilled;
+        dispatch(setShippingStepBusy(false));
+      }
+    }),
     setOrderSelectionPage: build.mutation<
       CheckoutResponse,
       { extra_field: ExtraField }
@@ -747,5 +774,6 @@ export const {
   usePayWithLoyaltyBalanceMutation,
   useSetOrderNoteMutation,
   useSetDeliveryBagsMutation,
+  useSetAttributeBasedShippingOptionsMutation,
   useSetOrderSelectionPageMutation
 } = checkoutApi;

package/data/urls.ts

@@ -17,16 +17,22 @@ export const account = {
     page,
     limit,
     createdDate,
-    endDate
+    endDate,
+    shipping_option_slug
   }: {
     page?: number;
     limit?: number;
     createdDate?: string;
     endDate?: string;
+    shipping_option_slug?: string;
   }) =>
-    `/users/orders/?page=${page || 1}&limit=${limit || 12} ${
+    `/users/orders/?page=${page || 1}&limit=${limit || 12}${
       createdDate ? `&created_date__gte=${createdDate}` : ''
-    } ${endDate ? `&created_date__lte=${endDate}` : ''}`,
+    }${endDate ? `&created_date__lte=${endDate}` : ''}${
+      shipping_option_slug
+        ? `&shipping_option_slug=${shipping_option_slug}`
+        : ''
+    }`,
   getQuotations: (page?: number, status?: string, limit?: number) =>
     `/b2b/my-quotations/?page=${page || 1}` +
     (status ? `&status=${status}` : '') +
@@ -111,6 +117,8 @@ export const checkout = {
   loyaltyMoneyUsage: '/orders/checkout/?page=LoyaltyMoneyUsagePage',
   setOrderNote: '/orders/checkout/?page=OrderNotePage',
   couponSelectionPage: '/orders/checkout/?page=CouponSelectionPage',
+  setAttributeBasedShippingOption:
+    '/orders/checkout/?page=AttributeBasedShippingOptionSelectionPage',
   deliveryBagsPage: '/orders/checkout/?page=DeliveryBagsPage',
   setOrderSelectionPage: '/orders/checkout/?page=OrderSelectionPage'
 };

package/middlewares/complete-gpay.ts

@@ -43,7 +43,7 @@ const withCompleteGpay =
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',
-      Cookie: `osessionid=${req.cookies.get('osessionid')?.value ?? ''}`,
+      Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
       'x-forwarded-for': ip
     };

package/middlewares/complete-masterpass.ts

@@ -43,7 +43,7 @@ const withCompleteMasterpass =
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',
-      Cookie: `osessionid=${req.cookies.get('osessionid')?.value ?? ''}`,
+      Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
       'x-forwarded-for': ip
     };

package/middlewares/currency.ts

@@ -75,6 +75,7 @@ const withCurrency =
         url.pathname.match(urlLocaleMatcherRegex) &&
         !url.search.includes('mobile_app=true') &&
         !url.search.includes('page=CreditCardThreeDSecurePage') &&
+        !url.search.includes('page=RedirectionPageCompletePage') &&
         settings.resetBasketOnCurrencyChange !== false
       ) {
         logger.info('Currency changed. Resetting basket...', {

package/middlewares/default.ts

@@ -9,6 +9,7 @@ import {
   withOauthLogin,
   withPrettyUrl,
   withRedirectionPayment,
+  withSavedCardRedirection,
   withThreeDRedirection,
   withUrlRedirection
 } from '.';
@@ -118,6 +119,14 @@ const withPzDefault =
       );
     }
 
+    if (req.nextUrl.pathname.includes('/orders/saved-card-redirect')) {
+      return NextResponse.rewrite(
+        new URL(
+          `${encodeURI(Settings.commerceUrl)}/orders/saved-card-redirect/`
+        )
+      );
+    }
+
     // If commerce redirects to /orders/checkout/ without locale
     if (
       req.nextUrl.pathname.match(new RegExp('^/orders/checkout/$')) &&
@@ -135,6 +144,25 @@ const withPzDefault =
       return NextResponse.redirect(redirectUrlWithLocale, 303);
     }
 
+    // Dynamically handle any payment gateway without specifying names
+    const paymentGatewayRegex = new RegExp('^/payment-gateway/([^/]+)/$');
+    const gatewayMatch = req.nextUrl.pathname.match(paymentGatewayRegex);
+
+    if (
+      gatewayMatch && // Check if the URL matches the /payment-gateway/<gateway> pattern
+      getUrlPathWithLocale(
+        `/payment-gateway/${gatewayMatch[1]}/`,
+        req.cookies.get('pz-locale')?.value
+      ) !== req.nextUrl.pathname
+    ) {
+      const redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
+        `/payment-gateway/${gatewayMatch[1]}/`,
+        req.cookies.get('pz-locale')?.value
+      )}?${req.nextUrl.searchParams.toString()}`;
+
+      return NextResponse.redirect(redirectUrlWithLocale);
+    }
+
     if (req.nextUrl.pathname.startsWith('/orders/checkout-provider/')) {
       try {
         const data = await req.json();
@@ -182,129 +210,140 @@ const withPzDefault =
                   withUrlRedirection(
                     withCompleteGpay(
                       withCompleteMasterpass(
-                        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,
-                                  ''
-                                );
-                            }
+                        withSavedCardRedirection(
+                          async (req: PzNextRequest, event: NextFetchEvent) => {
+                            let middlewareResult: NextResponse | void =
+                              NextResponse.next();
 
-                            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|${url.searchParams.toString()}`;
-                            }
+                            try {
+                              const { locale, prettyUrl, currency } =
+                                req.middlewareParams.rewrites;
+                              const { defaultLocaleValue } =
+                                Settings.localization;
+                              const url = req.nextUrl.clone();
+                              const pathnameWithoutLocale =
+                                url.pathname.replace(urlLocaleMatcherRegex, '');
 
-                            if (
-                              !req.middlewareParams.found &&
-                              Settings.customNotFoundEnabled
-                            ) {
-                              let pathname = url.pathname
-                                .replace(/\/+$/, '')
-                                .split('/');
-                              url.pathname = url.pathname.replace(
-                                pathname.pop(),
-                                'pz-not-found'
-                              );
-                            }
+                              middlewareResult = (await middleware(
+                                req,
+                                event
+                              )) as NextResponse | void;
 
-                            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'
+                                )
                               ) {
-                                middlewareResult = NextResponse.rewrite(url);
+                                const rewriteUrl = new URL(
+                                  middlewareResult.headers.get(
+                                    'x-middleware-rewrite'
+                                  )
+                                );
+                                const originalUrl = new URL(req.url);
+                                customRewriteUrlDiff =
+                                  rewriteUrl.pathname.replace(
+                                    originalUrl.pathname,
+                                    ''
+                                  );
                               }
-                            } else {
-                              // if middleware.ts doesn't have a return value.
-                              // e.g. NextResponse.next() doesn't exist in middleware.ts
 
-                              middlewareResult = NextResponse.rewrite(url);
-                            }
+                              url.basePath = `/${commerceUrl}`;
+                              url.pathname = `/${
+                                locale.length ? `${locale}/` : ''
+                              }${currency}/${customRewriteUrlDiff}${
+                                prettyUrl ?? pathnameWithoutLocale
+                              }`.replace(/\/+/g, '/');
 
-                            if (
-                              !url.pathname.startsWith(`/${currency}/orders`)
-                            ) {
+                              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|${url.searchParams.toString()}`;
+                              }
+
+                              if (
+                                !req.middlewareParams.found &&
+                                Settings.customNotFoundEnabled
+                              ) {
+                                let 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);
+                              }
+
+                              if (
+                                !url.pathname.startsWith(`/${currency}/orders`)
+                              ) {
+                                middlewareResult.cookies.set(
+                                  'pz-locale',
+                                  locale?.length > 0
+                                    ? locale
+                                    : defaultLocaleValue,
+                                  {
+                                    sameSite: 'none',
+                                    secure: true,
+                                    expires: new Date(
+                                      Date.now() + 1000 * 60 * 60 * 24 * 7
+                                    ) // 7 days
+                                  }
+                                );
+                              }
                               middlewareResult.cookies.set(
-                                'pz-locale',
-                                locale?.length > 0
-                                  ? locale
-                                  : defaultLocaleValue,
+                                'pz-currency',
+                                currency,
                                 {
                                   sameSite: 'none',
                                   secure: true,
@@ -313,76 +352,66 @@ const withPzDefault =
                                   ) // 7 days
                                 }
                               );
-                            }
-                            middlewareResult.cookies.set(
-                              'pz-currency',
-                              currency,
-                              {
-                                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
-                              });
-                            }
-
-                            middlewareResult.headers.set(
-                              'pz-url',
-                              req.nextUrl.toString()
-                            );
 
-                            if (req.cookies.get('pz-set-currency')) {
-                              middlewareResult.cookies.delete(
-                                'pz-set-currency'
-                              );
-                            }
+                              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 (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
+                              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
+                                  );
+                                }
+                              } 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

@@ -8,6 +8,7 @@ import withUrlRedirection from './url-redirection';
 import withCompleteGpay from './complete-gpay';
 import withCompleteMasterpass from './complete-masterpass';
 import withCheckoutProvider from './checkout-provider';
+import withSavedCardRedirection from './saved-card-redirection';
 import { NextRequest } from 'next/server';
 
 export {
@@ -20,7 +21,8 @@ export {
   withUrlRedirection,
   withCompleteGpay,
   withCompleteMasterpass,
-  withCheckoutProvider
+  withCheckoutProvider,
+  withSavedCardRedirection
 };
 
 export interface PzNextRequest extends NextRequest {

package/middlewares/oauth-login.ts

@@ -58,7 +58,12 @@ const withOauthLogin =
       return middleware(req, event);
     }
 
-    if (req.cookies.get('messages')?.value.includes('Successfully signed in')) {
+    const currentSessionId = req.cookies.get('osessionid');
+
+    if (
+      req.cookies.get('messages')?.value.includes('Successfully signed in') ||
+      (currentSessionId && req.cookies.get('messages'))
+    ) {
       let redirectUrlWithLocale = `${url.origin}${getUrlPathWithLocale(
         '/auth/oauth-login',
         req.cookies.get('pz-locale')?.value

package/middlewares/saved-card-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: 'saved-card-redirection',
+        error
+      });
+    }
+
+    return result;
+  }
+  return null;
+};
+
+const withSavedCardRedirection =
+  (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('SavedCardThreeDSecurePage') === -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: 'saved-card-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 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: 'saved-card-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: 'saved-card-redirection',
+        contextList,
+        ip
+      });
+
+      if (!redirectUrl) {
+        logger.warn(
+          'No redirection url for order success page found in page_context. Redirecting to checkout page.',
+          {
+            middleware: 'saved-card-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: 'saved-card-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: 'saved-card-redirection',
+        error,
+        requestHeaders,
+        ip
+      });
+
+      return NextResponse.redirect(
+        `${url.origin}${getUrlPathWithLocale(
+          '/orders/checkout/',
+          req.cookies.get('pz-locale')?.value
+        )}`,
+        303
+      );
+    }
+  };
+
+export default withSavedCardRedirection;

package/middlewares/three-d-redirection.ts

@@ -43,7 +43,7 @@ const withThreeDRedirection =
     const requestHeaders = {
       'X-Requested-With': 'XMLHttpRequest',
       'Content-Type': 'application/x-www-form-urlencoded',
-      Cookie: `osessionid=${req.cookies.get('osessionid')?.value ?? ''}`,
+      Cookie: req.headers.get('cookie') ?? '',
       'x-currency': req.cookies.get('pz-currency')?.value ?? '',
       'x-forwarded-for': ip
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@akinon/next",
   "description": "Core package for Project Zero Next",
-  "version": "1.66.0",
+  "version": "1.68.0",
   "private": false,
   "license": "MIT",
   "bin": {
@@ -30,7 +30,7 @@
     "set-cookie-parser": "2.6.0"
   },
   "devDependencies": {
-    "@akinon/eslint-plugin-projectzero": "1.66.0",
+    "@akinon/eslint-plugin-projectzero": "1.68.0",
     "@types/react-redux": "7.1.30",
     "@types/set-cookie-parser": "2.4.7",
     "@typescript-eslint/eslint-plugin": "6.7.4",

package/plugins.d.ts

@@ -24,7 +24,14 @@ declare module '@akinon/pz-otp/src/redux/reducer' {
   export const hidePopup: any;
 }
 
-declare module 'pz-saved-card' {
-  export const savedCardReducer: unknown;
-  export const savedCardMiddleware: unknown;
+declare module '@akinon/pz-saved-card' {
+  export const savedCardReducer: any;
+  export const SavedCardOption: any;
+  export const savedCardReducer: any;
+  export const savedCardMiddleware: any;
+}
+
+declare module '@akinon/pz-saved-card' {
+  export const iyzicoSavedCardReducer: any;
+  export const iyzicoSavedCardMiddleware: any;
 }

package/redux/middlewares/checkout.ts

@@ -3,9 +3,12 @@
 import { Middleware } from '@reduxjs/toolkit';
 import {
   setAddressList,
+  setAttributeBasedShippingOptions,
   setBankAccounts,
   setCanGuestPurchase,
   setCardType,
+  setCreditPaymentOptions,
+  setDataSourceShippingOptions,
   setDeliveryOptions,
   setErrors,
   setHasGiftBox,
@@ -16,14 +19,12 @@ import {
   setPreOrder,
   setRetailStores,
   setShippingOptions,
-  setDataSourceShippingOptions,
-  setShippingStepCompleted,
-  setCreditPaymentOptions
+  setShippingStepCompleted
 } from '../../redux/reducers/checkout';
 import { RootState, TypedDispatch } from 'redux/store';
 import { checkoutApi } from '../../data/client/checkout';
 import { CheckoutContext, PreOrder } from '../../types';
-import { getCookie, setCookie } from '../../utils';
+import { getCookie } from '../../utils';
 import settings from 'settings';
 import { LocaleUrlStrategy } from '../../localization';
 import { showMobile3dIframe } from '../../utils/mobile-3d-iframe';
@@ -77,7 +78,8 @@ export const preOrderMiddleware: Middleware = ({
       shippingOptions,
       dataSourceShippingOptions,
       paymentOptions,
-      installmentOptions
+      installmentOptions,
+      attributeBasedShippingOptions
     } = getState().checkout;
     const { endpoints: apiEndpoints } = checkoutApi;
 
@@ -145,11 +147,33 @@ export const preOrderMiddleware: Middleware = ({
       );
     }
 
+    if (
+      Object.keys(attributeBasedShippingOptions).length > 0 &&
+      !preOrder.attribute_based_shipping_options
+    ) {
+      const initialSelectedOptions: Record<string, number> = Object.fromEntries(
+        Object.entries(attributeBasedShippingOptions).map(([key, options]) => [
+          key,
+          options.attribute_based_shipping_options[0].pk
+        ])
+      );
+
+      dispatch(
+        apiEndpoints.setAttributeBasedShippingOptions.initiate(
+          initialSelectedOptions
+        )
+      );
+    }
+
     if (!preOrder.payment_option && paymentOptions.length > 0) {
       dispatch(apiEndpoints.setPaymentOption.initiate(paymentOptions[0].pk));
     }
 
-    if (!preOrder.installment && installmentOptions.length > 0) {
+    if (
+      !preOrder.installment &&
+      preOrder.payment_option?.payment_type !== 'saved_card' &&
+      installmentOptions.length > 0
+    ) {
       dispatch(
         apiEndpoints.setInstallmentOption.initiate(installmentOptions[0].pk)
       );
@@ -250,6 +274,14 @@ export const contextListMiddleware: Middleware = ({
           );
         }
 
+        if (context.page_context.attribute_based_shipping_options) {
+          dispatch(
+            setAttributeBasedShippingOptions(
+              context.page_context.attribute_based_shipping_options
+            )
+          );
+        }
+
         if (context.page_context.payment_options) {
           dispatch(setPaymentOptions(context.page_context.payment_options));
         }

package/redux/reducers/checkout.ts

@@ -15,7 +15,8 @@ import {
   PreOrder,
   RetailStore,
   ShippingOption,
-  DataSource
+  DataSource,
+  AttributeBasedShippingOption
 } from '../../types';
 
 export interface CheckoutState {
@@ -48,6 +49,8 @@ export interface CheckoutState {
   selectedBankAccountPk: number;
   loyaltyBalance?: string;
   retailStores: RetailStore[];
+  attributeBasedShippingOptions: AttributeBasedShippingOption[];
+  selectedShippingOptions: Record<string, number>;
 }
 
 const initialState: CheckoutState = {
@@ -78,7 +81,9 @@ const initialState: CheckoutState = {
   installmentOptions: [],
   bankAccounts: [],
   selectedBankAccountPk: null,
-  retailStores: []
+  retailStores: [],
+  attributeBasedShippingOptions: [],
+  selectedShippingOptions: {}
 };
 
 const checkoutSlice = createSlice({
@@ -156,6 +161,12 @@ const checkoutSlice = createSlice({
     },
     setRetailStores(state, { payload }) {
       state.retailStores = payload;
+    },
+    setAttributeBasedShippingOptions(state, { payload }) {
+      state.attributeBasedShippingOptions = payload;
+    },
+    setSelectedShippingOptions: (state, { payload }) => {
+      state.selectedShippingOptions = payload;
     }
   }
 });
@@ -184,7 +195,9 @@ export const {
   setBankAccounts,
   setSelectedBankAccountPk,
   setLoyaltyBalance,
-  setRetailStores
+  setRetailStores,
+  setAttributeBasedShippingOptions,
+  setSelectedShippingOptions
 } = checkoutSlice.actions;
 
 export default checkoutSlice.reducer;

package/redux/reducers/index.ts

@@ -8,6 +8,7 @@ import { api } from '../../data/client/api';
 import { masterpassReducer } from '@akinon/pz-masterpass';
 import { otpReducer } from '@akinon/pz-otp';
 import { savedCardReducer } from '@akinon/pz-saved-card';
+import { iyzicoSavedCardReducer } from '@akinon/pz-iyzico-saved-card';
 
 const reducers = {
   [api.reducerPath]: api.reducer,
@@ -17,7 +18,8 @@ const reducers = {
   header: headerReducer,
   masterpass: masterpassReducer,
   otp: otpReducer,
-  saved_card: savedCardReducer
+  savedCard: savedCardReducer,
+  iyzicoSavedCard: iyzicoSavedCardReducer
 };
 
 export default reducers;

package/types/commerce/checkout.ts

@@ -86,6 +86,7 @@ export interface PreOrder {
   total_amount?: string;
   total_amount_with_interest?: string;
   unpaid_amount?: string;
+  notes?: string;
   user_phone_number?: string;
   loyalty_money?: string;
   currency_type_label?: string;
@@ -97,6 +98,7 @@ export interface PreOrder {
   gift_box?: GiftBox;
   credit_payment_option?: CheckoutCreditPaymentOption;
   data_source_shipping_options: any;
+  attribute_based_shipping_options: any;
   bags?: Product[];
   bags_fee?: string;
   extra_field?: ExtraField;
@@ -141,6 +143,7 @@ export interface CheckoutContext {
     redirect_url?: string;
     context_data?: any;
     balance?: string;
+    attribute_based_shipping_options?: AttributeBasedShippingOption[];
     [key: string]: any;
   };
 }
@@ -166,3 +169,13 @@ export interface BankAccount {
   pk: number;
   sort_order: number;
 }
+
+export interface AttributeBasedShippingOption {
+  pk: number;
+  shipping_amount: string | null;
+  shipping_option_name: string | null;
+  shipping_option_logo: string | null;
+  attribute_value: string | null;
+  attribute_key: string;
+  [key: string]: any;
+}