inspector/clients/web/src/test/integration/storage/adapters.test.ts
cliffhall c299b6e9d8 feat(web): migrate OAuth store to shared /store API (RemoteOAuthStorage parity) (closes #1548)
Migrate the web client's OAuth storage from BrowserOAuthStorage
(sessionStorage) to RemoteOAuthStorage, which POSTs through the backend's
/api/storage/oauth route to ~/.mcp-inspector/storage/oauth.json (mode 0600).
A credential obtained in the browser is now the same blob the TUI/CLI read
on the same host, giving web ⇄ TUI ⇄ CLI parity (Wave 1 of #1579).

Core (shared with TUI/CLI):
- OAuthStorageBase now drives a single async hydration (`ready()`,
  `getHydrationError()`); every post-redirect read (getClientInformation,
  getTokens, getCodeVerifier, getServerMetadata, getIdpSession) and every
  save awaits it so a late hydration merge cannot clobber a fresh write.
  getCodeVerifier/getServerMetadata become async; the store is created with
  skipHydration:true so there is no auto-hydration to race the explicit one.
- store.ts adds normalizeServerUrl so a token saved under
  https://Example.com/mcp is found when the CLI asks for
  https://example.com/mcp/; getServerState falls back to the raw key.
- remote-storage adapter POSTs with keepalive so the write survives the
  OAuth authorize redirect, surfaces swallowed persist failures, and gives
  richer read/write error messages.
- generateOAuthState throws instead of silently degrading to Math.random.
- NodeOAuthStorage honors MCP_INSPECTOR_OAUTH_STATE_PATH for isolated
  fixtures. Provider codeVerifier()/getServerMetadata() + the EMA idpOidc and
  connection-state readers await the now-async storage.

Web:
- environmentFactory + a new shared lib/remoteOAuthStorage accessor
  (memoized per {baseUrl, authToken}) wire RemoteOAuthStorage into the
  connection path, the EMA IdP hook, and the per-server "clear OAuth" action
  so all three share one in-memory view of oauth.json.

Tests: async-hydration + normalizeServerUrl suite, keepalive/error-path
coverage, and the sync→async migration across existing storage/provider/EMA
tests. Web validate + coverage gate + integration suite green; CLI/TUI/
launcher validate green.

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01S3fTN8H3R8YV4yUGvZjYnX
2026-07-01 18:39:17 -04:00

507 lines
18 KiB
TypeScript

/**
* Tests for storage adapters (file, remote).
*/
import { describe, it, expect, afterEach, vi } from "vitest";
import { waitForRemoteStore } from "@modelcontextprotocol/inspector-test-server";
import { mkdtempSync, readFileSync, rmSync, existsSync } from "node:fs";
import { tmpdir } from "node:os";
import { join } from "node:path";
import { serve } from "@hono/node-server";
import type { ServerType } from "@hono/node-server";
import { createFileStorageAdapter } from "@inspector/core/storage/adapters/file-storage.js";
import { createRemoteStorageAdapter } from "@inspector/core/storage/adapters/remote-storage.js";
import {
createOAuthStore,
normalizeServerUrl,
} from "@inspector/core/auth/store.js";
import { createRemoteApp } from "@inspector/core/mcp/remote/node/server.js";
import {
writeStoreFile,
flushStoreFileWrites,
} from "@inspector/core/storage/store-io.js";
interface StartRemoteServerOptions {
storageDir?: string;
}
async function startRemoteServer(
port: number,
options: StartRemoteServerOptions = {},
): Promise<{
baseUrl: string;
server: ServerType;
authToken: string;
}> {
const { app, authToken } = createRemoteApp({
storageDir: options.storageDir,
initialConfig: { defaultEnvironment: {} },
});
return new Promise((resolve, reject) => {
const server = serve(
{ fetch: app.fetch, port, hostname: "127.0.0.1" },
(info) => {
const actualPort =
info && typeof info === "object" && "port" in info
? (info as { port: number }).port
: port;
resolve({
baseUrl: `http://127.0.0.1:${actualPort}`,
server,
authToken,
});
},
);
server.on("error", reject);
});
}
describe("Storage adapters", () => {
describe("createRemoteStorageAdapter (unit, mocked fetch)", () => {
function makeAdapter(fetchFn: typeof fetch, authToken?: string) {
return createRemoteStorageAdapter({
baseUrl: "http://remote.example/",
storeId: "test",
fetchFn,
authToken,
})!;
}
it("getItem returns null on 404 and parses stored blob otherwise", async () => {
const fetchFn = vi
.fn<typeof fetch>()
.mockResolvedValueOnce(new Response("not found", { status: 404 }))
.mockResolvedValueOnce(
new Response(JSON.stringify({ state: { hi: 1 }, version: 0 })),
)
.mockResolvedValueOnce(new Response("{}"));
const adapter = makeAdapter(fetchFn as typeof fetch);
expect(await adapter.getItem("anything")).toBeNull();
const blob = await adapter.getItem("anything");
expect(blob).toBeTruthy();
// Empty object response → treated as "not initialized" → null.
expect(await adapter.getItem("anything")).toBeNull();
});
it("getItem throws on non-404 error responses", async () => {
const fetchFn = vi
.fn<typeof fetch>()
.mockResolvedValueOnce(new Response("boom", { status: 500 }));
const adapter = makeAdapter(fetchFn as typeof fetch);
await expect(adapter.getItem("x")).rejects.toThrow(/500/);
});
it("setItem throws when the POST fails", async () => {
// The adapter logs the swallowed-persist failure via console.error before
// rethrowing; suppress the expected noise.
const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
try {
const fetchFn = vi
.fn<typeof fetch>()
.mockResolvedValueOnce(new Response("nope", { status: 500 }));
const adapter = makeAdapter(fetchFn as typeof fetch);
await expect(
adapter.setItem("name", { state: { a: 1 }, version: 0 }),
).rejects.toThrow(/500/);
expect(errorSpy).toHaveBeenCalled();
} finally {
errorSpy.mockRestore();
}
});
it("setItem sends keepalive so the POST survives an immediate redirect", async () => {
const fetchFn = vi
.fn<typeof fetch>()
.mockResolvedValueOnce(new Response("{}"));
const adapter = makeAdapter(fetchFn as typeof fetch);
await adapter.setItem("name", { state: { a: 1 }, version: 0 });
expect(fetchFn.mock.calls[0]?.[1]?.keepalive).toBe(true);
});
it("setItem rethrows a network-level fetch rejection after logging it", async () => {
const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
try {
const fetchFn = vi
.fn<typeof fetch>()
.mockRejectedValueOnce(new Error("network down"));
const adapter = makeAdapter(fetchFn as typeof fetch);
await expect(
adapter.setItem("name", { state: { a: 1 }, version: 0 }),
).rejects.toThrow(/network down/);
expect(errorSpy).toHaveBeenCalled();
} finally {
errorSpy.mockRestore();
}
});
it("removeItem tolerates 404 but rethrows on other failures", async () => {
const fetchFn = vi
.fn<typeof fetch>()
.mockResolvedValueOnce(new Response(null, { status: 204 }))
.mockResolvedValueOnce(new Response(null, { status: 404 }))
.mockResolvedValueOnce(new Response("boom", { status: 500 }));
const adapter = makeAdapter(fetchFn as typeof fetch);
await expect(adapter.removeItem("x")).resolves.toBeUndefined();
await expect(adapter.removeItem("x")).resolves.toBeUndefined();
await expect(adapter.removeItem("x")).rejects.toThrow(/500/);
});
it("sends the x-mcp-remote-auth header on all three verbs when authToken is set", async () => {
const fetchFn = vi
.fn<typeof fetch>()
.mockResolvedValue(new Response("{}"));
const adapter = makeAdapter(fetchFn as typeof fetch, "secret");
await adapter.getItem("x");
await adapter.setItem("x", { state: {}, version: 0 });
await adapter.removeItem("x");
for (const call of fetchFn.mock.calls) {
const headers = call[1]?.headers as Record<string, string> | undefined;
expect(headers?.["x-mcp-remote-auth"]).toBe("Bearer secret");
}
});
});
describe("FileStorageAdapter", () => {
let tempDir: string | null = null;
afterEach(() => {
if (tempDir) {
try {
rmSync(tempDir, { recursive: true });
} catch {
// Ignore cleanup errors
}
tempDir = null;
}
});
it("creates store and persists state", async () => {
tempDir = mkdtempSync(join(tmpdir(), "inspector-storage-test-"));
const filePath = join(tempDir!, "test-store.json");
const storage = createFileStorageAdapter({ filePath });
const store = createOAuthStore(storage);
// Set some state
store.getState().setServerState("https://example.com", {
tokens: { access_token: "test-token", token_type: "Bearer" },
});
// Persistence is fire-and-forget; await the write rather than polling.
await flushStoreFileWrites(filePath);
const fileContent = readFileSync(filePath, "utf-8");
const parsed = JSON.parse(fileContent);
expect(
parsed.state.servers[normalizeServerUrl("https://example.com")].tokens,
).toEqual({
access_token: "test-token",
token_type: "Bearer",
});
});
it("loads persisted state on initialization", async () => {
tempDir = mkdtempSync(join(tmpdir(), "inspector-storage-test-"));
const filePath = join(tempDir!, "test-store.json");
// Create initial store and persist
const storage1 = createFileStorageAdapter({ filePath });
const store1 = createOAuthStore(storage1);
store1.getState().setServerState("https://example.com", {
tokens: { access_token: "initial-token", token_type: "Bearer" },
});
await flushStoreFileWrites(filePath);
// Create new store instance and load persisted state. The store is
// created with skipHydration: true, so drive the single rehydrate
// explicitly (OAuthStorageBase does this in production).
const storage2 = createFileStorageAdapter({ filePath });
const store2 = createOAuthStore(storage2);
await store2.persist.rehydrate();
const state = store2.getState().getServerState("https://example.com");
expect(state.tokens).toEqual({
access_token: "initial-token",
token_type: "Bearer",
});
});
it("handles empty state after clear", async () => {
tempDir = mkdtempSync(join(tmpdir(), "inspector-storage-test-"));
const filePath = join(tempDir!, "test-store.json");
const storage = createFileStorageAdapter({ filePath });
const store = createOAuthStore(storage);
// Set state and persist
store.getState().setServerState("https://example.com", {
tokens: { access_token: "test-token", token_type: "Bearer" },
});
await flushStoreFileWrites(filePath);
expect(existsSync(filePath)).toBe(true);
// Clear all servers (this will persist empty state)
const state = store.getState();
const urls = Object.keys(state.servers);
for (const url of urls) {
state.clearServerState(url);
}
await flushStoreFileWrites(filePath);
// Verify file still exists but with empty servers
expect(existsSync(filePath)).toBe(true);
const fileContent = readFileSync(filePath, "utf-8");
const parsed = JSON.parse(fileContent);
expect(Object.keys(parsed.state.servers).length).toBe(0);
});
it("removeItem deletes the underlying file", async () => {
tempDir = mkdtempSync(join(tmpdir(), "inspector-storage-test-"));
const filePath = join(tempDir!, "test-store.json");
const storage = createFileStorageAdapter({ filePath });
// createJSONStorage returns a PersistStorage<S> wrapper that delegates to
// our adapter's removeItem callback (line 25 of file-storage.ts).
const store = createOAuthStore(storage);
store.getState().setServerState("https://example.com", {
tokens: { access_token: "t", token_type: "Bearer" },
});
await flushStoreFileWrites(filePath);
expect(existsSync(filePath)).toBe(true);
await storage!.removeItem("inspector-oauth-store");
expect(existsSync(filePath)).toBe(false);
});
});
describe("flushStoreFileWrites", () => {
let tempDir: string | null = null;
afterEach(() => {
if (tempDir) {
try {
rmSync(tempDir, { recursive: true });
} catch {
// Ignore cleanup errors
}
tempDir = null;
}
});
it("resolves immediately when nothing is in flight", async () => {
await expect(flushStoreFileWrites()).resolves.toBeUndefined();
await expect(
flushStoreFileWrites("/no/such/path.json"),
).resolves.toBeUndefined();
});
it("awaits the pending write for a specific path", async () => {
tempDir = mkdtempSync(join(tmpdir(), "inspector-flush-test-"));
const filePath = join(tempDir, "store.json");
// Kick off the write without awaiting it, then flush.
const write = writeStoreFile(filePath, '{"hello":"world"}');
await flushStoreFileWrites(filePath);
expect(existsSync(filePath)).toBe(true);
expect(JSON.parse(readFileSync(filePath, "utf-8"))).toEqual({
hello: "world",
});
await write;
});
it("awaits all pending writes when no path is given", async () => {
tempDir = mkdtempSync(join(tmpdir(), "inspector-flush-test-"));
const a = join(tempDir, "a.json");
const b = join(tempDir, "b.json");
const writes = Promise.all([
writeStoreFile(a, '{"n":1}'),
writeStoreFile(b, '{"n":2}'),
]);
await flushStoreFileWrites();
expect(existsSync(a)).toBe(true);
expect(existsSync(b)).toBe(true);
await writes;
});
it("serializes overlapping writes to the same path (last write wins)", async () => {
tempDir = mkdtempSync(join(tmpdir(), "inspector-flush-test-"));
const filePath = join(tempDir, "store.json");
const first = writeStoreFile(filePath, '{"v":1}');
const second = writeStoreFile(filePath, '{"v":2}');
await Promise.all([first, second]);
await flushStoreFileWrites(filePath);
expect(JSON.parse(readFileSync(filePath, "utf-8"))).toEqual({ v: 2 });
});
});
describe("RemoteStorageAdapter", () => {
let remoteServer: ServerType | null = null;
let tempDir: string | null = null;
afterEach(async () => {
if (remoteServer) {
await new Promise<void>((resolve, reject) => {
remoteServer!.close((err) => (err ? reject(err) : resolve()));
});
remoteServer = null;
}
if (tempDir) {
try {
rmSync(tempDir, { recursive: true });
} catch {
// Ignore cleanup errors
}
tempDir = null;
}
});
it("creates store and persists state via HTTP", async () => {
tempDir = mkdtempSync(join(tmpdir(), "inspector-storage-test-"));
const { baseUrl, server, authToken } = await startRemoteServer(0, {
storageDir: tempDir,
});
remoteServer = server;
const storage = createRemoteStorageAdapter({
baseUrl,
storeId: "test-store",
authToken,
});
const store = createOAuthStore(storage);
// Set some state
store.getState().setServerState("https://example.com", {
tokens: { access_token: "test-token", token_type: "Bearer" },
});
const exampleKey = normalizeServerUrl("https://example.com");
await waitForRemoteStore(baseUrl, "test-store", authToken, (body) => {
const d = body as {
state?: {
servers?: Record<string, { tokens?: { access_token?: string } }>;
};
};
return (
d?.state?.servers?.[exampleKey]?.tokens?.access_token === "test-token"
);
});
// Verify via API
const res = await fetch(`${baseUrl}/api/storage/test-store`, {
method: "GET",
headers: {
"x-mcp-remote-auth": `Bearer ${authToken}`,
},
});
expect(res.status).toBe(200);
const storeData = await res.json();
expect(storeData.state.servers[exampleKey].tokens).toEqual({
access_token: "test-token",
token_type: "Bearer",
});
});
it("loads persisted state on initialization", async () => {
tempDir = mkdtempSync(join(tmpdir(), "inspector-storage-test-"));
const { baseUrl, server, authToken } = await startRemoteServer(0, {
storageDir: tempDir,
});
remoteServer = server;
// Create initial store and persist
const storage1 = createRemoteStorageAdapter({
baseUrl,
storeId: "test-store",
authToken,
});
const store1 = createOAuthStore(storage1);
store1.getState().setServerState("https://example.com", {
tokens: { access_token: "initial-token", token_type: "Bearer" },
});
const exampleKey = normalizeServerUrl("https://example.com");
await waitForRemoteStore(baseUrl, "test-store", authToken, (body) => {
const d = body as {
state?: {
servers?: Record<string, { tokens?: { access_token?: string } }>;
};
};
return (
d?.state?.servers?.[exampleKey]?.tokens?.access_token ===
"initial-token"
);
});
// Create new store instance and load persisted state. The store is
// created with skipHydration: true, so drive the single rehydrate
// explicitly (OAuthStorageBase does this in production).
const storage2 = createRemoteStorageAdapter({
baseUrl,
storeId: "test-store",
authToken,
});
const store2 = createOAuthStore(storage2);
await store2.persist.rehydrate();
const state = store2.getState().getServerState("https://example.com");
expect(state.tokens).toEqual({
access_token: "initial-token",
token_type: "Bearer",
});
});
it("handles empty state after clear", async () => {
tempDir = mkdtempSync(join(tmpdir(), "inspector-storage-test-"));
const { baseUrl, server, authToken } = await startRemoteServer(0, {
storageDir: tempDir,
});
remoteServer = server;
const storage = createRemoteStorageAdapter({
baseUrl,
storeId: "test-store",
authToken,
});
const store = createOAuthStore(storage);
// Set state and persist
store.getState().setServerState("https://example.com", {
tokens: { access_token: "test-token", token_type: "Bearer" },
});
await waitForRemoteStore(baseUrl, "test-store", authToken, (body) => {
const d = body as { state?: { servers?: Record<string, unknown> } };
return !!d?.state?.servers && Object.keys(d.state.servers).length > 0;
});
// Verify it exists
let res = await fetch(`${baseUrl}/api/storage/test-store`, {
method: "GET",
headers: {
"x-mcp-remote-auth": `Bearer ${authToken}`,
},
});
expect(res.status).toBe(200);
const storeData = await res.json();
expect(Object.keys(storeData.state.servers).length).toBeGreaterThan(0);
// Clear all servers (this will persist empty state)
const state = store.getState();
const urls = Object.keys(state.servers);
for (const url of urls) {
state.clearServerState(url);
}
await waitForRemoteStore(baseUrl, "test-store", authToken, (body) => {
const d = body as { state?: { servers?: Record<string, unknown> } };
return !d?.state?.servers || Object.keys(d.state.servers).length === 0;
});
// Verify it's empty
res = await fetch(`${baseUrl}/api/storage/test-store`, {
method: "GET",
headers: {
"x-mcp-remote-auth": `Bearer ${authToken}`,
},
});
expect(res.status).toBe(200);
const emptyStore = await res.json();
expect(Object.keys(emptyStore.state.servers).length).toBe(0);
});
});
});