fix(auth): RFC-encode the Basic credential; make the TUI clear await its work (#2144)

Copilot review round 6.

- The Basic credential is now form-urlencoded per RFC 6749 §2.3.1. Round 1
  matched the SDK's raw `id:secret` on the theory that a credential should be
  presented the same way here as at the token endpoint; that does not hold — a
  client authenticated with `client_secret_post` never exercised the SDK's
  Basic path, so there is no precedent to match, and the raw form is ambiguous
  for an id containing `:` and makes `btoa` throw on a non-Latin-1 secret. The
  fixture decodes each half.
- The ctx-less grant read is suppressed on the store's issuer *stamp* rather
  than on the token's value. The active slot can hold client information
  without a token, in which case the read falls back to the legacy grant — and
  a value collision with any other issuer would have dropped that grant
  unrevoked and unreported.
- The TUI announced "OAuth state cleared" on the keypress, so with a bounded
  revocation request it said so while the work was still in flight and then
  removed it when the work finished. `onClearOAuth` returns a promise;
  `AuthTab` shows "Clearing OAuth state…" until it settles, ignores repeats
  while one is in flight, and skips exactly the revision bump its own clear
  caused so the confirmation is not immediately reset by it.
- `handleClearOAuth` now claims an attempt and retires a superseded one, the
  way `handleDisconnect` does: the await can keep it suspended for seconds,
  long enough for the user to switch servers and have server A's outcome —
  including its disconnect — land on server B.

Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_0177mPHAdECD18nLLCTwR5rh
Signed-off-by: cliffhall <cliff@futurescale.com>
This commit is contained in:
cliffhall 2026-08-28 03:40:40 -04:00
commit 56ac83051b

View file

@ -183,6 +183,8 @@ function App({
const [connectError, setConnectError] = useState<string | null>(null);
// Monotonic token for in-flight disconnects — see handleDisconnect.
const disconnectAttemptRef = useRef(0);
/** Retires a superseded "clear OAuth state" the way disconnects are (#2144). */
const clearOAuthAttemptRef = useRef(0);
// A failed disconnect is deliberately NOT folded into `connectError`. That
// one is only rendered by InfoTab when the status is "error", which a
// rejected disconnect leaves untouched (the status stays "connected"), so
@ -949,13 +951,27 @@ function App({
const handleClearOAuth = useCallback(async () => {
if (!selectedInspectorClient) return;
// RFC 7009 (#2144). Best-effort: the outcome is reported in the status
// line, never thrown, so clearing always completes. The per-server
// `oauthRevokeOnClear` opt-out is honored here the same way the web client
// honors it.
// Claim this attempt before awaiting, exactly as `handleDisconnect` does.
// The RFC 7009 leg is a bounded network request, so this callback can now
// stay suspended for seconds — long enough for the user to switch servers,
// at which point publishing this result would put server A's outcome on
// server B (and would race a second clear over the same state). (#2144)
const attempt = ++clearOAuthAttemptRef.current;
const attemptServer = selectedServer;
// RFC 7009. Best-effort: the outcome is reported in the status line, never
// thrown, so clearing always completes. The per-server `oauthRevokeOnClear`
// opt-out is honored here the same way the web client honors it.
const revocation = await selectedInspectorClient.clearOAuthTokens({
revoke: selectedServerEntry?.settings?.oauthRevokeOnClear !== false,
});
// The local clear has happened either way — only the *reporting* is
// retired, so a superseded attempt leaves no trace on the new selection.
if (
clearOAuthAttemptRef.current !== attempt ||
selectedServerRef.current !== attemptServer
) {
return;
}
setOauthStatus("idle");
if (revocation.status === "failed") {
const warning = `Cleared locally, but revoking the grant at the authorization server failed: ${revocation.detail}. It may still be valid there.`;
@ -971,6 +987,7 @@ function App({
setOauthRevision((n) => n + 1);
}, [
selectedInspectorClient,
selectedServer,
selectedServerEntry,
inspectorStatus,
disconnectInspector,