* refactor(web): update OAuth E2E tests to use new authentication method - Replaced `runGuidedAuth` with `authenticate` in the InspectorClient OAuth end-to-end tests to support quick authentication with CIMD pre-registration. - Updated comments to reflect the change in authentication method and its support for HTTP test metadata URLs. - Ensured that the tests continue to validate the expected authorization URL after the change. Additionally, imported `ensureCimdClientRegistration` in the OAuthManager to streamline client registration during the authentication process. * Guided-auth removal, OAuth smoke testing, and TUI/CLI support * Added CLI OAuth runner flags tests * Added clarifying comment on port 0 binding * README notes on TUI oauth callback port, prettier fixes for CLI tests * CIMD validation uses inline like EMA IdP * Fixed TUI test failures from merge * test: bring 5 OAuth files over the 90 per-file coverage gate The guided-auth-removal work added/touched several files that fell below the repo's >=90 per-file coverage gate (npm run coverage). CI doesn't run the gate (it's local-only), so validate + test:integration passed while these gaps slipped through. Bring them all back over the line: - core/auth/node/runner-oauth-callback.ts: test bad-URL/non-http-scheme throws, no-port->80 default, and IPv6 hostname bracketing. Annotate the provably-dead guards (empty host, out-of-range port, String(err) fallback, pathname "/" fallback) -- all rejected by new URL() upstream -- with justified v8 ignore comments instead of lowering the gate. - core/auth/cimd.ts: test the AS-doesn't-support-CIMD early return. - core/react/useClientSettingsDraft.ts: test the functional-updater path, the stale-onChange-after-close prev===null guard, and the timer-fires-after-close value===null guard. - ClientSettingsForm.tsx: test the CIMD checkbox toggle and CIMD URL clear. - clients/tui/src/utils/oauthDisplay.ts: test static/dcr registration kinds, the expired IdP session, and the configured-scope/empty-scope branches of formatScopes. npm run coverage now passes (exit 0) across web, cli, tui, launcher. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> --------- Co-authored-by: Cursor <cursoragent@cursor.com> Co-authored-by: cliffhall <cliff@futurescale.com> Co-authored-by: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
256 lines
7 KiB
TypeScript
256 lines
7 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, SaveClientInformationOptions } from "./storage.js";
|
|
import { generateOAuthState } from "./utils.js";
|
|
|
|
/**
|
|
* Redirect URL provider. Returns the redirect URL for OAuth flows.
|
|
* Caller populates the URL before authenticate() (e.g. from callback server).
|
|
*/
|
|
export interface RedirectUrlProvider {
|
|
getRedirectUrl(): string;
|
|
}
|
|
|
|
/**
|
|
* Mutable redirect URL provider for TUI/CLI. Caller sets redirectUrl
|
|
* before authenticate().
|
|
*/
|
|
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;
|
|
|
|
constructor(serverUrl: string, oauthConfig: OAuthProviderConfig) {
|
|
this.serverUrl = serverUrl;
|
|
this.storage = oauthConfig.storage;
|
|
this.redirectUrlProvider = oauthConfig.redirectUrlProvider;
|
|
this.navigation = oauthConfig.navigation;
|
|
this.clientMetadataUrl = oauthConfig.clientMetadataUrl;
|
|
}
|
|
|
|
/**
|
|
* 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);
|
|
}
|
|
|
|
get redirectUrl(): string {
|
|
return this.redirectUrlProvider.getRedirectUrl();
|
|
}
|
|
|
|
get redirect_uris(): string[] {
|
|
return [this.redirectUrl];
|
|
}
|
|
|
|
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 generateOAuthState();
|
|
}
|
|
|
|
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,
|
|
options?: SaveClientInformationOptions,
|
|
): Promise<void> {
|
|
await this.storage.saveClientInformation(this.serverUrl, clientInformation, {
|
|
registrationKind: options?.registrationKind ?? "dcr",
|
|
});
|
|
}
|
|
|
|
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);
|
|
}
|
|
}
|