keystone-design-bootstrap 1.0.101 → 1.0.102

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "keystone-design-bootstrap",
-  "version": "1.0.101",
+  "version": "1.0.102",
   "description": "Keystone Design Bootstrap - Sections, Elements, and Theme System for customer websites",
   "type": "module",
   "main": "./src/index.ts",

package/src/next/routes/consumer-auth.ts

@@ -47,6 +47,10 @@ function apiHeaders(request?: Request): Record<string, string> {
   };
 }
 
+function responseData(json: Record<string, unknown>): Record<string, unknown> {
+  return (json.data as Record<string, unknown>) || json;
+}
+
 // POST /api/consumer/initiate
 // Looks up an existing user by email or phone, creating a Contact if needed.
 // Returns { exists, firstName, hasPassword }.
@@ -68,8 +72,8 @@ async function handleInitiate(request: Request, NR: NextResponseLike): Promise<R
     if (res.status === 404) return NR.json({ exists: false });
     if (!res.ok) return NR.json({ exists: null });
 
-    const json = await res.json().catch(() => ({}));
-    const data = json.data as Record<string, unknown> | undefined;
+    const json = await res.json().catch(() => ({})) as Record<string, unknown>;
+    const data = responseData(json);
     return NR.json({
       exists: true,
       firstName: data?.first_name ?? undefined,
@@ -172,20 +176,21 @@ async function handleSendCode(request: Request, NR: NextResponseLike): Promise<R
     body: JSON.stringify({ phone }),
   });
 
-  const json = await res.json().catch(() => ({}));
+  const json = await res.json().catch(() => ({})) as Record<string, unknown>;
+  const data = responseData(json);
   if (!res.ok) {
     return NR.json(
       {
-        error: json.error || 'Failed to send verification code. Please try again.',
-        code: json.code,
-        retry_in_seconds: json.retry_in_seconds,
+        error: (json as Record<string, unknown>).error || 'Failed to send verification code. Please try again.',
+        code: (json as Record<string, unknown>).code,
+        retry_in_seconds: (json as Record<string, unknown>).retry_in_seconds,
       },
       { status: res.status }
     );
   }
 
   return NR.json({
-    resend_available_at: json.data?.resend_available_at ?? null,
+    resend_available_at: data?.resend_available_at ?? null,
   });
 }
 
@@ -202,19 +207,23 @@ async function handleVerifyCode(request: Request, NR: NextResponseLike): Promise
     body: JSON.stringify({ phone, code }),
   });
 
-  const json = await res.json().catch(() => ({}));
+  const json = await res.json().catch(() => ({})) as Record<string, unknown>;
+  const data = responseData(json);
   if (!res.ok) {
     return NR.json(
-      { error: json.error || 'Verification failed. Please try again.', code: json.code },
+      {
+        error: (json as Record<string, unknown>).error || 'Verification failed. Please try again.',
+        code: (json as Record<string, unknown>).code,
+      },
       { status: res.status }
     );
   }
 
   return NR.json({
-    verification_token: json.data?.verification_token,
-    first_name: json.data?.first_name ?? '',
-    last_name: json.data?.last_name ?? '',
-    email: json.data?.email ?? '',
+    verification_token: data?.verification_token,
+    first_name: data?.first_name ?? '',
+    last_name: data?.last_name ?? '',
+    email: data?.email ?? '',
   });
 }
 
@@ -242,17 +251,21 @@ async function handlePasswordlessAuth(request: Request, NR: NextResponseLike): P
     }),
   });
 
-  const json = await res.json().catch(() => ({}));
+  const json = await res.json().catch(() => ({})) as Record<string, unknown>;
+  const data = responseData(json);
   if (!res.ok) {
-    return NR.json({ error: json.error || 'Authentication failed. Please try again.' }, { status: res.status });
+    return NR.json(
+      { error: (json as Record<string, unknown>).error || 'Authentication failed. Please try again.' },
+      { status: res.status }
+    );
   }
 
-  const token = json.data?.token;
+  const token = data?.token;
   if (!token) return NR.json({ error: 'No token received.' }, { status: 500 });
 
   // Surface the server-side Lead event_id so the browser can fire a single deduped
   // Lead (fbq track with { eventID }) that Meta matches against the CAPI Lead event.
-  const response = NR.json({ eventId: json.data?.event_id ?? undefined });
+  const response = NR.json({ eventId: data?.event_id ?? undefined });
   response.cookies.set(CONSUMER_TOKEN_COOKIE, token, {
     httpOnly: true,
     secure: process.env.NODE_ENV === 'production',