fix(web,mobile): fix router guard blocking login pages and window.db race condition

Author: pmigueld

packages/mobile/src/database/index.ts

@@ -220,10 +220,6 @@ export async function getDatabase(): Promise<RxDatabase> {
     }
   }
 
-  if (import.meta.env.DEV && import.meta.env.VITE_DEVELOP) {
-    ;(window as unknown as { db: RxDatabase }).db = dbInstance // write to window for debugging
-  }
-
   console.log('setting up collections...')
   try {
     await dbInstance.addCollections({
@@ -260,6 +256,9 @@ export async function getDatabase(): Promise<RxDatabase> {
         schema: TenantAppSchema
       }
     })
+    if (import.meta.env.DEV && import.meta.env.VITE_DEVELOP) {
+      ;(window as unknown as { db: RxDatabase }).db = dbInstance // write to window for debugging
+    }
   } catch (error) {
     console.error('Error adding collections:', error)
     if (

packages/web/src/router/index.ts

@@ -136,7 +136,7 @@ router.beforeEach((to, _from, next) => {
     return;
   }
 
-  if (to.meta.userType && authStore.userType !== to.meta.userType) {
+  if (to.meta.userType && authStore.userType && authStore.userType !== to.meta.userType) {
     next({ name: "home" });
     return;
   }

packages/web/src/stores/__tests__/auth.spec.ts

@@ -95,8 +95,8 @@ describe('useAuthStore', () => {
       const store = useAuthStore()
       await store.loginAsAgent({ email: 'agent@test.com', password: 'pass' })
 
-      expect(localStorage.getItem('web_token')).toBe(mockToken)
-      expect(localStorage.getItem('web_user_type')).toBe('agent')
+      expect(sessionStorage.getItem('web_token')).toBe(mockToken)
+      expect(sessionStorage.getItem('web_user_type')).toBe('agent')
     })
   })
 
@@ -162,22 +162,22 @@ describe('useAuthStore', () => {
       expect(store.token).toBeNull()
       expect(store.agentPayload).toBeNull()
       expect(store.citizenPayload).toBeNull()
-      expect(localStorage.getItem('web_token')).toBeNull()
+      expect(sessionStorage.getItem('web_token')).toBeNull()
       expect(sessionStorage.getItem('web_citizen_token')).toBeNull()
     })
   })
 
   describe('initializeAuth', () => {
-    it('restores agent session from localStorage', () => {
+    it('restores agent session from sessionStorage', () => {
       const mockToken = createMockJwt({
         id: '1',
         email: 'agent@test.com',
         role: 'USER',
         exp: Math.floor(Date.now() / 1000) + 3600,
       })
 
-      localStorage.setItem('web_token', mockToken)
-      localStorage.setItem('web_user_type', 'agent')
+      sessionStorage.setItem('web_token', mockToken)
+      sessionStorage.setItem('web_user_type', 'agent')
 
       const store = useAuthStore()
       store.initializeAuth()
@@ -214,14 +214,14 @@ describe('useAuthStore', () => {
         exp: Math.floor(Date.now() / 1000) - 100, // expired
       })
 
-      localStorage.setItem('web_token', mockToken)
-      localStorage.setItem('web_user_type', 'agent')
+      sessionStorage.setItem('web_token', mockToken)
+      sessionStorage.setItem('web_user_type', 'agent')
 
       const store = useAuthStore()
       store.initializeAuth()
 
       expect(store.isAuthenticated).toBe(false)
-      expect(localStorage.getItem('web_token')).toBeNull()
+      expect(sessionStorage.getItem('web_token')).toBeNull()
     })
 
     it('logs out when citizen token is expired', () => {