ee51d5abcd
- Enable ProTable search on Accounts (username/email), Models (model_id/alias), Providers (display_name/name) with hideInSearch for non-searchable columns - Add scenarios (Select tags) and quick_commands (Form.List) to AgentTemplates create form, plus service type updates - Remove unused quota_reset_interval from ProviderKey model, key_pool SQL, handlers, and frontend types; add migration + bump schema to v11 - Add Vitest config, test setup, request interceptor tests (7 cases), authStore tests (8 cases) — all 15 passing Co-Authored-By: Claude Opus 4.6 <noreply@anthropic.com>
65 lines
2.1 KiB
TypeScript
65 lines
2.1 KiB
TypeScript
// ============================================================
|
|
// ZCLAW Admin V2 — Auth Guard with session restore
|
|
// ============================================================
|
|
//
|
|
// Auth strategy:
|
|
// 1. If Zustand has token (normal flow after login) → authenticated
|
|
// 2. If no token but account in localStorage → call GET /auth/me
|
|
// to validate HttpOnly cookie and restore session
|
|
// 3. If cookie invalid → clean up and redirect to /login
|
|
|
|
import { useEffect, useRef, useState } from 'react'
|
|
import { Navigate, useLocation } from 'react-router-dom'
|
|
import { Spin } from 'antd'
|
|
import { useAuthStore } from '@/stores/authStore'
|
|
import { authService } from '@/services/auth'
|
|
|
|
export function AuthGuard({ children }: { children: React.ReactNode }) {
|
|
const token = useAuthStore((s) => s.token)
|
|
const account = useAuthStore((s) => s.account)
|
|
const login = useAuthStore((s) => s.login)
|
|
const logout = useAuthStore((s) => s.logout)
|
|
const location = useLocation()
|
|
|
|
// Track restore attempt to avoid double-calling
|
|
const restoreAttempted = useRef(false)
|
|
const [restoring, setRestoring] = useState(false)
|
|
|
|
useEffect(() => {
|
|
if (restoreAttempted.current) return
|
|
restoreAttempted.current = true
|
|
|
|
// If no in-memory token but account exists in localStorage,
|
|
// try to validate the HttpOnly cookie via /auth/me
|
|
if (!token && account) {
|
|
setRestoring(true)
|
|
authService.me()
|
|
.then((meAccount) => {
|
|
// Cookie is valid — restore session
|
|
// Use sentinel token since real auth is via HttpOnly cookie
|
|
login('cookie-session', '', meAccount)
|
|
setRestoring(false)
|
|
})
|
|
.catch(() => {
|
|
// Cookie expired or invalid — clean up stale data
|
|
logout()
|
|
setRestoring(false)
|
|
})
|
|
}
|
|
}, []) // eslint-disable-line react-hooks/exhaustive-deps
|
|
|
|
if (restoring) {
|
|
return (
|
|
<div style={{ display: 'flex', justifyContent: 'center', alignItems: 'center', height: '100vh' }}>
|
|
<Spin size="large" />
|
|
</div>
|
|
)
|
|
}
|
|
|
|
if (!token) {
|
|
return <Navigate to="/login" state={{ from: location }} replace />
|
|
}
|
|
|
|
return <>{children}</>
|
|
}
|