07cafeedbc
When an authorization server returns an `id_token` alongside the access token, the Inspector already persisted it and never showed it. Wire it through to Connection Info as a viewer. - Generalize `OAuthAccessTokenField` into `OAuthTokenField` (label + token), so the ID Token row reuses the existing copy control and "Decode JWT" toggle rather than duplicating them. Access-token behavior is unchanged. - `oauthDetailsFromConnectionState` now surfaces `tokens.id_token` as `idToken`, omitted entirely when absent so no empty row renders. - Docs: update the two `specification/` references to the renamed field. This is deliberately a viewer, not a flow: no OIDC login mode, no signature verification, and the `id_token` is never treated as a credential. The EMA path is untouched. `id_token` is already in `maskSecrets`' `JSON_SENSITIVE_KEYS`, so it stays masked in the Network tab — no gap. Signed-off-by: cliffhall <cliff@futurescale.com>
566 lines
19 KiB
TypeScript
566 lines
19 KiB
TypeScript
import { describe, it, expect, vi } from "vitest";
|
|
import userEvent from "@testing-library/user-event";
|
|
import type {
|
|
ClientCapabilities,
|
|
InitializeResult,
|
|
} from "@modelcontextprotocol/client";
|
|
import { renderWithMantine, screen } from "../../../test/renderWithMantine";
|
|
import {
|
|
CLEAR_OAUTH_STATE_AND_DISCONNECT_LABEL,
|
|
ConnectionInfoContent,
|
|
SERVER_INFO_NOT_REPORTED_LABEL,
|
|
} from "./ConnectionInfoContent";
|
|
|
|
const fullResult: InitializeResult = {
|
|
protocolVersion: "2025-03-26",
|
|
serverInfo: { name: "Everything Server", version: "2.1.0" },
|
|
capabilities: {
|
|
tools: { listChanged: true },
|
|
resources: { subscribe: true },
|
|
prompts: { listChanged: true },
|
|
logging: {},
|
|
completions: {},
|
|
},
|
|
instructions: "Use tools/list first.",
|
|
};
|
|
|
|
const fullClientCaps: ClientCapabilities = {
|
|
roots: { listChanged: true },
|
|
sampling: {},
|
|
elicitation: {},
|
|
experimental: {},
|
|
};
|
|
|
|
describe("ConnectionInfoContent", () => {
|
|
it("renders server implementation fields under the heading", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="stdio"
|
|
/>,
|
|
);
|
|
expect(screen.getByText("Server Implementation")).toBeInTheDocument();
|
|
expect(screen.getByText("Everything Server")).toBeInTheDocument();
|
|
expect(screen.getByText("2.1.0")).toBeInTheDocument();
|
|
expect(screen.getByText("2025-03-26")).toBeInTheDocument();
|
|
expect(screen.getByText("stdio")).toBeInTheDocument();
|
|
});
|
|
|
|
it("renders an em-dash when server version is missing", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={{
|
|
...fullResult,
|
|
serverInfo: { name: "No Version Server" } as never,
|
|
}}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="stdio"
|
|
/>,
|
|
);
|
|
// Exactly three em dashes: the missing server version, plus the two
|
|
// extension sections (the fixtures advertise none on either side).
|
|
expect(screen.getAllByText("—")).toHaveLength(3);
|
|
});
|
|
|
|
it("renders an em-dash when the reported version is an empty string", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={{
|
|
...fullResult,
|
|
serverInfo: { name: "Empty Version Server", version: "" },
|
|
}}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="stdio"
|
|
/>,
|
|
);
|
|
// An empty version reads as unknown ("—"), not a blank row (#1772).
|
|
expect(screen.getByText("Empty Version Server")).toBeInTheDocument();
|
|
expect(screen.getAllByText("—")).toHaveLength(3);
|
|
});
|
|
|
|
it("renders an em-dash when the reported name is an empty string", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={{
|
|
...fullResult,
|
|
serverInfo: { name: "", version: "1.0.0" },
|
|
}}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="stdio"
|
|
/>,
|
|
);
|
|
// `initialize` mandates the name field, not a non-empty value, so an empty
|
|
// reported name also reads as unknown ("—") — symmetric with version.
|
|
expect(screen.getByText("1.0.0")).toBeInTheDocument();
|
|
expect(screen.getAllByText("—")).toHaveLength(3);
|
|
});
|
|
|
|
it("renders an em-dash when the reported name is missing", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={{
|
|
...fullResult,
|
|
// Non-conforming server: `name` is runtime-absent (the field is typed
|
|
// non-null). Pins the `?.trim()` tolerance — symmetric with the
|
|
// "version is missing" test above — so it reads "—", not a crash.
|
|
serverInfo: { version: "1.0.0" } as never,
|
|
}}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="stdio"
|
|
/>,
|
|
);
|
|
expect(screen.getByText("1.0.0")).toBeInTheDocument();
|
|
expect(screen.getAllByText("—")).toHaveLength(3);
|
|
});
|
|
|
|
it("renders an em-dash when the reported name is whitespace-only", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={{
|
|
...fullResult,
|
|
serverInfo: { name: " ", version: "1.0.0" },
|
|
}}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="stdio"
|
|
/>,
|
|
);
|
|
// A whitespace-only reported name is the same non-conforming class as an
|
|
// empty one (#1774): it must read as unknown ("—"), not a visually blank
|
|
// row. Stays faithful — never borrows the catalog name.
|
|
expect(screen.getByText("1.0.0")).toBeInTheDocument();
|
|
expect(screen.getAllByText("—")).toHaveLength(3);
|
|
});
|
|
|
|
it("shows 'not reported' for name and version when serverInfo was not reported", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={{
|
|
...fullResult,
|
|
// App synthesizes a catalog-name fallback here when a modern server
|
|
// omits serverInfo; the modal must not present it as server-reported.
|
|
serverInfo: { name: "my-catalog-name", version: "" },
|
|
}}
|
|
serverInfoReported={false}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
/>,
|
|
);
|
|
// The inferred catalog name is NOT shown as the server's reported name...
|
|
expect(screen.queryByText("my-catalog-name")).not.toBeInTheDocument();
|
|
// ...both Name and Version read as not reported instead.
|
|
expect(screen.getAllByText(SERVER_INFO_NOT_REPORTED_LABEL)).toHaveLength(2);
|
|
});
|
|
|
|
it("renders an em-dash when the protocol version is empty", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={{ ...fullResult, protocolVersion: "" }}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="stdio"
|
|
/>,
|
|
);
|
|
// App supplies `protocolVersion ?? ""`; an empty one reads as unknown ("—"),
|
|
// symmetric with Name/Version (#1772).
|
|
expect(screen.getAllByText("—")).toHaveLength(3);
|
|
});
|
|
|
|
it("renders server and client capability sections", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="stdio"
|
|
/>,
|
|
);
|
|
expect(screen.getByText("Server Capabilities")).toBeInTheDocument();
|
|
expect(screen.getByText("Client Capabilities")).toBeInTheDocument();
|
|
expect(screen.getByText("Tools")).toBeInTheDocument();
|
|
expect(screen.getByText("Resources")).toBeInTheDocument();
|
|
expect(screen.getByText("Roots")).toBeInTheDocument();
|
|
expect(screen.getByText("Sampling")).toBeInTheDocument();
|
|
});
|
|
|
|
it("renders instructions when present", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="stdio"
|
|
/>,
|
|
);
|
|
expect(screen.getByText("Server Instructions")).toBeInTheDocument();
|
|
expect(screen.getByText("Use tools/list first.")).toBeInTheDocument();
|
|
});
|
|
|
|
it("omits the instructions section when not present", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={{ ...fullResult, instructions: undefined }}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="stdio"
|
|
/>,
|
|
);
|
|
expect(screen.queryByText("Server Instructions")).not.toBeInTheDocument();
|
|
});
|
|
|
|
it("defaults to the Legacy era, and marks the session N/A for stdio", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="stdio"
|
|
/>,
|
|
);
|
|
expect(screen.getByText("Era")).toBeInTheDocument();
|
|
expect(screen.getByText("Legacy")).toBeInTheDocument();
|
|
// stdio has no HTTP session concept.
|
|
expect(screen.getByText("N/A (stdio)")).toBeInTheDocument();
|
|
// No discover result → no Discovery section.
|
|
expect(screen.queryByText("Discovery")).not.toBeInTheDocument();
|
|
});
|
|
|
|
it("marks a legacy HTTP connection as session-based", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
protocolEra="legacy"
|
|
/>,
|
|
);
|
|
expect(screen.getByText("Legacy")).toBeInTheDocument();
|
|
expect(screen.getByText("Session-based")).toBeInTheDocument();
|
|
});
|
|
|
|
it("shows the Modern era as sessionless and renders the discovery section", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
protocolEra="modern"
|
|
discoverResult={{
|
|
supportedVersions: ["2026-07-28", "2025-11-25"],
|
|
serverInfo: { name: "Everything Server", version: "2.1.0" },
|
|
capabilities: {
|
|
tools: {},
|
|
extensions: {
|
|
"io.modelcontextprotocol/tasks": {},
|
|
},
|
|
},
|
|
}}
|
|
/>,
|
|
);
|
|
expect(screen.getByText("Modern")).toBeInTheDocument();
|
|
expect(screen.getByText("Sessionless")).toBeInTheDocument();
|
|
expect(screen.getByText("Discovery")).toBeInTheDocument();
|
|
expect(screen.getByText("2026-07-28, 2025-11-25")).toBeInTheDocument();
|
|
});
|
|
|
|
it("renders an em-dash for empty supported versions in Discovery", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
protocolEra="modern"
|
|
discoverResult={{
|
|
supportedVersions: [],
|
|
serverInfo: { name: "Everything Server", version: "2.1.0" },
|
|
capabilities: { tools: {} },
|
|
}}
|
|
/>,
|
|
);
|
|
expect(screen.getByText("Supported versions")).toBeInTheDocument();
|
|
// Extensions moved out of Discovery into their own era-transparent section.
|
|
expect(screen.queryByText("Discovery")).toBeInTheDocument();
|
|
// Exactly three em dashes: empty supported versions, plus the two extension
|
|
// sections (the fixtures advertise none).
|
|
expect(screen.getAllByText("—")).toHaveLength(3);
|
|
});
|
|
|
|
it("shows server extensions on a LEGACY connection (no discovery), from server capabilities (#1740)", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={{
|
|
...fullResult,
|
|
capabilities: {
|
|
...fullResult.capabilities,
|
|
extensions: { "io.modelcontextprotocol/tasks": {} },
|
|
},
|
|
}}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
protocolEra="legacy"
|
|
/>,
|
|
);
|
|
// No discoverResult (legacy) but the server's extension still renders,
|
|
// sourced from the negotiated server capabilities rather than discovery.
|
|
expect(screen.queryByText("Discovery")).not.toBeInTheDocument();
|
|
expect(screen.getByText("Server Extensions")).toBeInTheDocument();
|
|
expect(
|
|
screen.getByText("io.modelcontextprotocol/tasks"),
|
|
).toBeInTheDocument();
|
|
});
|
|
|
|
it("shows the Inspector's own advertised extensions (#1740)", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={{
|
|
...fullClientCaps,
|
|
extensions: {
|
|
"io.modelcontextprotocol/tasks": {},
|
|
"io.modelcontextprotocol/ui": { mimeTypes: ["text/html"] },
|
|
},
|
|
}}
|
|
transport="streamable-http"
|
|
protocolEra="legacy"
|
|
/>,
|
|
);
|
|
expect(
|
|
screen.getByText("Client Advertised Extensions"),
|
|
).toBeInTheDocument();
|
|
expect(
|
|
screen.getByText(
|
|
"io.modelcontextprotocol/tasks, io.modelcontextprotocol/ui",
|
|
),
|
|
).toBeInTheDocument();
|
|
});
|
|
|
|
it("renders em-dashes for the extensions sections when neither side advertises any (#1740)", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
protocolEra="legacy"
|
|
/>,
|
|
);
|
|
expect(screen.getByText("Server Extensions")).toBeInTheDocument();
|
|
expect(
|
|
screen.getByText("Client Advertised Extensions"),
|
|
).toBeInTheDocument();
|
|
// Exactly two em dashes: the two extension sections (the server version is
|
|
// present in the fixture, so it does not em-dash).
|
|
expect(screen.getAllByText("—")).toHaveLength(2);
|
|
});
|
|
|
|
it("renders client registration kind when provided", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
oauth={{
|
|
protocol: "standard",
|
|
authorized: true,
|
|
clientId:
|
|
"https://www.mcpjam.com/.well-known/oauth/client-metadata.json",
|
|
clientRegistrationKind: "cimd",
|
|
}}
|
|
/>,
|
|
);
|
|
expect(screen.getByText("Client registration")).toBeInTheDocument();
|
|
expect(screen.getByText("Client ID Metadata (CIMD)")).toBeInTheDocument();
|
|
});
|
|
|
|
it("renders OAuth details when provided", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
oauth={{
|
|
protocol: "standard",
|
|
authorized: true,
|
|
clientId: "client-abc",
|
|
authUrl: "https://auth.example.com/authorize",
|
|
scopes: ["read", "write"],
|
|
accessToken: "token-123",
|
|
}}
|
|
/>,
|
|
);
|
|
expect(screen.getByText("OAuth Details")).toBeInTheDocument();
|
|
expect(screen.getByText("Standard")).toBeInTheDocument();
|
|
expect(screen.getByText("Authorized")).toBeInTheDocument();
|
|
expect(screen.getByText("client-abc")).toBeInTheDocument();
|
|
expect(screen.getByText("Auth URL")).toBeInTheDocument();
|
|
expect(
|
|
screen.getByText("https://auth.example.com/authorize"),
|
|
).toBeInTheDocument();
|
|
expect(screen.getByText("read, write")).toBeInTheDocument();
|
|
expect(screen.getByText("token-123")).toBeInTheDocument();
|
|
});
|
|
|
|
it("renders EMA idp session when provided", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
oauth={{
|
|
protocol: "ema",
|
|
authorized: true,
|
|
idpSession: "logged_in",
|
|
}}
|
|
/>,
|
|
);
|
|
expect(screen.getByText("Enterprise-managed")).toBeInTheDocument();
|
|
expect(screen.getByText("IdP session")).toBeInTheDocument();
|
|
expect(screen.getByText("Signed in")).toBeInTheDocument();
|
|
});
|
|
|
|
it("renders the EMA idp session as Session expired", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
oauth={{
|
|
protocol: "ema",
|
|
authorized: false,
|
|
idpSession: "expired",
|
|
}}
|
|
/>,
|
|
);
|
|
expect(screen.getByText("IdP session")).toBeInTheDocument();
|
|
expect(screen.getByText("Session expired")).toBeInTheDocument();
|
|
});
|
|
|
|
it("renders the EMA idp session as Not signed in for the none state", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
oauth={{
|
|
protocol: "ema",
|
|
authorized: false,
|
|
idpSession: "none",
|
|
}}
|
|
/>,
|
|
);
|
|
expect(screen.getByText("IdP session")).toBeInTheDocument();
|
|
expect(screen.getByText("Not signed in")).toBeInTheDocument();
|
|
});
|
|
|
|
it("omits the IdP session row when EMA oauth has no idpSession", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
oauth={{ protocol: "ema", authorized: true }}
|
|
/>,
|
|
);
|
|
expect(screen.getByText("Enterprise-managed")).toBeInTheDocument();
|
|
expect(screen.queryByText("IdP session")).not.toBeInTheDocument();
|
|
});
|
|
|
|
it("hides optional OAuth fields that are not provided", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="stdio"
|
|
oauth={{ protocol: "standard", authorized: false }}
|
|
/>,
|
|
);
|
|
expect(screen.getByText("OAuth Details")).toBeInTheDocument();
|
|
expect(screen.getByText("Not authorized")).toBeInTheDocument();
|
|
expect(screen.queryByText("Auth URL")).not.toBeInTheDocument();
|
|
expect(screen.queryByText("Scopes")).not.toBeInTheDocument();
|
|
expect(screen.queryByText("Access Token")).not.toBeInTheDocument();
|
|
expect(screen.queryByText("ID Token")).not.toBeInTheDocument();
|
|
});
|
|
|
|
it("renders the ID Token row when the token set carries one", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
oauth={{
|
|
protocol: "standard",
|
|
authorized: true,
|
|
accessToken: "token-123",
|
|
idToken: "id-token-456",
|
|
}}
|
|
/>,
|
|
);
|
|
expect(screen.getByText("Access Token")).toBeInTheDocument();
|
|
expect(screen.getByText("ID Token")).toBeInTheDocument();
|
|
expect(screen.getByText("id-token-456")).toBeInTheDocument();
|
|
});
|
|
|
|
it("renders the ID Token row on its own when there is no access token", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
oauth={{
|
|
protocol: "standard",
|
|
authorized: true,
|
|
idToken: "id-token-456",
|
|
}}
|
|
/>,
|
|
);
|
|
expect(screen.queryByText("Access Token")).not.toBeInTheDocument();
|
|
expect(screen.getByText("ID Token")).toBeInTheDocument();
|
|
});
|
|
|
|
it("omits the ID Token row when only an access token is present", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
oauth={{
|
|
protocol: "standard",
|
|
authorized: true,
|
|
accessToken: "token-123",
|
|
}}
|
|
/>,
|
|
);
|
|
expect(screen.getByText("Access Token")).toBeInTheDocument();
|
|
expect(screen.queryByText("ID Token")).not.toBeInTheDocument();
|
|
});
|
|
|
|
it("does not render OAuth section when oauth prop is omitted", () => {
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="stdio"
|
|
/>,
|
|
);
|
|
expect(screen.queryByText("OAuth Details")).not.toBeInTheDocument();
|
|
});
|
|
|
|
it("calls onClearOAuth from the OAuth section", async () => {
|
|
const user = userEvent.setup();
|
|
const onClearOAuth = vi.fn();
|
|
renderWithMantine(
|
|
<ConnectionInfoContent
|
|
initializeResult={fullResult}
|
|
clientCapabilities={fullClientCaps}
|
|
transport="streamable-http"
|
|
oauth={{
|
|
protocol: "standard",
|
|
authorized: true,
|
|
clientId: "client-abc",
|
|
}}
|
|
onClearOAuth={onClearOAuth}
|
|
/>,
|
|
);
|
|
await user.click(
|
|
screen.getByRole("button", {
|
|
name: CLEAR_OAUTH_STATE_AND_DISCONNECT_LABEL,
|
|
}),
|
|
);
|
|
expect(onClearOAuth).toHaveBeenCalledTimes(1);
|
|
});
|
|
});
|