Merge pull request #2038 from modelcontextprotocol/v2/feat/1915-manual-server-headers

fix(web): correct the Custom Headers OAuth hint, name key/value rows for a11y (#2040)
This commit is contained in:
Cliff Hall 2026-08-16 23:36:32 -04:00 • committed by GitHub
commit e9a581d912
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 107 additions and 49 deletions

View file

@ -8,12 +8,15 @@ import {
type ServerSettingsSection, type ServerSettingsSection,
} from "./ServerSettingsForm"; } from "./ServerSettingsForm";
/** Find the "Clear" button living in the rightSection of `input`'s field. */ /** Find the clear button living in the rightSection of `input`'s field. The
* name is a prefix match because a KeyValueRows field names its clear button
* for the row it belongs to ("Clear header name, Cookie, row 1"), while a standalone
* field keeps the bare "Clear". */
function clearButtonFor(input: HTMLElement): HTMLElement { function clearButtonFor(input: HTMLElement): HTMLElement {
const root = const root =
input.closest('[class*="mantine-TextInput-root"]') ?? input.closest('[class*="mantine-TextInput-root"]') ??
input.closest('[class*="Input-wrapper"]'); input.closest('[class*="Input-wrapper"]');
return within(root as HTMLElement).getByRole("button", { name: "Clear" }); return within(root as HTMLElement).getByRole("button", { name: /^Clear/ });
} }
const emptySettings: InspectorServerSettings = { const emptySettings: InspectorServerSettings = {
@ -329,8 +332,11 @@ describe("ServerSettingsForm", () => {
expandedSections={["headers"]} expandedSections={["headers"]}
/>, />,
); );
const removeButtons = screen.getAllByRole("button", { name: "X" }); await user.click(
await user.click(removeButtons[0]); screen.getByRole("button", {
name: "Remove header, Authorization, row 1",
}),
);
expect(onRemoveHeader).toHaveBeenCalledWith(0); expect(onRemoveHeader).toHaveBeenCalledWith(0);
}); });
@ -351,8 +357,11 @@ describe("ServerSettingsForm", () => {
await user.type(valueInput, "Z"); await user.type(valueInput, "Z");
expect(onMetadataChange).toHaveBeenCalled(); expect(onMetadataChange).toHaveBeenCalled();
const removeButtons = screen.getAllByRole("button", { name: "X" }); await user.click(
await user.click(removeButtons[0]); screen.getByRole("button", {
name: "Remove metadata entry, userId, row 1",
}),
);
expect(onRemoveMetadata).toHaveBeenCalledWith(0); expect(onRemoveMetadata).toHaveBeenCalledWith(0);
}); });
@ -676,9 +685,13 @@ describe("ServerSettingsForm", () => {
await user.type(keyInput, "2"); await user.type(keyInput, "2");
expect(onEnvChange).toHaveBeenLastCalledWith(0, "API_KEY2", "secret"); expect(onEnvChange).toHaveBeenLastCalledWith(0, "API_KEY2", "secret");
// The remove ("X") button sits alongside the row's key/value inputs. // The remove button sits alongside the row's key/value inputs; its
const removeButtons = screen.getAllByRole("button", { name: "X" }); // accessible name identifies which row it belongs to.
await user.click(removeButtons[removeButtons.length - 1]!); await user.click(
screen.getByRole("button", {
name: "Remove environment variable, API_KEY, row 1",
}),
);
expect(onRemoveEnv).toHaveBeenCalledWith(0); expect(onRemoveEnv).toHaveBeenCalledWith(0);
}); });
}); });
@ -1489,12 +1502,12 @@ describe("ServerSettingsForm", () => {
expect( expect(
within( within(
keyInput.closest('[class*="Input-wrapper"]') as HTMLElement, keyInput.closest('[class*="Input-wrapper"]') as HTMLElement,
).queryByRole("button", { name: "Clear" }), ).queryByRole("button", { name: /^Clear/ }),
).toBeNull(); ).toBeNull();
expect( expect(
within( within(
valueInput.closest('[class*="Input-wrapper"]') as HTMLElement, valueInput.closest('[class*="Input-wrapper"]') as HTMLElement,
).queryByRole("button", { name: "Clear" }), ).queryByRole("button", { name: /^Clear/ }),
).toBeNull(); ).toBeNull();
}); });
@ -1517,12 +1530,12 @@ describe("ServerSettingsForm", () => {
expect( expect(
within( within(
uriInput.closest('[class*="Input-wrapper"]') as HTMLElement, uriInput.closest('[class*="Input-wrapper"]') as HTMLElement,
).queryByRole("button", { name: "Clear" }), ).queryByRole("button", { name: /^Clear/ }),
).toBeNull(); ).toBeNull();
expect( expect(
within( within(
nameInput.closest('[class*="Input-wrapper"]') as HTMLElement, nameInput.closest('[class*="Input-wrapper"]') as HTMLElement,
).queryByRole("button", { name: "Clear" }), ).queryByRole("button", { name: /^Clear/ }),
).toBeNull(); ).toBeNull();
// Typing into the URI threads the empty name through (`root.name ?? ""`). // Typing into the URI threads the empty name through (`root.name ?? ""`).
await user.type(uriInput, "f"); await user.type(uriInput, "f");

View file

@ -226,10 +226,22 @@ const ClearStoredOAuthHint = Text.withProps({
function KeyValueRows({ function KeyValueRows({
items, items,
entityLabel,
onChange, onChange,
onRemove, onRemove,
}: { }: {
items: { key: string; value: string }[]; items: { key: string; value: string }[];
/**
* Singular noun for one row ("header", "environment variable", …). Used only
* to build each control's `aria-label`: the section heading and the "Key" /
* "Value" placeholders are not programmatically associated with the inputs,
* so without it an assistive technology cannot tell one section's key box
* from another's, and every remove button announces only "X". The row number
* rides along because two rows can carry the same key — mid-edit, or a
* duplicate a server persisted — and a key-only name would leave both rows'
* controls indistinguishable, which is the thing this exists to prevent.
*/
entityLabel: string;
onChange: (index: number, key: string, value: string) => void; onChange: (index: number, key: string, value: string) => void;
onRemove: (index: number) => void; onRemove: (index: number) => void;
}) { }) {
@ -242,31 +254,50 @@ function KeyValueRows({
return ( return (
<> <>
{items.map((item, index) => ( {items.map((item, index) => {
<Group key={index} grow> const key = item.key.trim();
<ClearableTextInput const rowLabel = key ? `${key}, row ${index + 1}` : `row ${index + 1}`;
placeholder="Key" return (
value={item.key} <Group key={index} grow>
onChange={(e) => onChange(index, e.currentTarget.value, item.value)} <ClearableTextInput
rightSection={ placeholder="Key"
item.key ? ( aria-label={`${entityLabel} name, ${rowLabel}`}
<ClearButton onClick={() => onChange(index, "", item.value)} /> value={item.key}
) : null onChange={(e) =>
} onChange(index, e.currentTarget.value, item.value)
/> }
<ClearableTextInput rightSection={
placeholder="Value" item.key ? (
value={item.value} <ClearButton
onChange={(e) => onChange(index, item.key, e.currentTarget.value)} aria-label={`Clear ${entityLabel} name, ${rowLabel}`}
rightSection={ onClick={() => onChange(index, "", item.value)}
item.value ? ( />
<ClearButton onClick={() => onChange(index, item.key, "")} /> ) : null
) : null }
} />
/> <ClearableTextInput
<RemoveIcon onClick={() => onRemove(index)}>X</RemoveIcon> placeholder="Value"
</Group> aria-label={`${entityLabel} value, ${rowLabel}`}
))} value={item.value}
onChange={(e) => onChange(index, item.key, e.currentTarget.value)}
rightSection={
item.value ? (
<ClearButton
aria-label={`Clear ${entityLabel} value, ${rowLabel}`}
onClick={() => onChange(index, item.key, "")}
/>
) : null
}
/>
<RemoveIcon
aria-label={`Remove ${entityLabel}, ${rowLabel}`}
onClick={() => onRemove(index)}
>
X
</RemoveIcon>
</Group>
);
})}
</> </>
); );
} }
@ -651,6 +682,7 @@ export function ServerSettingsForm({
) : ( ) : (
<KeyValueRows <KeyValueRows
items={settings.env} items={settings.env}
entityLabel="environment variable"
onChange={onEnvChange} onChange={onEnvChange}
onRemove={onRemoveEnv} onRemove={onRemoveEnv}
/> />
@ -666,9 +698,11 @@ export function ServerSettingsForm({
<Stack gap="md"> <Stack gap="md">
<Group justify="space-between"> <Group justify="space-between">
<HintText> <HintText>
Headers sent with every HTTP request to this server. If OAuth is Headers sent with every HTTP request to this server. A custom
configured below, the `Authorization` header is owned by the `Authorization` header takes precedence over an OAuth access
OAuth flow and any value set here is ignored. token — the SDK transports apply these headers last — so remove
it once OAuth is configured, or the flow's token never gets
sent.
</HintText> </HintText>
<AddButton onClick={onAddHeader}>+ Add Header</AddButton> <AddButton onClick={onAddHeader}>+ Add Header</AddButton>
</Group> </Group>
@ -677,6 +711,7 @@ export function ServerSettingsForm({
) : ( ) : (
<KeyValueRows <KeyValueRows
items={settings.headers} items={settings.headers}
entityLabel="header"
onChange={onHeaderChange} onChange={onHeaderChange}
onRemove={onRemoveHeader} onRemove={onRemoveHeader}
/> />
@ -700,6 +735,7 @@ export function ServerSettingsForm({
) : ( ) : (
<KeyValueRows <KeyValueRows
items={settings.metadata} items={settings.metadata}
entityLabel="metadata entry"
onChange={onMetadataChange} onChange={onMetadataChange}
onRemove={onRemoveMetadata} onRemove={onRemoveMetadata}
/> />

View file

@ -276,8 +276,11 @@ describe("ServerSettingsModal", () => {
/>, />,
); );
await user.click(screen.getByRole("button", { name: "Custom Headers" })); await user.click(screen.getByRole("button", { name: "Custom Headers" }));
const removeButtons = screen.getAllByRole("button", { name: "X" }); await user.click(
await user.click(removeButtons[0]); screen.getByRole("button", {
name: "Remove header, Authorization, row 1",
}),
);
expect(onSettingsChange).toHaveBeenCalledWith({ expect(onSettingsChange).toHaveBeenCalledWith({
...initialSettings, ...initialSettings,
headers: [], headers: [],
@ -342,10 +345,13 @@ describe("ServerSettingsModal", () => {
/>, />,
); );
await user.click(screen.getByRole("button", { name: "Request Metadata" })); await user.click(screen.getByRole("button", { name: "Request Metadata" }));
const removeButtons = screen.getAllByRole("button", { name: "X" }); // Both the header and metadata rows have a remove button; each is named
// After expanding metadata, both header and metadata X buttons exist; // for the row it belongs to, so no positional guess is needed.
// the metadata X is the last one. await user.click(
await user.click(removeButtons[removeButtons.length - 1]); screen.getByRole("button", {
name: "Remove metadata entry, userId, row 1",
}),
);
expect(onSettingsChange).toHaveBeenCalledWith({ expect(onSettingsChange).toHaveBeenCalledWith({
...initialSettings, ...initialSettings,
metadata: [], metadata: [],
@ -810,8 +816,11 @@ describe("ServerSettingsModal", () => {
await user.click( await user.click(
screen.getByRole("button", { name: "Environment Variables" }), screen.getByRole("button", { name: "Environment Variables" }),
); );
const removeButtons = screen.getAllByRole("button", { name: "X" }); await user.click(
await user.click(removeButtons[removeButtons.length - 1]); screen.getByRole("button", {
name: "Remove environment variable, A, row 1",
}),
);
expect(onSettingsChange).toHaveBeenCalledWith({ expect(onSettingsChange).toHaveBeenCalledWith({
...emptySettings, ...emptySettings,
env: [], env: [],