fix chats auth follow-ups

Author: dnywh

e2e/auth.spec.ts

@@ -1,5 +1,5 @@
 import { expect, test } from "@playwright/test";
-import { HOST_EMAIL, signIn } from "./helpers";
+import { HOST_EMAIL, SEEDED_THREAD_ID, signIn } from "./helpers";
 
 test("public listing shows the seeded public listing and guest contact gate", async ({
   page,
@@ -34,3 +34,14 @@ test("sign-in normalises unsafe redirect_to values", async ({ page }) => {
 
   await expect(page).toHaveURL(/\/map$/);
 });
+
+test("guest chats redirect preserves the requested chat path", async ({
+  page,
+}) => {
+  await page.goto(`/chats/${SEEDED_THREAD_ID}`);
+
+  await expect(page).toHaveURL(
+    new RegExp(`/sign-in\\?redirect_to=/?chats/${SEEDED_THREAD_ID}$`)
+  );
+  await expect(page.getByTestId("sign-in-form")).toBeVisible();
+});

src/app/(core)/(interact)/(stretched)/chats/[[...threadId]]/page.tsx

@@ -17,14 +17,15 @@ export const metadata: Metadata = {
 export default async function ChatsPage({ params }: ChatsPageProps) {
   const { threadId: threadIdSegments } = await params;
   const threadId = threadIdSegments?.[0] ?? null;
+  const redirectPath = threadId ? `/chats/${threadId}` : "/chats";
 
   const supabase = await createClient();
   const {
     data: { user },
   } = await supabase.auth.getUser();
 
   if (!user) {
-    redirect("/sign-in");
+    redirect(`/sign-in?redirect_to=${redirectPath}`);
   }
 
   const { data: threads } = await supabase

src/contexts/UnreadMessagesContext.tsx

@@ -40,24 +40,69 @@ export function UnreadMessagesProvider({ children }: PropsWithChildren) {
     {}
   );
   const [hasViewedChats, setHasViewedChats] = useState(false);
+  const [userId, setUserId] = useState<string | null>(null);
   const supabase = useMemo(() => createClient(), []);
   const pathname = usePathname();
 
+  useEffect(() => {
+    let isActive = true;
+
+    async function loadUserId(nextUserId?: string | null) {
+      const resolvedUserId =
+        nextUserId ?? (await supabase.auth.getUser()).data.user?.id ?? null;
+
+      if (!isActive) return;
+
+      setUserId((previousUserId) => {
+        if (previousUserId !== resolvedUserId) {
+          setUnreadCount(0);
+          setThreadReadStatus({});
+          setHasViewedChats(false);
+        }
+
+        return resolvedUserId;
+      });
+    }
+
+    void loadUserId();
+
+    if (isAuthDebugEnabled) {
+      console.log("Setting up auth listener");
+    }
+
+    const {
+      data: { subscription },
+    } = supabase.auth.onAuthStateChange((event, session) => {
+      if (isAuthDebugEnabled) {
+        console.log("Auth event:", event);
+        console.log("Session:", session ? "exists" : "none");
+      }
+
+      void loadUserId(session?.user?.id ?? null);
+    });
+
+    return () => {
+      isActive = false;
+      subscription.unsubscribe();
+    };
+  }, [supabase]);
+
   useEffect(() => {
     let isActive = true;
 
     async function checkUnreadMessages() {
       try {
-        const {
-          data: { user },
-        } = await supabase.auth.getUser();
-
-        if (!user || !isActive) return;
+        if (!userId) {
+          if (isActive) {
+            setUnreadCount(0);
+          }
+          return;
+        }
 
         const { data: unreadMessages, error } = await supabase
           .from("chat_messages")
           .select("id")
-          .neq("sender_id", user.id)
+          .neq("sender_id", userId)
           .is("read_at", null);
 
         if (error) {
@@ -79,45 +124,22 @@ export function UnreadMessagesProvider({ children }: PropsWithChildren) {
     return () => {
       isActive = false;
     };
-  }, [supabase]);
+  }, [supabase, userId]);
 
   useEffect(() => {
     if (pathname === "/chats") {
       setHasViewedChats(true);
     }
   }, [pathname]);
 
-  useEffect(() => {
-    if (isAuthDebugEnabled) {
-      console.log("Setting up auth listener");
-    }
-
-    const {
-      data: { subscription },
-    } = supabase.auth.onAuthStateChange((event, session) => {
-      if (!isAuthDebugEnabled) return;
-
-      console.log("Auth event:", event);
-      console.log("Session:", session ? "exists" : "none");
-    });
-
-    return () => {
-      subscription.unsubscribe();
-    };
-  }, [supabase]);
-
   useEffect(() => {
     let activeChannel: ReturnType<typeof supabase.channel> | null = null;
 
     async function setupSubscription() {
-      const {
-        data: { user },
-      } = await supabase.auth.getUser();
-
-      if (!user) return;
+      if (!userId) return;
 
       activeChannel = supabase
-        .channel("chat_messages")
+        .channel(`chat_messages:${userId}`)
         .on(
           "postgres_changes",
           {
@@ -128,7 +150,7 @@ export function UnreadMessagesProvider({ children }: PropsWithChildren) {
           async (payload) => {
             const message = payload.new as ChatMessagePayload;
 
-            if (message.sender_id === user.id) return;
+            if (message.sender_id === userId) return;
 
             const currentPath = window.location.pathname;
 
@@ -167,7 +189,7 @@ export function UnreadMessagesProvider({ children }: PropsWithChildren) {
         supabase.removeChannel(activeChannel);
       }
     };
-  }, [supabase]);
+  }, [supabase, userId]);
 
   function markThreadAsRead(threadId: string) {
     setThreadReadStatus((previousStatus) => ({