* refactor(core): apply v1.5-port cleanups deferred from #1306 Addresses issue #1309 — five small, mechanical cleanups deferred from the v1.5 runtime port: 1. Collapse BrowserOAuthStorage / NodeOAuthStorage / RemoteOAuthStorage onto a shared OAuthStorageBase. Three ~130-line duplicates become thin adapter wrappers; behavior + public API unchanged. 2. Re-enable erasableSyntaxOnly in tsconfig.app.json by rewriting the seven (plus two the issue missed in sampling/elicitation create- message) parameter-property constructors as explicit field + assign. 3. Route the lone console.error in inspectorClient.ts through this.logger. 4. Replace `${Date.now()}-${Math.random()}` with crypto.randomUUID() at the five local-only ID sites (message tracking + sampling/elicit). 5. Pin the remote-server hono app generic at new Hono<Env>() and drop the streamSSE cast. Root cause of the cast was an unresolved hono subpath: the tsconfig "hono/*" wildcard didn't honor the exports map, so hono/streaming leaked to the root-hoisted hono@4.12.12 while hono itself resolved to clients/web/hono@4.12.18. Replaced the wildcard with an explicit hono/streaming entry in both tsconfig.app and tsconfig.test, removing the package-identity mismatch. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> * refactor(core): address #1316 PR review feedback - Drop the stranded no-op getServerState() read at the top of clearClientInformation in OAuthStorageBase (carried over verbatim from the three originals). - Drop the crypto.randomUUID() guard at the task-ID site so all six in-scope sites are consistent; the fallback branch was dead code on every supported runtime. - Remove the residual `c as Context` cast at the streamSSE call site in core/mcp/remote/node/server.ts — once both hono imports resolve to the same package the route-typed Context flows through to streamSSE with no cast at all. - Move the new `options` / `config` field declarations in RemoteClientTransport up with the rest of the field block, matching the layout used by the other five rewritten classes in this PR. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
260 lines
7.2 KiB
TypeScript
260 lines
7.2 KiB
TypeScript
import type { OAuthClientProvider } from "@modelcontextprotocol/sdk/client/auth.js";
|
|
import type {
|
|
OAuthClientInformation,
|
|
OAuthClientMetadata,
|
|
OAuthTokens,
|
|
OAuthMetadata,
|
|
} from "@modelcontextprotocol/sdk/shared/auth.js";
|
|
import type { OAuthStorage } from "./storage.js";
|
|
import { generateOAuthStateWithMode } from "./utils.js";
|
|
|
|
/**
|
|
* Redirect URL provider. Returns the redirect URL for the requested mode.
|
|
* Caller populates the URLs before authenticate() (e.g. from callback server).
|
|
*/
|
|
export interface RedirectUrlProvider {
|
|
getRedirectUrl(mode?: "normal" | "guided"): string;
|
|
}
|
|
|
|
/**
|
|
* Mutable redirect URL provider for TUI/CLI. Caller sets redirectUrl
|
|
* before authenticate(); same URL is used for both normal and guided flows.
|
|
*/
|
|
export class MutableRedirectUrlProvider implements RedirectUrlProvider {
|
|
redirectUrl = "";
|
|
|
|
getRedirectUrl(): string {
|
|
return this.redirectUrl;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Navigation handler interface
|
|
* Handles navigation to authorization URLs
|
|
*/
|
|
export interface OAuthNavigation {
|
|
/**
|
|
* Navigate to the authorization URL
|
|
* @param authorizationUrl - The OAuth authorization URL
|
|
*/
|
|
navigateToAuthorization(authorizationUrl: URL): void;
|
|
}
|
|
|
|
export type OAuthNavigationCallback = (
|
|
authorizationUrl: URL,
|
|
) => void | Promise<void>;
|
|
|
|
/**
|
|
* Callback navigation handler
|
|
* Invokes the provided callback when navigation is requested.
|
|
* The caller always handles navigation.
|
|
*/
|
|
export class CallbackNavigation implements OAuthNavigation {
|
|
private authorizationUrl: URL | null = null;
|
|
private callback: OAuthNavigationCallback;
|
|
|
|
constructor(callback: OAuthNavigationCallback) {
|
|
this.callback = callback;
|
|
}
|
|
|
|
navigateToAuthorization(authorizationUrl: URL): void {
|
|
this.authorizationUrl = authorizationUrl;
|
|
const result = this.callback(authorizationUrl);
|
|
if (result instanceof Promise) {
|
|
void result;
|
|
}
|
|
}
|
|
|
|
getAuthorizationUrl(): URL | null {
|
|
return this.authorizationUrl;
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Console navigation handler
|
|
* Prints the authorization URL to console, optionally invokes an extra callback.
|
|
*/
|
|
export class ConsoleNavigation extends CallbackNavigation {
|
|
constructor(callback?: OAuthNavigationCallback) {
|
|
super((url) => {
|
|
console.log(`Please navigate to: ${url.href}`);
|
|
return callback?.(url);
|
|
});
|
|
}
|
|
}
|
|
|
|
/**
|
|
* Config passed to BaseOAuthClientProvider. Provider assigns to members and
|
|
* accesses as needed.
|
|
*/
|
|
export type OAuthProviderConfig = {
|
|
storage: OAuthStorage;
|
|
redirectUrlProvider: RedirectUrlProvider;
|
|
navigation: OAuthNavigation;
|
|
clientMetadataUrl?: string;
|
|
};
|
|
|
|
/**
|
|
* Base OAuth client provider
|
|
* Implements common OAuth provider functionality.
|
|
* Use with injected storage, redirect URL provider, and navigation.
|
|
*/
|
|
export class BaseOAuthClientProvider implements OAuthClientProvider {
|
|
private capturedAuthUrl: URL | null = null;
|
|
private eventTarget: EventTarget | null = null;
|
|
|
|
protected serverUrl: string;
|
|
protected storage: OAuthStorage;
|
|
protected redirectUrlProvider: RedirectUrlProvider;
|
|
protected navigation: OAuthNavigation;
|
|
public clientMetadataUrl?: string;
|
|
protected mode: "normal" | "guided";
|
|
|
|
constructor(
|
|
serverUrl: string,
|
|
oauthConfig: OAuthProviderConfig,
|
|
mode: "normal" | "guided" = "normal",
|
|
) {
|
|
this.serverUrl = serverUrl;
|
|
this.storage = oauthConfig.storage;
|
|
this.redirectUrlProvider = oauthConfig.redirectUrlProvider;
|
|
this.navigation = oauthConfig.navigation;
|
|
this.clientMetadataUrl = oauthConfig.clientMetadataUrl;
|
|
this.mode = mode;
|
|
}
|
|
|
|
/**
|
|
* Set the event target for dispatching oauthAuthorizationRequired events
|
|
*/
|
|
setEventTarget(eventTarget: EventTarget): void {
|
|
this.eventTarget = eventTarget;
|
|
}
|
|
|
|
/**
|
|
* Get the captured authorization URL (for return value)
|
|
*/
|
|
getCapturedAuthUrl(): URL | null {
|
|
return this.capturedAuthUrl;
|
|
}
|
|
|
|
/**
|
|
* Clear the captured authorization URL
|
|
*/
|
|
clearCapturedAuthUrl(): void {
|
|
this.capturedAuthUrl = null;
|
|
}
|
|
|
|
get scope(): string | undefined {
|
|
return this.storage.getScope(this.serverUrl);
|
|
}
|
|
|
|
/** Redirect URL for the current flow (normal or guided). */
|
|
get redirectUrl(): string {
|
|
return this.redirectUrlProvider.getRedirectUrl(this.mode);
|
|
}
|
|
|
|
get redirect_uris(): string[] {
|
|
return [this.redirectUrlProvider.getRedirectUrl("normal")];
|
|
}
|
|
|
|
get clientMetadata(): OAuthClientMetadata {
|
|
const metadata: OAuthClientMetadata = {
|
|
redirect_uris: this.redirect_uris,
|
|
token_endpoint_auth_method: "none",
|
|
grant_types: ["authorization_code", "refresh_token"],
|
|
response_types: ["code"],
|
|
client_name: "MCP Inspector",
|
|
client_uri: "https://github.com/modelcontextprotocol/inspector",
|
|
scope: this.scope ?? "",
|
|
};
|
|
|
|
// Note: clientMetadataUrl for CIMD mode is passed to registerClient() directly,
|
|
// not as part of clientMetadata. The SDK handles CIMD separately.
|
|
|
|
return metadata;
|
|
}
|
|
|
|
state(): string | Promise<string> {
|
|
return generateOAuthStateWithMode(this.mode);
|
|
}
|
|
|
|
async clientInformation(): Promise<OAuthClientInformation | undefined> {
|
|
// Try preregistered first, then dynamically registered
|
|
const preregistered = await this.storage.getClientInformation(
|
|
this.serverUrl,
|
|
true,
|
|
);
|
|
if (preregistered) {
|
|
return preregistered;
|
|
}
|
|
return await this.storage.getClientInformation(this.serverUrl, false);
|
|
}
|
|
|
|
async saveClientInformation(
|
|
clientInformation: OAuthClientInformation,
|
|
): Promise<void> {
|
|
await this.storage.saveClientInformation(this.serverUrl, clientInformation);
|
|
}
|
|
|
|
async saveScope(scope: string | undefined): Promise<void> {
|
|
await this.storage.saveScope(this.serverUrl, scope);
|
|
}
|
|
|
|
async savePreregisteredClientInformation(
|
|
clientInformation: OAuthClientInformation,
|
|
): Promise<void> {
|
|
await this.storage.savePreregisteredClientInformation(
|
|
this.serverUrl,
|
|
clientInformation,
|
|
);
|
|
}
|
|
|
|
async tokens(): Promise<OAuthTokens | undefined> {
|
|
return await this.storage.getTokens(this.serverUrl);
|
|
}
|
|
|
|
async saveTokens(tokens: OAuthTokens): Promise<void> {
|
|
await this.storage.saveTokens(this.serverUrl, tokens);
|
|
}
|
|
|
|
redirectToAuthorization(authorizationUrl: URL): void {
|
|
// Capture URL for return value
|
|
this.capturedAuthUrl = authorizationUrl;
|
|
|
|
// Dispatch event if event target is set
|
|
if (this.eventTarget) {
|
|
this.eventTarget.dispatchEvent(
|
|
new CustomEvent("oauthAuthorizationRequired", {
|
|
detail: { url: authorizationUrl },
|
|
}),
|
|
);
|
|
}
|
|
|
|
// Original navigation behavior
|
|
this.navigation.navigateToAuthorization(authorizationUrl);
|
|
}
|
|
|
|
async saveCodeVerifier(codeVerifier: string): Promise<void> {
|
|
await this.storage.saveCodeVerifier(this.serverUrl, codeVerifier);
|
|
}
|
|
|
|
codeVerifier(): string {
|
|
const verifier = this.storage.getCodeVerifier(this.serverUrl);
|
|
if (!verifier) {
|
|
throw new Error("No code verifier saved for session");
|
|
}
|
|
return verifier;
|
|
}
|
|
|
|
clear(): void {
|
|
this.storage.clear(this.serverUrl);
|
|
}
|
|
|
|
getServerMetadata(): OAuthMetadata | null {
|
|
return this.storage.getServerMetadata(this.serverUrl);
|
|
}
|
|
|
|
async saveServerMetadata(metadata: OAuthMetadata): Promise<void> {
|
|
await this.storage.saveServerMetadata(this.serverUrl, metadata);
|
|
}
|
|
}
|