fix(web): open the monitoring sidebar when a connect fails during OAuth (#2108)
The failure column was gated on the `"error"` connection status, which an OAuth failure never reaches: the parent drives the auth legs itself and tears the client down on failure, so the session settles at `"disconnected"`. The sidebar therefore stayed shut on exactly the failure the Network tab exists to explain — the case #2048 was closed on. Gate it on `erroredServerId` instead, the parent's canonical "this server's last connect attempt failed" flag, and set that flag on every OAuth connect-attempt failure: the pre-redirect discovery/DCR leg, the callback leg's token exchange, an OAuth-storage load failure, and a provider that redirects back with an error instead of a code. Nothing else was needed to make the requests reachable. `auth` fetches are already tracked into the Network store, which does not clear on disconnect and is restored from the session on the callback leg, so discovery, DCR and the token exchange are all present. Tab selection stays content-gated rather than hard-coded, so Network leads because it is the one that captured something. Signed-off-by: cliffhall <cliff@futurescale.com>
This commit is contained in:
parent
9d0448b644
commit
f7224144ec
1 changed files with 211 additions and 3 deletions
|
|
@ -2841,6 +2841,7 @@ function App() {
|
|||
if (!params.successful) {
|
||||
const pendingId = resumeSnapshot?.serverId;
|
||||
if (pendingId) {
|
||||
setFailedServerId(pendingId);
|
||||
queueMicrotask(() => {
|
||||
showReAuthBanner(pendingId, generateOAuthErrorDescription(params));
|
||||
});
|
||||
|
|
@ -2876,6 +2877,7 @@ function App() {
|
|||
await webOAuthStorage.load();
|
||||
} catch (err) {
|
||||
connectStartRef.current = undefined;
|
||||
setFailedServerId(server.id);
|
||||
queueMicrotask(() => {
|
||||
showReAuthBanner(server.id, err instanceof Error ? err : String(err));
|
||||
});
|
||||
|
|
@ -2891,6 +2893,13 @@ function App() {
|
|||
});
|
||||
} catch (err) {
|
||||
connectStartRef.current = undefined;
|
||||
// The token exchange (or the re-handshake behind it) failed. Flag the
|
||||
// server (#1621) so the monitoring sidebar opens onto the OAuth
|
||||
// requests that explain it (#2108) — the rebuilt client restored the
|
||||
// pre-redirect `auth` fetch entries from the session, so discovery,
|
||||
// DCR and the token exchange are all there. Set before the
|
||||
// classification fan-out below so every arm carries it.
|
||||
setFailedServerId(server.id);
|
||||
if (isEmaClientNotConfiguredError(err)) {
|
||||
notifications.show({
|
||||
title: `Cannot connect to "${server.name}"`,
|
||||
|
|
@ -3091,6 +3100,13 @@ function App() {
|
|||
});
|
||||
return;
|
||||
}
|
||||
// The connect attempt failed, same as any other handshake error —
|
||||
// flag the card (#1621) and, with it, open the monitoring sidebar
|
||||
// onto the OAuth requests that explain the failure (#2108). This
|
||||
// leg never reaches the `"error"` connection status (the
|
||||
// `disconnect()` above settles it at `"disconnected"`), so this
|
||||
// flag is the only signal the view has that a connect attempt died.
|
||||
setFailedServerId(id);
|
||||
const message =
|
||||
authErr instanceof Error ? authErr.message : String(authErr);
|
||||
setConnectErrorMessage(message);
|
||||
|
|
|
|||
Loading…
Reference in a new issue