From 116e513852ab0fc42e2342f33d5390217a6b9c73 Mon Sep 17 00:00:00 2001
From: Duncan Crawbuck <duncan@crawbuck.com>
Date: Wed, 22 Apr 2026 18:37:07 -0700
Subject: [PATCH] Add logged-in email to docs feedback

---
 src/components/LoginStatusContext.tsx | 26 ++++++++++++++++++-----
 src/components/feedback/client.tsx    | 17 ++++++++++++++-
 src/routes/$.tsx                      | 27 +++++++++++++-----------
 src/routes/api/feedback.ts            | 30 ++++++++++++++++++++++++++-
 4 files changed, 81 insertions(+), 19 deletions(-)

diff --git a/src/components/LoginStatusContext.tsx b/src/components/LoginStatusContext.tsx
index f4e77ea7..86ec8529 100644
--- a/src/components/LoginStatusContext.tsx
+++ b/src/components/LoginStatusContext.tsx
@@ -3,17 +3,29 @@
 import React, { createContext, useContext, useEffect, useState } from "react";
 import { LoaderCircle } from "lucide-react";
 
-const LoginStatusContext = createContext<{
+type AuthSession = {
   isLoggedIn: boolean | null;
   isLoading: boolean;
-}>({
+  email?: string;
+};
+
+type SessionResponse = {
+  isLoggedIn?: boolean;
+  userInfo?: {
+    email?: string;
+  };
+};
+
+const LoginStatusContext = createContext<AuthSession>({
   isLoggedIn: null,
   isLoading: true,
+  email: undefined,
 });
 
 export function LoginStatusProvider({ children }: { children: React.ReactNode }) {
   const [isLoggedIn, setIsLoggedIn] = useState<boolean | null>(null);
   const [isLoading, setIsLoading] = useState(true);
+  const [email, setEmail] = useState<string | undefined>(undefined);
 
   useEffect(() => {
     async function checkAuth() {
@@ -24,17 +36,21 @@ export function LoginStatusProvider({ children }: { children: React.ReactNode })
 
         if (response && response.ok) {
           try {
-            const session = await response.json();
+            const session = (await response.json()) as SessionResponse;
             setIsLoggedIn(!!(session && session.isLoggedIn));
+            setEmail(session.userInfo?.email);
           } catch (_e) {
             console.error("Failed to parse session data", _e);
             setIsLoggedIn(false);
+            setEmail(undefined);
           }
         } else {
           setIsLoggedIn(false);
+          setEmail(undefined);
         }
       } catch (_err) {
         setIsLoggedIn(false);
+        setEmail(undefined);
       } finally {
         setIsLoading(false);
       }
@@ -44,13 +60,13 @@ export function LoginStatusProvider({ children }: { children: React.ReactNode })
   }, []);
 
   return (
-    <LoginStatusContext.Provider value={{ isLoggedIn, isLoading }}>
+    <LoginStatusContext.Provider value={{ isLoggedIn, isLoading, email }}>
       {children}
     </LoginStatusContext.Provider>
   );
 }
 
-function useLoginStatus() {
+export function useLoginStatus() {
   return useContext(LoginStatusContext);
 }
 
diff --git a/src/components/feedback/client.tsx b/src/components/feedback/client.tsx
index 1343c160..2e892bcc 100644
--- a/src/components/feedback/client.tsx
+++ b/src/components/feedback/client.tsx
@@ -23,6 +23,7 @@ import {
   type BlockFeedback,
   type PageFeedback,
 } from "./schema";
+import { useLoginStatus } from "../LoginStatusContext";
 import { z } from "zod/mini";
 
 const rateButtonVariants = cva(
@@ -39,6 +40,7 @@ const rateButtonVariants = cva(
 
 const pageFeedbackResult = z.extend(pageFeedback, {
   response: actionResponse,
+  usedAccountEmail: z.optional(z.boolean()),
 });
 
 const blockFeedbackResult = z.extend(blockFeedback, {
@@ -53,6 +55,7 @@ export function Feedback({
 }: {
   onSendAction: (feedback: PageFeedback) => Promise<ActionResponse>;
 }) {
+  const { isLoading, isLoggedIn, email } = useLoginStatus();
   const { pathname: url } = useLocation();
   const { previous, setPrevious } = useSubmissionStorage(url, (v) => {
     const result = pageFeedbackResult.safeParse(v);
@@ -71,10 +74,12 @@ export function Feedback({
         opinion,
         message,
       };
+      const usedAccountEmail = !isLoading && !!isLoggedIn && !!email;
 
       const response = await onSendAction(feedback);
       setPrevious({
         response,
+        usedAccountEmail,
         ...feedback,
       });
       setMessage("");
@@ -128,7 +133,12 @@ export function Feedback({
       <CollapsibleContent className="mt-3">
         {previous ? (
           <div className="px-3 py-6 flex flex-col items-center gap-3 bg-fd-card text-fd-muted-foreground text-sm text-center rounded-xl">
-            <p>Thank you for your feedback!</p>
+            <div className="flex flex-col gap-1">
+              <p>Thank you for your feedback!</p>
+              {previous.usedAccountEmail ? (
+                <p>If we need more detail, we may follow up by email.</p>
+              ) : null}
+            </div>
             <div className="flex flex-row items-center gap-2">
               {previous.response?.githubUrl ? (
                 <a
@@ -177,6 +187,11 @@ export function Feedback({
                 }
               }}
             />
+            {!isLoading && isLoggedIn && email ? (
+              <p className="text-sm text-fd-muted-foreground">
+                If we need to follow up, we may reply to your account email.
+              </p>
+            ) : null}
             <button
               type="submit"
               className={cn(buttonVariants({ color: "outline" }), "w-fit px-3")}
diff --git a/src/routes/$.tsx b/src/routes/$.tsx
index 74cc4f33..13a00f23 100644
--- a/src/routes/$.tsx
+++ b/src/routes/$.tsx
@@ -12,6 +12,7 @@ import { LLMCopyButton, ViewOptions } from "@/components/ai/page-actions";
 import { SidebarDiscordLink } from "@/components/SidebarDiscordLink";
 import { Feedback } from "@/components/feedback/client";
 import type { ActionResponse, PageFeedback } from "@/components/feedback/schema";
+import { LoginStatusProvider } from "@/components/LoginStatusContext";
 import {
   buildCanonicalUrl,
   DEFAULT_DESCRIPTION,
@@ -131,18 +132,20 @@ const clientLoader = browserCollections.docs.createClientLoader({
     }
 
     return (
-      <DocsPage toc={toc}>
-        <DocsTitle>{frontmatter.title}</DocsTitle>
-        <DocsDescription>{frontmatter.description}</DocsDescription>
-        <div className="flex flex-row gap-2 items-center border-b -mt-4 pb-6">
-          <LLMCopyButton markdownUrl={`${url}.mdx`} />
-          <ViewOptions markdownUrl={`${url}.mdx`} githubUrl={githubUrl} />
-        </div>
-        <DocsBody>
-          <MDX components={getMDXComponents()} />
-        </DocsBody>
-        <Feedback onSendAction={onSendFeedback} />
-      </DocsPage>
+      <LoginStatusProvider>
+        <DocsPage toc={toc}>
+          <DocsTitle>{frontmatter.title}</DocsTitle>
+          <DocsDescription>{frontmatter.description}</DocsDescription>
+          <div className="flex flex-row gap-2 items-center border-b -mt-4 pb-6">
+            <LLMCopyButton markdownUrl={`${url}.mdx`} />
+            <ViewOptions markdownUrl={`${url}.mdx`} githubUrl={githubUrl} />
+          </div>
+          <DocsBody>
+            <MDX components={getMDXComponents()} />
+          </DocsBody>
+          <Feedback onSendAction={onSendFeedback} />
+        </DocsPage>
+      </LoginStatusProvider>
     );
   },
 });
diff --git a/src/routes/api/feedback.ts b/src/routes/api/feedback.ts
index c9c5eceb..456b8428 100644
--- a/src/routes/api/feedback.ts
+++ b/src/routes/api/feedback.ts
@@ -18,10 +18,36 @@ type AIFeedback = {
 
 type Feedback = DocsFeedback | AIFeedback;
 
+type SessionResponse = {
+  isLoggedIn?: boolean;
+  userInfo?: {
+    email?: string;
+  };
+};
+
 function escapeTripleBackticks(input: string): string {
   return input.replace(/```/g, "`\u200b``");
 }
 
+async function getAuthenticatedUserEmail(request: Request): Promise<string | undefined> {
+  const sessionUrl = new URL("/api/auth/session", request.url);
+  const cookie = request.headers.get("cookie");
+
+  try {
+    const sessionResponse = await fetch(sessionUrl, {
+      headers: cookie ? { cookie } : undefined,
+    });
+    if (!sessionResponse.ok) return undefined;
+
+    const session = (await sessionResponse.json()) as SessionResponse;
+    if (!session.isLoggedIn) return undefined;
+
+    return session.userInfo?.email;
+  } catch {
+    return undefined;
+  }
+}
+
 export const Route = createFileRoute("/api/feedback")({
   server: {
     handlers: {
@@ -80,12 +106,14 @@ export async function handleFeedbackPost(request: Request) {
     ].join("\n");
   } else {
     const docsFeedback = body as DocsFeedback;
+    const resolvedEmail = (await getAuthenticatedUserEmail(request)) ?? docsFeedback.email;
+
     slackMessage = [
       "*Docs Feedback*",
       `*URL*: ${baseUrl}${docsFeedback.url}`,
       `*Opinion*: ${docsFeedback.opinion === "good" ? "good" : "bad"}`,
       `*Message*: \n\`\`\`${escapeTripleBackticks(docsFeedback.message || "_none_")}\`\`\``,
-      ...(docsFeedback.email ? [`*User*: ${docsFeedback.email}`] : []),
+      ...(resolvedEmail ? [`*User*: ${resolvedEmail}`] : []),
     ].join("\n");
   }