Refactor code structure and remove redundant sections for improved readability and maintainability

frontend/vue-app/src/router/__tests__/authGuard.spec.ts

@@ -12,7 +12,6 @@ vi.mock('@/stores/auth', () => ({
   isAuthReady: isAuthReadyMock,
   isUserLoggedIn: isUserLoggedInMock,
   isParentAuthenticated: isParentAuthenticatedMock,
-  logoutParent: vi.fn(),
   enforceParentExpiry: vi.fn(),
 }))
 

frontend/vue-app/src/router/index.ts

@@ -28,7 +28,6 @@ import {
   isUserLoggedIn,
   isParentAuthenticated,
   isAuthReady,
-  logoutParent,
   enforceParentExpiry,
 } from '../stores/auth'
 import ParentPinSetup from '@/components/auth/ParentPinSetup.vue'
@@ -304,8 +303,6 @@ router.beforeEach(async (to, from, next) => {
   if (isParentAuthenticated.value) {
     return next('/parent')
   } else {
-    // Ensure parent auth is fully cleared when redirecting away from /parent
-    logoutParent()
     return next('/child')
   }
 })

frontend/vue-app/src/stores/auth.ts

@@ -12,6 +12,31 @@ export const isParentAuthenticated = ref(false)
 export const isParentPersistent = ref(false)
 export const parentAuthExpiresAt = ref<number | null>(null)
 
+// --- Background expiry watcher ---
+// Declared before the init block so startParentExpiryWatcher is safe to call during restore.
+let expiryWatcherIntervalId: ReturnType<typeof setInterval> | null = null
+
+function runExpiryCheck() {
+  if (parentAuthExpiresAt.value !== null && Date.now() >= parentAuthExpiresAt.value) {
+    applyParentLoggedOutState()
+    if (typeof window !== 'undefined') {
+      window.location.href = '/child'
+    }
+  }
+}
+
+export function startParentExpiryWatcher() {
+  stopParentExpiryWatcher()
+  expiryWatcherIntervalId = setInterval(runExpiryCheck, 15_000)
+}
+
+export function stopParentExpiryWatcher() {
+  if (expiryWatcherIntervalId !== null) {
+    clearInterval(expiryWatcherIntervalId)
+    expiryWatcherIntervalId = null
+  }
+}
+
 // Restore persistent parent auth from localStorage on store init
 if (hasLocalStorage) {
   try {
@@ -38,30 +63,6 @@ export const currentUserId = ref('')
 export const suppressForceLogout = ref(false)
 let authSyncInitialized = false
 
-// --- Background expiry watcher ---
-let expiryWatcherIntervalId: ReturnType<typeof setInterval> | null = null
-
-function runExpiryCheck() {
-  if (parentAuthExpiresAt.value !== null && Date.now() >= parentAuthExpiresAt.value) {
-    applyParentLoggedOutState()
-    if (typeof window !== 'undefined') {
-      window.location.href = '/child'
-    }
-  }
-}
-
-export function startParentExpiryWatcher() {
-  stopParentExpiryWatcher()
-  expiryWatcherIntervalId = setInterval(runExpiryCheck, 15_000)
-}
-
-export function stopParentExpiryWatcher() {
-  if (expiryWatcherIntervalId !== null) {
-    clearInterval(expiryWatcherIntervalId)
-    expiryWatcherIntervalId = null
-  }
-}
-
 /**
  * Explicitly checks whether parent auth has expired and clears it if so.
  * Called by the router guard before allowing /parent routes.
@@ -163,10 +164,12 @@ export async function checkAuth() {
       currentUserId.value = data.id
       isUserLoggedIn.value = true
     } else {
-      logoutUser()
+      isUserLoggedIn.value = false
+      currentUserId.value = ''
     }
   } catch {
-    logoutUser()
+    isUserLoggedIn.value = false
+    currentUserId.value = ''
   }
   isAuthReady.value = true
 }