@open-mercato/checkout 0.6.7-develop.6606.1.3b1ec9b1ea → 0.6.7-develop.6621.1.cdbe9dee3d

package/dist/modules/checkout/lib/rateLimiter.js

@@ -1,4 +1,9 @@
 import { readEndpointRateLimitConfig } from "@open-mercato/shared/lib/ratelimit/config";
+import { getClientIp, RATE_LIMIT_FALLBACK_KEY } from "@open-mercato/shared/lib/ratelimit/helpers";
+function buildCheckoutRateLimitKey(req, rateLimiter, namespace) {
+  const clientKey = getClientIp(req, rateLimiter.trustProxyDepth) ?? RATE_LIMIT_FALLBACK_KEY;
+  return `${namespace}:${clientKey}`;
+}
 const checkoutPublicViewRateLimitConfig = readEndpointRateLimitConfig("CHECKOUT_PUBLIC_VIEW", {
   points: 60,
   duration: 60,
@@ -24,6 +29,7 @@ const checkoutPasswordRateLimitConfig = readEndpointRateLimitConfig("CHECKOUT_PA
   keyPrefix: "checkout-password"
 });
 export {
+  buildCheckoutRateLimitKey,
   checkoutPasswordRateLimitConfig,
   checkoutPublicViewRateLimitConfig,
   checkoutStatusRateLimitConfig,

package/dist/modules/checkout/lib/rateLimiter.js.map

@@ -1,7 +1,7 @@
 {
   "version": 3,
   "sources": ["../../../../src/modules/checkout/lib/rateLimiter.ts"],
-  "sourcesContent": ["import { readEndpointRateLimitConfig } from '@open-mercato/shared/lib/ratelimit/config'\n\nexport const checkoutPublicViewRateLimitConfig = readEndpointRateLimitConfig('CHECKOUT_PUBLIC_VIEW', {\n  points: 60,\n  duration: 60,\n  blockDuration: 60,\n  keyPrefix: 'checkout-public-view',\n})\n\nexport const checkoutStatusRateLimitConfig = readEndpointRateLimitConfig('CHECKOUT_STATUS', {\n  points: 120,\n  duration: 60,\n  blockDuration: 60,\n  keyPrefix: 'checkout-status',\n})\n\nexport const checkoutSubmitRateLimitConfig = readEndpointRateLimitConfig('CHECKOUT_SUBMIT', {\n  points: 10,\n  duration: 60,\n  blockDuration: 60,\n  keyPrefix: 'checkout-submit',\n})\n\nexport const checkoutPasswordRateLimitConfig = readEndpointRateLimitConfig('CHECKOUT_PASSWORD', {\n  points: 5,\n  duration: 60,\n  blockDuration: 120,\n  keyPrefix: 'checkout-password',\n})\n"],
-  "mappings": "AAAA,SAAS,mCAAmC;AAErC,MAAM,oCAAoC,4BAA4B,wBAAwB;AAAA,EACnG,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,eAAe;AAAA,EACf,WAAW;AACb,CAAC;AAEM,MAAM,gCAAgC,4BAA4B,mBAAmB;AAAA,EAC1F,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,eAAe;AAAA,EACf,WAAW;AACb,CAAC;AAEM,MAAM,gCAAgC,4BAA4B,mBAAmB;AAAA,EAC1F,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,eAAe;AAAA,EACf,WAAW;AACb,CAAC;AAEM,MAAM,kCAAkC,4BAA4B,qBAAqB;AAAA,EAC9F,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,eAAe;AAAA,EACf,WAAW;AACb,CAAC;",
+  "sourcesContent": ["import { readEndpointRateLimitConfig } from '@open-mercato/shared/lib/ratelimit/config'\nimport { getClientIp, RATE_LIMIT_FALLBACK_KEY } from '@open-mercato/shared/lib/ratelimit/helpers'\nimport type { RateLimiterService } from '@open-mercato/shared/lib/ratelimit/service'\n\nexport function buildCheckoutRateLimitKey(\n  req: Request,\n  rateLimiter: RateLimiterService,\n  namespace: string,\n): string {\n  const clientKey = getClientIp(req, rateLimiter.trustProxyDepth) ?? RATE_LIMIT_FALLBACK_KEY\n  return `${namespace}:${clientKey}`\n}\n\nexport const checkoutPublicViewRateLimitConfig = readEndpointRateLimitConfig('CHECKOUT_PUBLIC_VIEW', {\n  points: 60,\n  duration: 60,\n  blockDuration: 60,\n  keyPrefix: 'checkout-public-view',\n})\n\nexport const checkoutStatusRateLimitConfig = readEndpointRateLimitConfig('CHECKOUT_STATUS', {\n  points: 120,\n  duration: 60,\n  blockDuration: 60,\n  keyPrefix: 'checkout-status',\n})\n\nexport const checkoutSubmitRateLimitConfig = readEndpointRateLimitConfig('CHECKOUT_SUBMIT', {\n  points: 10,\n  duration: 60,\n  blockDuration: 60,\n  keyPrefix: 'checkout-submit',\n})\n\nexport const checkoutPasswordRateLimitConfig = readEndpointRateLimitConfig('CHECKOUT_PASSWORD', {\n  points: 5,\n  duration: 60,\n  blockDuration: 120,\n  keyPrefix: 'checkout-password',\n})\n"],
+  "mappings": "AAAA,SAAS,mCAAmC;AAC5C,SAAS,aAAa,+BAA+B;AAG9C,SAAS,0BACd,KACA,aACA,WACQ;AACR,QAAM,YAAY,YAAY,KAAK,YAAY,eAAe,KAAK;AACnE,SAAO,GAAG,SAAS,IAAI,SAAS;AAClC;AAEO,MAAM,oCAAoC,4BAA4B,wBAAwB;AAAA,EACnG,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,eAAe;AAAA,EACf,WAAW;AACb,CAAC;AAEM,MAAM,gCAAgC,4BAA4B,mBAAmB;AAAA,EAC1F,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,eAAe;AAAA,EACf,WAAW;AACb,CAAC;AAEM,MAAM,gCAAgC,4BAA4B,mBAAmB;AAAA,EAC1F,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,eAAe;AAAA,EACf,WAAW;AACb,CAAC;AAEM,MAAM,kCAAkC,4BAA4B,qBAAqB;AAAA,EAC9F,QAAQ;AAAA,EACR,UAAU;AAAA,EACV,eAAe;AAAA,EACf,WAAW;AACb,CAAC;",
   "names": []
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@open-mercato/checkout",
-  "version": "0.6.7-develop.6606.1.3b1ec9b1ea",
+  "version": "0.6.7-develop.6621.1.cdbe9dee3d",
   "license": "MIT",
   "type": "module",
   "main": "./dist/index.js",
@@ -62,18 +62,18 @@
     }
   },
   "dependencies": {
-    "@open-mercato/core": "0.6.7-develop.6606.1.3b1ec9b1ea",
-    "@open-mercato/ui": "0.6.7-develop.6606.1.3b1ec9b1ea",
+    "@open-mercato/core": "0.6.7-develop.6621.1.cdbe9dee3d",
+    "@open-mercato/ui": "0.6.7-develop.6621.1.cdbe9dee3d",
     "bcryptjs": "^3.0.3"
   },
   "peerDependencies": {
     "@mikro-orm/postgresql": "^7.0.14",
-    "@open-mercato/shared": "0.6.7-develop.6606.1.3b1ec9b1ea",
+    "@open-mercato/shared": "0.6.7-develop.6621.1.cdbe9dee3d",
     "react": "^19.0.0",
     "react-dom": "^19.0.0"
   },
   "devDependencies": {
-    "@open-mercato/shared": "0.6.7-develop.6606.1.3b1ec9b1ea",
+    "@open-mercato/shared": "0.6.7-develop.6621.1.cdbe9dee3d",
     "@types/jest": "^30.0.0",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",

package/src/modules/checkout/api/pay/[slug]/route.ts

@@ -3,11 +3,11 @@ import { loadCustomFieldValues } from '@open-mercato/shared/lib/crud/custom-fiel
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import type { RateLimiterService } from '@open-mercato/shared/lib/ratelimit/service'
-import { checkRateLimit, getClientIp } from '@open-mercato/shared/lib/ratelimit/helpers'
+import { checkRateLimit } from '@open-mercato/shared/lib/ratelimit/helpers'
 import { CheckoutLink } from '../../../data/entities'
 import { CHECKOUT_ENTITY_IDS } from '../../../lib/constants'
 import { resolveCheckoutPublicCustomFields } from '../../../lib/customFields'
-import { checkoutPublicViewRateLimitConfig } from '../../../lib/rateLimiter'
+import { buildCheckoutRateLimitKey, checkoutPublicViewRateLimitConfig } from '../../../lib/rateLimiter'
 import { handleCheckoutRouteError, readCheckoutAccessCookie, requirePreviewContext } from '../../helpers'
 import {
   isCheckoutLinkPublic,
@@ -32,8 +32,8 @@ export async function GET(req: Request, { params }: { params: Promise<{ slug: st
     if (!previewRequested) {
       try {
         const rateLimiter = container.resolve('rateLimiterService') as RateLimiterService
-        const ip = getClientIp(req, 1) ?? 'unknown'
-        const rateLimitResponse = await checkRateLimit(rateLimiter, checkoutPublicViewRateLimitConfig, `checkout-public-view:${ip}`, 'Too many checkout page requests. Please try again later.')
+        const key = buildCheckoutRateLimitKey(req, rateLimiter, 'checkout-public-view')
+        const rateLimitResponse = await checkRateLimit(rateLimiter, checkoutPublicViewRateLimitConfig, key, 'Too many checkout page requests. Please try again later.')
         if (rateLimitResponse) return rateLimitResponse
       } catch {
         // Rate limiting is fail-open

package/src/modules/checkout/api/pay/[slug]/status/[transactionId]/route.ts

@@ -2,10 +2,10 @@ import { NextResponse } from 'next/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import type { RateLimiterService } from '@open-mercato/shared/lib/ratelimit/service'
-import { checkRateLimit, getClientIp } from '@open-mercato/shared/lib/ratelimit/helpers'
+import { checkRateLimit } from '@open-mercato/shared/lib/ratelimit/helpers'
 import type { PaymentGatewayService } from '@open-mercato/core/modules/payment_gateways/lib/gateway-service'
 import { CheckoutLink, CheckoutTransaction } from '../../../../../data/entities'
-import { checkoutStatusRateLimitConfig } from '../../../../../lib/rateLimiter'
+import { buildCheckoutRateLimitKey, checkoutStatusRateLimitConfig } from '../../../../../lib/rateLimiter'
 import { handleCheckoutRouteError, requireCheckoutPasswordSession } from '../../../../helpers'
 import { checkoutTag } from '../../../../openapi'
 
@@ -20,8 +20,8 @@ export async function GET(req: Request, { params }: { params: Promise<{ slug: st
     const container = await createRequestContainer()
     try {
       const rateLimiter = container.resolve('rateLimiterService') as RateLimiterService
-      const ip = getClientIp(req, 1) ?? 'unknown'
-      const rateLimitResponse = await checkRateLimit(rateLimiter, checkoutStatusRateLimitConfig, `checkout-status:${ip}`, 'Too many checkout status requests. Please try again later.')
+      const key = buildCheckoutRateLimitKey(req, rateLimiter, 'checkout-status')
+      const rateLimitResponse = await checkRateLimit(rateLimiter, checkoutStatusRateLimitConfig, key, 'Too many checkout status requests. Please try again later.')
       if (rateLimitResponse) return rateLimitResponse
     } catch {
       // Rate limiting is fail-open

package/src/modules/checkout/api/pay/[slug]/submit/__tests__/route.test.ts

@@ -24,6 +24,7 @@ jest.mock('@open-mercato/shared/lib/encryption/find', () => ({
 jest.mock('@open-mercato/shared/lib/ratelimit/helpers', () => ({
   checkRateLimit: jest.fn(),
   getClientIp: jest.fn(),
+  RATE_LIMIT_FALLBACK_KEY: 'global',
 }))
 
 jest.mock('../../../../../events', () => ({
@@ -87,7 +88,7 @@ describe('POST /api/checkout/pay/[slug]/submit', () => {
     ;(getClientIp as jest.Mock).mockReturnValue('127.0.0.1')
     ;(createRequestContainer as jest.Mock).mockResolvedValue({
       resolve: (name: string) => {
-        if (name === 'rateLimiterService') return {}
+        if (name === 'rateLimiterService') return { trustProxyDepth: 0 }
         if (name === 'em') return { findOne: mockEmFindOne }
         if (name === 'commandBus') return { execute: mockCommandExecute }
         if (name === 'paymentGatewayService') {

package/src/modules/checkout/api/pay/[slug]/submit/route.ts

@@ -6,7 +6,7 @@ import type { CommandRuntimeContext } from '@open-mercato/shared/lib/commands'
 import { CrudHttpError } from '@open-mercato/shared/lib/crud/errors'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import type { RateLimiterService } from '@open-mercato/shared/lib/ratelimit/service'
-import { checkRateLimit, getClientIp } from '@open-mercato/shared/lib/ratelimit/helpers'
+import { checkRateLimit } from '@open-mercato/shared/lib/ratelimit/helpers'
 import type { PaymentGatewayClientSession } from '@open-mercato/shared/modules/payment_gateways/types'
 import type { PaymentGatewayService } from '@open-mercato/core/modules/payment_gateways/lib/gateway-service'
 import { GatewayTransaction } from '@open-mercato/core/modules/payment_gateways/data/entities'
@@ -22,7 +22,7 @@ import {
   validateDescriptorCurrencies,
 } from '../../../../lib/utils'
 import { validateCheckoutCustomerData } from '../../../../lib/customerDataValidation'
-import { checkoutSubmitRateLimitConfig } from '../../../../lib/rateLimiter'
+import { buildCheckoutRateLimitKey, checkoutSubmitRateLimitConfig } from '../../../../lib/rateLimiter'
 import { checkoutTag } from '../../../openapi'
 import { createLogger } from '@open-mercato/shared/lib/logger'
 
@@ -276,8 +276,8 @@ export async function POST(req: Request, { params }: { params: Promise<{ slug: s
     const container = await createRequestContainer()
     try {
       const rateLimiter = container.resolve('rateLimiterService') as RateLimiterService
-      const ip = getClientIp(req, 1) ?? 'unknown'
-      const rateLimitResponse = await checkRateLimit(rateLimiter, checkoutSubmitRateLimitConfig, `checkout-submit:${ip}`, 'Too many payment attempts. Please try again later.')
+      const key = buildCheckoutRateLimitKey(req, rateLimiter, 'checkout-submit')
+      const rateLimitResponse = await checkRateLimit(rateLimiter, checkoutSubmitRateLimitConfig, key, 'Too many payment attempts. Please try again later.')
       if (rateLimitResponse) return rateLimitResponse
     } catch {
       // Rate limiting is fail-open
@@ -525,7 +525,7 @@ export async function POST(req: Request, { params }: { params: Promise<{ slug: s
           providerKey: link.gatewayProviderKey,
           err: error,
         })
-        throw new CrudHttpError(502, { error: 'Unable to start the payment session' })
+        throw new CrudHttpError(502, { error: 'checkout.payPage.errors.sessionStart' })
       }
       const refreshedTransaction = await findOneWithDecryption(em, CheckoutTransaction, {
         id: transaction.id,

package/src/modules/checkout/api/pay/[slug]/verify-password/route.ts

@@ -2,7 +2,7 @@ import { NextResponse } from 'next/server'
 import { createRequestContainer } from '@open-mercato/shared/lib/di/container'
 import { findOneWithDecryption } from '@open-mercato/shared/lib/encryption/find'
 import type { RateLimiterService } from '@open-mercato/shared/lib/ratelimit/service'
-import { checkRateLimit, getClientIp } from '@open-mercato/shared/lib/ratelimit/helpers'
+import { checkRateLimit } from '@open-mercato/shared/lib/ratelimit/helpers'
 import { CheckoutLink } from '../../../../data/entities'
 import { CHECKOUT_PASSWORD_COOKIE } from '../../../../lib/constants'
 import { publicPasswordVerifySchema } from '../../../../data/validators'
@@ -12,7 +12,7 @@ import {
   signCheckoutAccessToken,
   verifyCheckoutPassword,
 } from '../../../../lib/utils'
-import { checkoutPasswordRateLimitConfig } from '../../../../lib/rateLimiter'
+import { buildCheckoutRateLimitKey, checkoutPasswordRateLimitConfig } from '../../../../lib/rateLimiter'
 import { checkoutTag } from '../../../openapi'
 
 export const metadata = {
@@ -25,8 +25,8 @@ export async function POST(req: Request, { params }: { params: Promise<{ slug: s
     const container = await createRequestContainer()
     try {
       const rateLimiter = container.resolve('rateLimiterService') as RateLimiterService
-      const ip = getClientIp(req, 1) ?? 'unknown'
-      const rateLimitResponse = await checkRateLimit(rateLimiter, checkoutPasswordRateLimitConfig, `checkout-password:${ip}`, 'Too many password attempts. Please try again later.')
+      const key = buildCheckoutRateLimitKey(req, rateLimiter, 'checkout-password')
+      const rateLimitResponse = await checkRateLimit(rateLimiter, checkoutPasswordRateLimitConfig, key, 'Too many password attempts. Please try again later.')
       if (rateLimitResponse) return rateLimitResponse
     } catch {
       // Rate limiting is fail-open

package/src/modules/checkout/components/PayPage.tsx

@@ -803,6 +803,8 @@ export function PayPageCustomerForm({
           const value = customerData[field.key]
           const containerClass = field.kind === 'multiline' ? 'space-y-2 sm:col-span-2' : 'space-y-2'
           const semanticType = getCheckoutCustomerFieldSemanticType(field)
+          const fieldId = `checkout-customer-${field.key}`
+          const fieldErrorId = `${fieldId}-error`
 
           return (
             <div key={field.key} className={containerClass}>
@@ -820,6 +822,9 @@ export function PayPageCustomerForm({
                   <Checkbox
                     checked={value === true}
                     disabled={inputsLocked}
+                    aria-required={field.required ? true : undefined}
+                    aria-invalid={fieldError ? true : undefined}
+                    aria-describedby={fieldError ? fieldErrorId : undefined}
                     onCheckedChange={(checked) => onFieldChange(field.key, checked === true)}
                   />
                   <span className="space-y-1">
@@ -836,17 +841,21 @@ export function PayPageCustomerForm({
                 </label>
               ) : (
                 <>
-                  <label className="text-sm font-medium">
+                  <label htmlFor={fieldId} className="text-sm font-medium">
                     {field.label}
                     {field.required ? ' *' : ''}
                   </label>
                   {field.kind === 'multiline' ? (
                     <Textarea
+                      id={fieldId}
                       className={READABLE_INPUT_CLASSNAME}
                       value={typeof value === 'string' ? value : ''}
                       disabled={inputsLocked}
                       onChange={(event) => onFieldChange(field.key, event.target.value)}
                       placeholder={field.placeholder ?? undefined}
+                      aria-required={field.required ? true : undefined}
+                      aria-invalid={fieldError ? true : undefined}
+                      aria-describedby={fieldError ? fieldErrorId : undefined}
                       style={buildReadableInputStyle(themeTokens, Boolean(fieldError), inputsLocked)}
                     />
                   ) : field.kind === 'select' || field.kind === 'radio' ? (
@@ -858,8 +867,11 @@ export function PayPageCustomerForm({
                       }}
                     >
                       <SelectTrigger
+                        id={fieldId}
                         className={`rounded-xl ${READABLE_INPUT_CLASSNAME}`}
+                        aria-required={field.required ? true : undefined}
                         aria-invalid={Boolean(fieldError)}
+                        aria-describedby={fieldError ? fieldErrorId : undefined}
                         style={buildReadableInputStyle(themeTokens, Boolean(fieldError), inputsLocked)}
                       >
                         <SelectValue placeholder={t('checkout.payPage.fields.selectPlaceholder', 'Select...')} />
@@ -875,6 +887,7 @@ export function PayPageCustomerForm({
                     </Select>
                   ) : (
                     <Input
+                      id={fieldId}
                       className={READABLE_INPUT_CLASSNAME}
                       type={semanticType === 'email' ? 'email' : semanticType === 'phone' ? 'tel' : 'text'}
                       value={typeof value === 'string' ? value : ''}
@@ -882,13 +895,16 @@ export function PayPageCustomerForm({
                       onChange={(event) => onFieldChange(field.key, event.target.value)}
                       placeholder={field.placeholder ?? undefined}
                       autoComplete={semanticType === 'email' ? 'email' : semanticType === 'phone' ? 'tel' : undefined}
+                      aria-required={field.required ? true : undefined}
+                      aria-invalid={fieldError ? true : undefined}
+                      aria-describedby={fieldError ? fieldErrorId : undefined}
                       style={buildReadableInputStyle(themeTokens, Boolean(fieldError), inputsLocked)}
                     />
                   )}
                 </>
               )}
               {fieldError ? (
-                <p className="text-sm" style={buildValidationMessageStyle(themeTokens)}>
+                <p id={fieldErrorId} className="text-sm" style={buildValidationMessageStyle(themeTokens)}>
                   {translateValidationMessage(fieldError, fieldPath)}
                 </p>
               ) : null}

package/src/modules/checkout/i18n/de.json

@@ -326,6 +326,7 @@
   "checkout.payPage.errors.loadMessage": "Diese Zahlungsseite konnte nicht geladen werden. Bitte versuche es erneut.",
   "checkout.payPage.errors.loadTitle": "Zahlungslink konnte nicht geladen werden",
   "checkout.payPage.errors.password": "Das Passwort konnte nicht verifiziert werden. Bitte versuche es erneut.",
+  "checkout.payPage.errors.sessionStart": "Die Zahlungssitzung konnte nicht gestartet werden. Bitte versuche es erneut.",
   "checkout.payPage.errors.submit": "Die Zahlung konnte nicht gestartet werden. Bitte versuche es erneut.",
   "checkout.payPage.fields.booleanFalse": "Nein",
   "checkout.payPage.fields.booleanTrue": "Ja",

package/src/modules/checkout/i18n/en.json

@@ -326,6 +326,7 @@
   "checkout.payPage.errors.loadMessage": "We couldn't load this payment page. Please try again.",
   "checkout.payPage.errors.loadTitle": "Unable to load payment link",
   "checkout.payPage.errors.password": "Unable to verify password. Please try again.",
+  "checkout.payPage.errors.sessionStart": "Unable to start the payment session. Please try again.",
   "checkout.payPage.errors.submit": "Unable to start the payment. Please try again.",
   "checkout.payPage.fields.booleanFalse": "No",
   "checkout.payPage.fields.booleanTrue": "Yes",

package/src/modules/checkout/i18n/es.json

@@ -326,6 +326,7 @@
   "checkout.payPage.errors.loadMessage": "No pudimos cargar esta pagina de pago. Intentalo de nuevo.",
   "checkout.payPage.errors.loadTitle": "No se pudo cargar el enlace de pago",
   "checkout.payPage.errors.password": "No se pudo verificar la contrasena. Intentalo de nuevo.",
+  "checkout.payPage.errors.sessionStart": "No se pudo iniciar la sesión de pago. Inténtalo de nuevo.",
   "checkout.payPage.errors.submit": "No se pudo iniciar el pago. Intentalo de nuevo.",
   "checkout.payPage.fields.booleanFalse": "No",
   "checkout.payPage.fields.booleanTrue": "Si",

package/src/modules/checkout/i18n/pl.json

@@ -326,6 +326,7 @@
   "checkout.payPage.errors.loadMessage": "Nie udało się załadować tej strony płatności. Spróbuj ponownie.",
   "checkout.payPage.errors.loadTitle": "Nie udało się załadować linku płatności",
   "checkout.payPage.errors.password": "Nie udało się zweryfikować hasła. Spróbuj ponownie.",
+  "checkout.payPage.errors.sessionStart": "Nie udało się uruchomić sesji płatności. Spróbuj ponownie.",
   "checkout.payPage.errors.submit": "Nie udało się rozpocząć płatności. Spróbuj ponownie.",
   "checkout.payPage.fields.booleanFalse": "Nie",
   "checkout.payPage.fields.booleanTrue": "Tak",

package/src/modules/checkout/lib/__tests__/rateLimiter.test.ts

@@ -0,0 +1,47 @@
+import type { RateLimiterService } from '@open-mercato/shared/lib/ratelimit/service'
+import { buildCheckoutRateLimitKey } from '../rateLimiter'
+
+function makeRateLimiter(trustProxyDepth: number): RateLimiterService {
+  return { trustProxyDepth } as RateLimiterService
+}
+
+describe('buildCheckoutRateLimitKey', () => {
+  it('ignores spoofed forwarding headers in direct mode and uses the bounded fallback', () => {
+    const req = new Request('http://localhost', {
+      headers: {
+        'x-forwarded-for': 'attacker-controlled',
+        'x-real-ip': 'attacker-controlled',
+      },
+    })
+
+    expect(buildCheckoutRateLimitKey(req, makeRateLimiter(0), 'checkout-submit'))
+      .toBe('checkout-submit:global')
+  })
+
+  it('uses the trusted right edge with one proxy', () => {
+    const req = new Request('http://localhost', {
+      headers: { 'x-forwarded-for': 'spoofed, 203.0.113.10' },
+    })
+
+    expect(buildCheckoutRateLimitKey(req, makeRateLimiter(1), 'checkout-password'))
+      .toBe('checkout-password:203.0.113.10')
+  })
+
+  it('uses the configured trusted depth with multiple proxies', () => {
+    const req = new Request('http://localhost', {
+      headers: { 'x-forwarded-for': 'spoofed, 203.0.113.10, 192.0.2.5' },
+    })
+
+    expect(buildCheckoutRateLimitKey(req, makeRateLimiter(2), 'checkout-status'))
+      .toBe('checkout-status:203.0.113.10')
+  })
+
+  it('uses the bounded fallback when the forwarded chain is undersized', () => {
+    const req = new Request('http://localhost', {
+      headers: { 'x-forwarded-for': '203.0.113.10' },
+    })
+
+    expect(buildCheckoutRateLimitKey(req, makeRateLimiter(2), 'checkout-public-view'))
+      .toBe('checkout-public-view:global')
+  })
+})

package/src/modules/checkout/lib/rateLimiter.ts

@@ -1,4 +1,15 @@
 import { readEndpointRateLimitConfig } from '@open-mercato/shared/lib/ratelimit/config'
+import { getClientIp, RATE_LIMIT_FALLBACK_KEY } from '@open-mercato/shared/lib/ratelimit/helpers'
+import type { RateLimiterService } from '@open-mercato/shared/lib/ratelimit/service'
+
+export function buildCheckoutRateLimitKey(
+  req: Request,
+  rateLimiter: RateLimiterService,
+  namespace: string,
+): string {
+  const clientKey = getClientIp(req, rateLimiter.trustProxyDepth) ?? RATE_LIMIT_FALLBACK_KEY
+  return `${namespace}:${clientKey}`
+}
 
 export const checkoutPublicViewRateLimitConfig = readEndpointRateLimitConfig('CHECKOUT_PUBLIC_VIEW', {
   points: 60,