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

Fix fallback_admin missing workspaces after fresh login.

Browse source 
Wait for WS identity before emptying workspace.follow, and hard-reload after login so the first subscribe is not stuck with an anonymous empty baseline.

Co-authored-by: Cursor <cursoragent@cursor.com>
This commit is contained in:
oliver 2026-09-08 11:27:05 +08:00
parent 3e5c1f846e
commit e479fe0833
2 changed files with 19 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -146,13 +146,10 @@ window.__ModuleLoader__.load({
}
function reconnectAfterLogin() {
try {
if (typeof window.__udsAuthReconnect === 'function') {
window.__udsAuthReconnect()
return
}
} catch { /* fall through */ }
window.location.reload()
// Soft WS reconnect often keeps a workspace.follow subscription that was
// opened while anonymous (empty workspace list). Full reload makes the
// first follow run with fallback/UDS cookies so historical workspaces show.
try { window.location.reload() } catch { /* ignore */ }
}
function getAuthToken() {

17
uds-auth/lib/dsh-acl.js
View file

@ -535,9 +535,22 @@ export function installDshAcl(ctx, {
const origFollow = wc.follow.bind(wc)
wc.follow = async function* (signal) {
const identity = getUserContext()
let identity = getUserContext()
// Subscribe can race ahead of WS message-listener ALS bind (common right
// after fallback login / soft reconnect). Wait briefly before treating
// the stream as anonymous — otherwise every historical workspace is
// dropped and sessions collapse into 未分组.
if (!identity?.empNo) {
const deadline = Date.now() + 800
while (!identity?.empNo && Date.now() < deadline) {
await new Promise((r) => setTimeout(r, 40))
identity = getUserContext()
}
}
// Super / fallback: passthrough — never drop historical workspaces.
if (identity?.permissions?.canViewAllSessions) {
if (identity?.permissions?.canViewAllSessions
|| identity?.role === 'fallback_admin'
|| identity?.role === 'super_admin') {
yield* origFollow(signal)
return
}