hansjone/oclaw
1
0
Fork 0
mirror of https://github.com/hansjone/oclaw.git synced 2026-10-17 17:03:22 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Keep emergency login visible when QR fetch fails.

Browse source 
Status probes often fail with the QR request, so default fallback on and always show the link on QR error/expiry.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-09-10 02:04:42 +08:00
parent e2c2e949ed
commit 627e61aa80
1 changed files with 16 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

19
uds-auth/lib/client.js
View file

@ -990,7 +990,9 @@ function reloadAfterLogin() {
const [qrExpired, setQrExpired] = useState(false) const [qrExpired, setQrExpired] = useState(false)
const [qrFailed, setQrFailed] = useState(false) const [qrFailed, setQrFailed] = useState(false)
const [loginMode, setLoginMode] = useState('qr') const [loginMode, setLoginMode] = useState('qr')
const [fallbackEnabled, setFallbackEnabled] = useState(false) // Default true (server enables fallback by default). If status fetch fails
// while QR is also down, keep the emergency link visible so admins can still sign in.
const [fallbackEnabled, setFallbackEnabled] = useState(true)
const [fbUser, setFbUser] = useState('administrator') const [fbUser, setFbUser] = useState('administrator')
const [fbPass, setFbPass] = useState('') const [fbPass, setFbPass] = useState('')
const [fbBusy, setFbBusy] = useState(false) const [fbBusy, setFbBusy] = useState(false)
@ -1202,10 +1204,20 @@ function reloadAfterLogin() {
.catch(() => {}) .catch(() => {})
fetchJson('/uds-auth/api/fallback/status') fetchJson('/uds-auth/api/fallback/status')
.then((st) => setFallbackEnabled(!!st.enabled)) .then((st) => setFallbackEnabled(!!st.enabled))
.catch(() => {}) .catch(() => { /* keep default true — do not hide emergency login */ })
return () => { stopQr() } return () => { stopQr() }
}, [refreshUser, stopQr]) }, [refreshUser, stopQr])
useEffect(() => {
if (!open || user) return undefined
// Refresh status each time the panel opens (mount may have raced/failed).
let cancelled = false
fetchJson('/uds-auth/api/fallback/status')
.then((st) => { if (!cancelled) setFallbackEnabled(!!st.enabled) })
.catch(() => {})
return () => { cancelled = true }
}, [open, user])
useEffect(() => { useEffect(() => {
if (open && !user && loginMode === 'qr') startQr() if (open && !user && loginMode === 'qr') startQr()
if (!open || loginMode !== 'qr') stopQr() if (!open || loginMode !== 'qr') stopQr()
@ -1308,7 +1320,8 @@ function reloadAfterLogin() {
), ),
!qrOverlay && h('div', { className: 'uds-auth-qr-status' }, qrStatus || t('ui.loading')), !qrOverlay && h('div', { className: 'uds-auth-qr-status' }, qrStatus || t('ui.loading')),
), ),
fallbackEnabled && h('button', { // Always offer emergency login when QR failed/expired; otherwise only if enabled.
(fallbackEnabled || qrFailed || qrExpired) && h('button', {
type: 'button', type: 'button',
className: 'uds-auth-btn-link', className: 'uds-auth-btn-link',
onClick: () => { stopQr(); setLoginMode('fallback'); setFbErr('') }, onClick: () => { stopQr(); setLoginMode('fallback'); setFbErr('') },