@akinon/next 2.0.0-beta.13 → 2.0.0-beta.15

package/CHANGELOG.md

@@ -1,5 +1,21 @@
 # @akinon/next
 
+## 2.0.0-beta.15
+
+### Minor Changes
+
+- 49c82e1a: ZERO-4047: Remove Sentry configuration from default Next.js config
+- d7e5178b: ZERO-3985: Add query string handling for orders redirection in middleware
+- b59fdd1c: ZERO-4009: Add password reset token validation
+
+## 2.0.0-beta.14
+
+### Minor Changes
+
+- aef81c5d: ZERO-4034: Refactor checkout API to use dynamic store imports for improved performance
+- 0754c835: ZERO-4063: Add support for optional Redis password in cache handlers
+- c6c5c1cd: ZERO-4128: Use cookies API for pz-pos-error to ensure delivery on 303 redirects
+
 ## 2.0.0-beta.13
 
 ### Minor Changes

package/data/client/account.ts

@@ -77,6 +77,10 @@ interface LoyaltyTransactions {
   }[];
 }
 
+interface PasswordResetValidateResponse {
+  validlink: boolean;
+}
+
 const accountApi = api.injectEndpoints({
   endpoints: (builder) => ({
     updatePassword: builder.mutation<void, AccountChangePasswordFormType>({
@@ -221,6 +225,12 @@ const accountApi = api.injectEndpoints({
     }),
     getLoyaltyTransactions: builder.query<LoyaltyTransactions, void>({
       query: () => buildClientRequestUrl(account.loyaltyTransactions)
+    }),
+    getValidatePasswordResetToken: builder.query<
+      PasswordResetValidateResponse,
+      string
+    >({
+      query: (slug) => buildClientRequestUrl(account.passwordReset(slug))
     })
   }),
   overrideExisting: true
@@ -247,5 +257,6 @@ export const {
   usePasswordResetMutation,
   useAnonymizeMutation,
   useGetLoyaltyBalanceQuery,
-  useGetLoyaltyTransactionsQuery
+  useGetLoyaltyTransactionsQuery,
+  useGetValidatePasswordResetTokenQuery
 } = accountApi;

package/lib/cache-handler.mjs

@@ -364,11 +364,17 @@ CacheHandler.onCreation(async () => {
     };
   }
 
-  const redisHandler = createRedisHandler({
+  const redisOptions = {
     client,
     timeoutMs: CACHE_CONFIG.redis.timeoutMs,
     keyExpirationStrategy: 'EXPIREAT'
-  });
+  };
+
+  if (process.env.CACHE_PASSWORD) {
+    redisOptions.password = process.env.CACHE_PASSWORD;
+  }
+
+  const redisHandler = createRedisHandler(redisOptions);
 
   const localHandler = createLruHandler(CACHE_CONFIG.lru);
 

package/lib/cache.ts

@@ -155,9 +155,14 @@ export class Cache {
           process.env.CACHE_PORT
         }/${process.env.CACHE_BUCKET ?? '0'}`;
 
-        const client: RedisClientType = createClient({
-          url: redisUrl
-        });
+        const options = {
+          url: redisUrl,
+          ...(process.env.CACHE_PASSWORD && {
+            password: process.env.CACHE_PASSWORD
+          })
+        };
+
+        const client: RedisClientType = createClient(options);
 
         client.on('error', (error) => {
           logger.error('Redis client error', { redisUrl, error });

package/middlewares/complete-gpay.ts

@@ -110,10 +110,9 @@ const withCompleteGpay =
         });
 
         // Add error cookie
-        errorResponse.headers.append(
-          'Set-Cookie',
-          `pz-pos-error=${JSON.stringify(errors)}; path=/;`
-        );
+        errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
+          path: '/'
+        });
 
         return errorResponse;
       }

package/middlewares/complete-masterpass.ts

@@ -111,10 +111,9 @@ const withCompleteMasterpass =
         });
 
         // Add error cookie
-        errorResponse.headers.append(
-          'Set-Cookie',
-          `pz-pos-error=${JSON.stringify(errors)}; path=/;`
-        );
+        errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
+          path: '/'
+        });
 
         return errorResponse;
       }

package/middlewares/complete-wallet.ts

@@ -107,10 +107,9 @@ const withCompleteWallet =
         });
 
         // Add error cookie
-        errorResponse.headers.append(
-          'Set-Cookie',
-          `pz-pos-error=${JSON.stringify(errors)}; path=/;`
-        );
+        errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
+          path: '/'
+        });
 
         return errorResponse;
       }

package/middlewares/default.ts

@@ -132,8 +132,13 @@ const withPzDefault =
     }
 
     if (req.nextUrl.pathname.startsWith('/orders/redirection/')) {
+      const queryString = searchParams.toString();
       return NextResponse.rewrite(
-        new URL(`${encodeURI(Settings.commerceUrl)}/orders/redirection/`)
+        new URL(
+          `${encodeURI(Settings.commerceUrl)}/orders/redirection/${
+            queryString ? `?${queryString}` : ''
+          }`
+        )
       );
     }
 

package/middlewares/masterpass-rest-callback.ts

@@ -137,7 +137,7 @@ const withMasterpassRestCallback =
           ip
         });
 
-        return NextResponse.redirect(
+        const errorResponse = NextResponse.redirect(
           `${url.origin}${getUrlPathWithLocale(
             '/orders/checkout/',
             req.cookies.get('pz-locale')?.value
@@ -145,10 +145,17 @@ const withMasterpassRestCallback =
           {
             status: 303,
             headers: {
-              'Set-Cookie': `pz-pos-error=${JSON.stringify(errors)}; path=/;`
+              'Set-Cookie': `pz-pos-error=${encodeURIComponent(JSON.stringify(errors))}; path=/;`
             }
           }
         );
+
+        // Add error cookie
+        errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
+          path: '/'
+        });
+
+        return errorResponse;
       }
 
       logger.info('Masterpass REST callback response', {
@@ -184,16 +191,19 @@ const withMasterpassRestCallback =
 
       logger.info('Redirecting after masterpass REST callback', {
         middleware: 'masterpass-rest-callback',
-        redirectUrlWithLocale,
+        redirectUrl: redirectUrlWithLocale,
         ip
       });
 
       const nextResponse = NextResponse.redirect(redirectUrlWithLocale, 303);
 
-      nextResponse.headers.set(
-        'Set-Cookie',
-        request.headers.get('set-cookie') ?? ''
-      );
+      // Forward set-cookie headers from the upstream response
+      const setCookieHeader = request.headers.get('set-cookie');
+      if (setCookieHeader) {
+        setCookieHeader.split(',').forEach((cookie) => {
+          nextResponse.headers.append('Set-Cookie', cookie.trim());
+        });
+      }
 
       return nextResponse;
     } catch (error) {

package/middlewares/redirection-payment.ts

@@ -111,10 +111,9 @@ const withRedirectionPayment =
         });
 
         // Add error cookie
-        errorResponse.headers.append(
-          'Set-Cookie',
-          `pz-pos-error=${JSON.stringify(errors)}; path=/;`
-        );
+        errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
+          path: '/'
+        });
 
         return errorResponse;
       }

