fix: preserve org_id in auth refresh, fix org switcher navigation

This commit is contained in:
Usman Baig
2026-03-27 12:03:56 +01:00
parent 0ca65a50fb
commit 20628fa6ab

View File

@@ -110,11 +110,13 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
const refresh = useCallback(async () => { const refresh = useCallback(async () => {
try { try {
const session = await getSessionAction()
const userData = await apiRequest<User>('/auth/user/me') const userData = await apiRequest<User>('/auth/user/me')
const merged = { ...userData, org_id: session?.org_id ?? userData.org_id, role: session?.role ?? userData.role }
setUser(() => { setUser(() => {
localStorage.setItem('user', JSON.stringify(userData)) localStorage.setItem('user', JSON.stringify(merged))
return userData return merged
}) })
} catch (e) { } catch (e) {
logger.error('Failed to refresh user data', e) logger.error('Failed to refresh user data', e)