Fix GDPR consent API endpoint URL

Author: webstackdev

.cache/pages.json

@@ -103,28 +103,36 @@
       "apis-and-gateways",
       "argo-cd",
       "aws",
+      "aws/2",
+      "aws/3",
       "azure",
       "backstage-idp",
       "build-and-deploy",
       "cloud-platforms",
+      "cloud-platforms/2",
       "crossplane",
       "docker",
       "dotnet",
       "go",
       "grafana",
       "helm",
       "kubernetes",
+      "kubernetes/2",
+      "kubernetes/3",
       "observability-and-telemetry",
       "openstack",
       "platform-engineering",
       "prometheus",
+      "prometheus/2",
       "python",
+      "python/2",
       "reliability-and-testing",
       "ruby",
       "system-modernization",
       "systems-and-development",
       "terraform",
-      "typescript"
+      "typescript",
+      "typescript/2"
     ]
   },
   "terms"

src/components/scripts/sentry/__tests__/helpers.spec.ts

@@ -57,7 +57,7 @@ const createContactSubmitHttpErrorEvent = (): Parameters<typeof beforeSendHandle
 const createConsentRateLimitHttpErrorEvent = (): Parameters<typeof beforeSendHandler>[0] =>
   ({
     type: 'error',
-    request: { url: 'https://www.webstackbuilders.com/_actions/gdpr.consentCreate' },
+    request: { url: 'https://www.webstackbuilders.com/_actions/gdpr/consentCreate' },
     exception: {
       values: [
         {

src/components/scripts/sentry/helpers.ts

@@ -6,6 +6,13 @@ type BeforeSendHandler = NonNullable<BrowserOptions['beforeSend']>
 
 const SAFE_BREADCRUMB_CATEGORIES = new Set(['script', 'sentry.event'])
 
+const isConsentActionRequest = (requestUrl: string): boolean => {
+  return (
+    requestUrl.includes('/_actions/gdpr.consentCreate') ||
+    requestUrl.includes('/_actions/gdpr/consentCreate')
+  )
+}
+
 const isHandledContactSubmitHttpError = (event: Parameters<BeforeSendHandler>[0]): boolean => {
   const requestUrl = event.request?.url
   const exception = event.exception?.values?.[0]
@@ -29,7 +36,7 @@ const isHandledConsentRateLimitHttpError = (event: Parameters<BeforeSendHandler>
 
   return (
     typeof requestUrl === 'string' &&
-    requestUrl.includes('/_actions/gdpr.consentCreate') &&
+    isConsentActionRequest(requestUrl) &&
     mechanismType === 'auto.http.client.fetch' &&
     typeof errorMessage === 'string' &&
     errorMessage.includes('HTTP Client Error with status code: 429')

src/components/scripts/store/__tests__/consent.spec.ts

@@ -27,6 +27,16 @@ import {
 import { $isConsentBannerVisible } from '@components/scripts/store/consentBanner'
 import * as errorHandlerModule from '@components/scripts/errors/handler'
 
+const consentCreateMock = vi.hoisted(() => vi.fn())
+
+vi.mock('astro:actions', () => ({
+  actions: {
+    gdpr: {
+      consentCreate: consentCreateMock,
+    },
+  },
+}))
+
 // Mock js-cookie
 vi.mock('js-cookie', () => ({
   default: {
@@ -81,6 +91,7 @@ describe('Cookie Consent Management', () => {
 
     // Clear mocks
     vi.clearAllMocks()
+    consentCreateMock.mockReset()
 
     // Clear localStorage
     localStorage.clear()
@@ -320,8 +331,7 @@ describe('Consent side effects', () => {
   })
 
   it('logs consent updates via the GDPR API when preferences change', async () => {
-    const fetchSpy = vi.fn().mockResolvedValue({ ok: true })
-    vi.stubGlobal('fetch', fetchSpy)
+    consentCreateMock.mockResolvedValue({ data: { success: true, record: { id: 'consent-1' } } })
 
     let consentListener:
       | ((_state: ConsentState, _oldState?: ConsentState) => Promise<void> | void)
@@ -353,16 +363,13 @@ describe('Consent side effects', () => {
     await consentListener?.(newState, oldState)
 
     await vi.waitFor(() => {
-      expect(fetchSpy).toHaveBeenCalledTimes(1)
+      expect(consentCreateMock).toHaveBeenCalledTimes(1)
     })
-    const firstFetchCall = fetchSpy.mock.calls.at(0)
-    if (!firstFetchCall) {
-      throw new TestError('Expected consent logging fetch to be called once')
+    const firstConsentCall = consentCreateMock.mock.calls.at(0)
+    if (!firstConsentCall) {
+      throw new TestError('Expected consent logging action to be called once')
     }
-    const [url, options] = firstFetchCall
-    expect(url).toBe('/_actions/gdpr.consentCreate')
-    expect(options?.method).toBe('POST')
-    const payload = JSON.parse(options?.body as string)
+    const [payload] = firstConsentCall
     expect(payload).toMatchObject({
       DataSubjectId: validDataSubjectId,
       purposes: ['analytics'],
@@ -372,13 +379,12 @@ describe('Consent side effects', () => {
 
     await consentListener?.(newState, undefined)
     await vi.waitFor(() => {
-      expect(fetchSpy).toHaveBeenCalledTimes(1)
+      expect(consentCreateMock).toHaveBeenCalledTimes(1)
     })
   })
 
   it('regenerates a DataSubjectId before logging when state value is missing or invalid', async () => {
-    const fetchSpy = vi.fn().mockResolvedValue({ ok: true })
-    vi.stubGlobal('fetch', fetchSpy)
+    consentCreateMock.mockResolvedValue({ data: { success: true, record: { id: 'consent-1' } } })
 
     const regeneratedId = 'regenerated-data-subject-id'
     vi.mocked(getOrCreateDataSubjectId).mockReturnValue(regeneratedId)
@@ -412,25 +418,23 @@ describe('Consent side effects', () => {
     await consentListener?.(newState, oldState)
 
     await vi.waitFor(() => {
-      expect(fetchSpy).toHaveBeenCalledTimes(1)
+      expect(consentCreateMock).toHaveBeenCalledTimes(1)
     })
 
     expect(getOrCreateDataSubjectId).toHaveBeenCalledTimes(1)
 
-    const firstFetchCall = fetchSpy.mock.calls.at(0)
-    if (!firstFetchCall) {
-      throw new TestError('Expected consent logging fetch to be called once')
+    const firstConsentCall = consentCreateMock.mock.calls.at(0)
+    if (!firstConsentCall) {
+      throw new TestError('Expected consent logging action to be called once')
     }
-    const [, options] = firstFetchCall
-    const payload = JSON.parse(options?.body as string)
+    const [payload] = firstConsentCall
     expect(payload.DataSubjectId).toBe(regeneratedId)
 
     expect($consent.get().DataSubjectId).toBe(regeneratedId)
   })
 
   it('queues consent logging when offline and retries after reconnecting', async () => {
-    const fetchSpy = vi.fn().mockResolvedValue({ ok: true })
-    vi.stubGlobal('fetch', fetchSpy)
+    consentCreateMock.mockResolvedValue({ data: { success: true, record: { id: 'consent-1' } } })
 
     const onlineGetter = vi.spyOn(window.navigator, 'onLine', 'get')
     onlineGetter.mockReturnValue(false)
@@ -463,13 +467,13 @@ describe('Consent side effects', () => {
 
     await consentListener?.(newState, oldState)
 
-    expect(fetchSpy).not.toHaveBeenCalled()
+    expect(consentCreateMock).not.toHaveBeenCalled()
 
     onlineGetter.mockReturnValue(true)
     window.dispatchEvent(new Event('online'))
 
     await vi.waitFor(() => {
-      expect(fetchSpy).toHaveBeenCalledTimes(1)
+      expect(consentCreateMock).toHaveBeenCalledTimes(1)
     })
 
     onlineGetter.mockRestore()
@@ -478,8 +482,7 @@ describe('Consent side effects', () => {
   it('coalesces burst consent updates into the latest payload before sending', async () => {
     vi.useFakeTimers()
 
-    const fetchSpy = vi.fn().mockResolvedValue({ ok: true })
-    vi.stubGlobal('fetch', fetchSpy)
+    consentCreateMock.mockResolvedValue({ data: { success: true, record: { id: 'consent-1' } } })
 
     let consentListener:
       | ((_state: ConsentState, _oldState?: ConsentState) => Promise<void> | void)
@@ -524,38 +527,34 @@ describe('Consent side effects', () => {
     await consentListener?.(state2, state1)
     await consentListener?.(state3, state2)
 
-    expect(fetchSpy).not.toHaveBeenCalled()
+    expect(consentCreateMock).not.toHaveBeenCalled()
 
     await vi.advanceTimersByTimeAsync(250)
 
     await vi.waitFor(() => {
-      expect(fetchSpy).toHaveBeenCalledTimes(1)
+      expect(consentCreateMock).toHaveBeenCalledTimes(1)
     })
 
-    const firstFetchCall = fetchSpy.mock.calls.at(0)
-    if (!firstFetchCall) {
-      throw new TestError('Expected coalesced consent logging fetch to be called once')
+    const firstConsentCall = consentCreateMock.mock.calls.at(0)
+    if (!firstConsentCall) {
+      throw new TestError('Expected coalesced consent logging action to be called once')
     }
 
-    const [, options] = firstFetchCall
-    const payload = JSON.parse(options?.body as string)
+    const [payload] = firstConsentCall
     expect(payload.purposes).toEqual(['analytics', 'marketing', 'functional'])
   })
 
   it('retries consent logging after a 429 without reporting a script error', async () => {
     vi.useFakeTimers()
 
-    const fetchSpy = vi
-      .fn()
+    consentCreateMock
       .mockResolvedValueOnce({
-        ok: false,
-        status: 429,
-        statusText: 'Too Many Requests',
-        headers: { get: vi.fn(() => '1') },
-        json: vi.fn().mockResolvedValue({ error: { message: 'Try again in 1s' } }),
+        error: {
+          code: 'TOO_MANY_REQUESTS',
+          message: 'Try again in 1s',
+        },
       })
-      .mockResolvedValueOnce({ ok: true })
-    vi.stubGlobal('fetch', fetchSpy)
+      .mockResolvedValueOnce({ data: { success: true, record: { id: 'consent-1' } } })
 
     const handleScriptErrorSpy = vi.spyOn(errorHandlerModule, 'handleScriptError')
 
@@ -590,15 +589,15 @@ describe('Consent side effects', () => {
     await vi.advanceTimersByTimeAsync(250)
 
     await vi.waitFor(() => {
-      expect(fetchSpy).toHaveBeenCalledTimes(1)
+      expect(consentCreateMock).toHaveBeenCalledTimes(1)
     })
 
     expect(handleScriptErrorSpy).not.toHaveBeenCalled()
 
     await vi.advanceTimersByTimeAsync(1_000)
 
     await vi.waitFor(() => {
-      expect(fetchSpy).toHaveBeenCalledTimes(2)
+      expect(consentCreateMock).toHaveBeenCalledTimes(2)
     })
 
     expect(handleScriptErrorSpy).not.toHaveBeenCalled()

src/components/scripts/store/consent.ts

@@ -1,6 +1,7 @@
 /**
  * Cookie Consent State Management
  */
+import { actions } from 'astro:actions'
 import { computed, onMount } from 'nanostores'
 import { persistentAtom } from '@nanostores/persistent'
 import { StoreController } from '@nanostores/lit'
@@ -413,8 +414,8 @@ export function initConsentSideEffects(): void {
     }, delayMs)
   }
 
-  const parseRetryAfterMs = (response: Response, serverMessage?: string): number => {
-    const retryAfterHeader = response.headers.get('Retry-After')
+  const parseRetryAfterMs = (response?: Response, serverMessage?: string): number => {
+    const retryAfterHeader = response?.headers.get('Retry-After')
     if (retryAfterHeader) {
       const retryAfterSeconds = Number(retryAfterHeader)
       if (Number.isFinite(retryAfterSeconds) && retryAfterSeconds > 0) {
@@ -507,45 +508,46 @@ export function initConsentSideEffects(): void {
   }
 
   const sendConsentPayload = async (payload: ConsentLogPayload) => {
-    const response = await fetch('/_actions/gdpr.consentCreate', {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      body: JSON.stringify(payload),
-    })
+    const { data, error } = await actions.gdpr.consentCreate(payload)
 
-    if (!response.ok) {
-      const responseBody = await response.json().catch(() => null)
-      const serverError =
-        responseBody && typeof responseBody === 'object' && 'error' in responseBody
-          ? (responseBody as { error: { message?: string } }).error
-          : null
-      const serverMessage =
-        serverError?.message ??
-        (responseBody && typeof (responseBody as { message?: string }).message === 'string'
-          ? (responseBody as { message: string }).message
-          : undefined)
-
-      if (response.status === 429) {
-        throw new ConsentLogRetryableError(
-          serverMessage ?? 'Consent logging is temporarily rate limited',
-          parseRetryAfterMs(response, serverMessage),
-          {
-            status: response.status,
-            statusText: response.statusText,
-            body: responseBody,
-          }
-        )
-      }
+    if (!error && data?.success) {
+      return
+    }
 
-      throw new ClientScriptError({
-        message: serverMessage ?? `Failed to record consent (status ${response.status})`,
-        cause: {
-          status: response.status,
-          statusText: response.statusText,
-          body: responseBody,
-        },
-      })
+    const actionError = error as
+      | {
+          code?: string
+          message?: string
+          status?: number
+          statusText?: string
+        }
+      | undefined
+
+    const serverMessage =
+      typeof actionError?.message === 'string' && actionError.message.trim().length > 0
+        ? actionError.message
+        : undefined
+
+    if (actionError?.code === 'TOO_MANY_REQUESTS') {
+      throw new ConsentLogRetryableError(
+        serverMessage ?? 'Consent logging is temporarily rate limited',
+        parseRetryAfterMs(undefined, serverMessage),
+        {
+          code: actionError.code,
+          status: actionError.status,
+          statusText: actionError.statusText,
+        }
+      )
     }
+
+    throw new ClientScriptError({
+      message: serverMessage ?? 'Failed to record consent',
+      cause: {
+        code: actionError?.code,
+        status: actionError?.status,
+        statusText: actionError?.statusText,
+      },
+    })
   }
 
   $consent.subscribe((consentState, oldConsentState) => {