T3C-553-adds auth to auth-events signout

Author: juggler434

next-client/package-lock.json

@@ -30,17 +30,13 @@ export async function POST(request: Request) {
     const expressBody: {
       event: string;
       clientTimestamp: string;
-      firebaseAuthToken?: string;
+      firebaseAuthToken: string;
     } = {
       event,
       clientTimestamp,
+      firebaseAuthToken: token,
     };
 
-    // Include Firebase token for signin events
-    if (event === "signin" && token) {
-      expressBody.firebaseAuthToken = token;
-    }
-
     const expressResponse = await fetch(`${expressUrl}/auth-events`, {
       method: "POST",
       headers: {
@@ -65,7 +61,7 @@ export async function POST(request: Request) {
       );
       return NextResponse.json(
         { error: "Failed to log auth event" },
-        { status: 500 },
+        { status: expressResponse.status },
       );
     }
 

next-client/src/app/api/auth-events/route.ts

@@ -74,10 +74,14 @@ export default function LoginButton() {
       );
 
       // Log signout event to server (before actually signing out)
-      await logAuthEvent("signout");
+      if (!user) {
+        throw new Error("Sign out attempted with no user");
+      }
+
+      await logAuthEvent("signout", user);
 
       await signOut();
-      loginLogger.info("Sign out successful");
+      loginLogger.info({}, "Sign out successful");
     } catch (error) {
       loginLogger.error({ error }, "Sign out failed");
     }

next-client/src/components/navbar/components/LoginButton.tsx

@@ -10,7 +10,7 @@ const authEventsLogger = logger.child({ module: "auth-events-client" });
  */
 export async function logAuthEvent(
   event: "signin" | "signout",
-  user?: User,
+  user: User,
 ): Promise<void> {
   try {
     let body: {
@@ -22,18 +22,15 @@ export async function logAuthEvent(
       clientTimestamp: new Date().toISOString(),
     };
 
-    // For signin events, include the Firebase token for verification
-    if (event === "signin" && user) {
-      const tokenResult = await fetchToken(user);
-      if (tokenResult.tag === "success" && tokenResult.value) {
-        body.token = tokenResult.value;
-      } else {
-        authEventsLogger.warn(
-          { user },
-          "Could not get token for signin event logging",
-        );
-        return;
-      }
+    const tokenResult = await fetchToken(user);
+    if (tokenResult.tag === "success" && tokenResult.value) {
+      body.token = tokenResult.value;
+    } else {
+      authEventsLogger.warn(
+        { user },
+        "Could not get token for auth-event event logging",
+      );
+      return;
     }
 
     // Call our Next.js API route which will proxy to the express server