From fe3529b12d6c5c737487a5b573f2f8c54d995599 Mon Sep 17 00:00:00 2001
From: Trezy <tre@trezy.com>
Date: Thu, 18 Jun 2026 15:47:19 -0500
Subject: [PATCH] fix: prevent unauthenticated users from being redirected to
 setup

Signed-off-by: Trezy <tre@trezy.com>

Signed-off-by: Trezy <tre@trezy.com>
---
 web/src/app/dashboard/layout.tsx | 35 +++++++++++++++-----------------
 1 file changed, 16 insertions(+), 19 deletions(-)

diff --git a/web/src/app/dashboard/layout.tsx b/web/src/app/dashboard/layout.tsx
index d5eb626..892abe0 100644
--- a/web/src/app/dashboard/layout.tsx
+++ b/web/src/app/dashboard/layout.tsx
@@ -23,26 +23,23 @@ export default function DashboardLayout({
   const [setupChecked, setSetupChecked] = useState(false)
 
   useEffect(() => {
-    if (!did) {
-      router.replace("/login")
-    }
-  }, [did, router])
-
-  useEffect(() => {
-    if (did) {
-      getSetupStatus()
-        .then((status) => {
-          if (!status.setup_complete) {
-            router.replace("/setup")
-          } else {
-            setSetupChecked(true)
-          }
-        })
-        .catch(() => {
-          // If status endpoint fails (e.g. no table yet), allow through
+    getSetupStatus()
+      .then((status) => {
+        if (!status.setup_complete) {
+          router.replace("/setup")
+        } else if (!did) {
+          router.replace("/login")
+        } else {
+          setSetupChecked(true)
+        }
+      })
+      .catch(() => {
+        if (!did) {
+          router.replace("/login")
+        } else {
           setSetupChecked(true)
-        })
-    }
+        }
+      })
   }, [did, router])
 
   useEffect(() => {
-- 
2.51.2