package/middlewares/saved-card-redirection.ts

@@ -111,10 +111,9 @@ const withSavedCardRedirection =
         });
 
         // Add error cookie
-        errorResponse.headers.append(
-          'Set-Cookie',
-          `pz-pos-error=${JSON.stringify(errors)}; path=/;`
-        );
+        errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
+          path: '/'
+        });
 
         return errorResponse;
       }

package/middlewares/three-d-redirection.ts

@@ -110,10 +110,9 @@ const withThreeDRedirection =
         });
 
         // Add error cookie
-        errorResponse.headers.append(
-          'Set-Cookie',
-          `pz-pos-error=${JSON.stringify(errors)}; path=/;`
-        );
+        errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
+          path: '/'
+        });
 
         return errorResponse;
       }

package/middlewares/wallet-complete-redirection.ts

@@ -131,10 +131,9 @@ const withWalletCompleteRedirection =
         });
 
         // Add error cookie
-        errorResponse.headers.append(
-          'Set-Cookie',
-          `pz-pos-error=${JSON.stringify(errors)}; path=/;`
-        );
+        errorResponse.cookies.set('pz-pos-error', JSON.stringify(errors), {
+          path: '/'
+        });
 
         return errorResponse;
       }

package/package.json

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

package/utils/index.ts

@@ -196,7 +196,13 @@ export const urlLocaleMatcherRegex = new RegExp(
 
 export const getPosError = () => {
   const cookieValue = getCookie('pz-pos-error');
-  const error = JSON.parse(cookieValue ? decodeURIComponent(cookieValue) : '{}');
+  let decoded: string;
+  try {
+    decoded = cookieValue ? decodeURIComponent(cookieValue) : '{}';
+  } catch {
+    decoded = cookieValue ?? '{}';
+  }
+  const error = JSON.parse(decoded);
 
   // delete 'pz-pos-error' cookie when refreshing or closing page
   window.addEventListener('beforeunload', () => {
@@ -206,6 +212,23 @@ export const getPosError = () => {
   return error;
 };
 
+export const checkPaymentWillRedirect = (response: {
+  context_list?: Array<{
+    page_name: string;
+    page_context?: { context_data?: { redirect_url?: string } };
+  }>;
+  redirect_url?: string;
+  errors?: unknown;
+}): boolean => {
+  if (!response) return false;
+
+  const hasThankYouPage = response.context_list?.some(
+    (c) => c.page_name === 'ThankYouPage'
+  );
+
+  return Boolean(hasThankYouPage || response.redirect_url);
+};
+
 export const urlSchemes = [
   'http',
   'tel:',

package/with-pz-config.js

@@ -71,7 +71,7 @@ const defaultConfig = {
       translations: false
     };
     return config;
-  },
+  }
 };
 
 const withPzConfig = (