* 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>
193 lines
5.4 KiB
TypeScript
193 lines
5.4 KiB
TypeScript
import type {
|
|
OAuthClientInformation,
|
|
OAuthTokens,
|
|
OAuthMetadata,
|
|
} from "@modelcontextprotocol/sdk/shared/auth.js";
|
|
import {
|
|
OAuthClientInformationSchema,
|
|
OAuthTokensSchema,
|
|
} from "@modelcontextprotocol/sdk/shared/auth.js";
|
|
import type { OAuthStorage } from "./storage.js";
|
|
import { type createOAuthStore, type ServerOAuthState } from "./store.js";
|
|
import type {
|
|
IdpSessionState,
|
|
OAuthClientRegistrationKind,
|
|
SaveClientInformationOptions,
|
|
SaveTokensOptions,
|
|
} from "./storage.js";
|
|
|
|
/**
|
|
* Concrete OAuthStorage implementation parameterized on a Zustand store.
|
|
* The store carries the storage adapter (sessionStorage, file, remote HTTP, …),
|
|
* so the same body works for browser, Node, and remote environments.
|
|
*/
|
|
export class OAuthStorageBase implements OAuthStorage {
|
|
private readonly store: ReturnType<typeof createOAuthStore>;
|
|
|
|
constructor(store: ReturnType<typeof createOAuthStore>) {
|
|
this.store = store;
|
|
}
|
|
|
|
async getClientInformation(
|
|
serverUrl: string,
|
|
isPreregistered?: boolean,
|
|
): Promise<OAuthClientInformation | undefined> {
|
|
const state = this.store.getState().getServerState(serverUrl);
|
|
const clientInfo = isPreregistered
|
|
? state.preregisteredClientInformation
|
|
: state.clientInformation;
|
|
|
|
if (!clientInfo) {
|
|
return undefined;
|
|
}
|
|
|
|
return await OAuthClientInformationSchema.parseAsync(clientInfo);
|
|
}
|
|
|
|
getClientRegistrationKind(
|
|
serverUrl: string,
|
|
): OAuthClientRegistrationKind | undefined {
|
|
return this.store.getState().getServerState(serverUrl)
|
|
.clientRegistrationKind;
|
|
}
|
|
|
|
async saveClientInformation(
|
|
serverUrl: string,
|
|
clientInformation: OAuthClientInformation,
|
|
options: SaveClientInformationOptions,
|
|
): Promise<void> {
|
|
this.store.getState().setServerState(serverUrl, {
|
|
clientInformation,
|
|
clientRegistrationKind: options.registrationKind,
|
|
});
|
|
}
|
|
|
|
async savePreregisteredClientInformation(
|
|
serverUrl: string,
|
|
clientInformation: OAuthClientInformation,
|
|
): Promise<void> {
|
|
this.store.getState().setServerState(serverUrl, {
|
|
preregisteredClientInformation: clientInformation,
|
|
clientRegistrationKind: "static",
|
|
});
|
|
}
|
|
|
|
clearClientInformation(serverUrl: string, isPreregistered?: boolean): void {
|
|
const updates: Partial<ServerOAuthState> = {};
|
|
|
|
if (isPreregistered) {
|
|
updates.preregisteredClientInformation = undefined;
|
|
} else {
|
|
updates.clientInformation = undefined;
|
|
updates.clientRegistrationKind = undefined;
|
|
}
|
|
|
|
this.store.getState().setServerState(serverUrl, updates);
|
|
}
|
|
|
|
async getTokens(serverUrl: string): Promise<OAuthTokens | undefined> {
|
|
const state = this.store.getState().getServerState(serverUrl);
|
|
if (!state.tokens) {
|
|
return undefined;
|
|
}
|
|
|
|
return await OAuthTokensSchema.parseAsync(state.tokens);
|
|
}
|
|
|
|
async saveTokens(
|
|
serverUrl: string,
|
|
tokens: OAuthTokens,
|
|
options?: SaveTokensOptions,
|
|
): Promise<void> {
|
|
this.store.getState().setServerState(serverUrl, {
|
|
tokens,
|
|
...(options?.enterpriseManaged === true && { enterpriseManaged: true }),
|
|
});
|
|
}
|
|
|
|
clearTokens(serverUrl: string): void {
|
|
this.store.getState().setServerState(serverUrl, { tokens: undefined });
|
|
}
|
|
|
|
getCodeVerifier(serverUrl: string): string | undefined {
|
|
const state = this.store.getState().getServerState(serverUrl);
|
|
return state.codeVerifier;
|
|
}
|
|
|
|
async saveCodeVerifier(
|
|
serverUrl: string,
|
|
codeVerifier: string,
|
|
): Promise<void> {
|
|
this.store.getState().setServerState(serverUrl, { codeVerifier });
|
|
}
|
|
|
|
clearCodeVerifier(serverUrl: string): void {
|
|
this.store
|
|
.getState()
|
|
.setServerState(serverUrl, { codeVerifier: undefined });
|
|
}
|
|
|
|
getScope(serverUrl: string): string | undefined {
|
|
const state = this.store.getState().getServerState(serverUrl);
|
|
return state.scope;
|
|
}
|
|
|
|
async saveScope(serverUrl: string, scope: string | undefined): Promise<void> {
|
|
this.store.getState().setServerState(serverUrl, { scope });
|
|
}
|
|
|
|
clearScope(serverUrl: string): void {
|
|
this.store.getState().setServerState(serverUrl, { scope: undefined });
|
|
}
|
|
|
|
getServerMetadata(serverUrl: string): OAuthMetadata | null {
|
|
const state = this.store.getState().getServerState(serverUrl);
|
|
return state.serverMetadata || null;
|
|
}
|
|
|
|
async saveServerMetadata(
|
|
serverUrl: string,
|
|
metadata: OAuthMetadata,
|
|
): Promise<void> {
|
|
this.store
|
|
.getState()
|
|
.setServerState(serverUrl, { serverMetadata: metadata });
|
|
}
|
|
|
|
clearServerMetadata(serverUrl: string): void {
|
|
this.store
|
|
.getState()
|
|
.setServerState(serverUrl, { serverMetadata: undefined });
|
|
}
|
|
|
|
clear(serverUrl: string): void {
|
|
this.store.getState().clearServerState(serverUrl);
|
|
}
|
|
|
|
async getIdpSession(issuer: string): Promise<IdpSessionState | undefined> {
|
|
const session = this.store.getState().getIdpSession(issuer);
|
|
if (
|
|
!session.idToken &&
|
|
!session.refreshToken &&
|
|
session.idTokenExpiresAt === undefined
|
|
) {
|
|
return undefined;
|
|
}
|
|
return session;
|
|
}
|
|
|
|
async saveIdpSession(
|
|
issuer: string,
|
|
session: Partial<IdpSessionState>,
|
|
): Promise<void> {
|
|
this.store.getState().setIdpSession(issuer, session);
|
|
}
|
|
|
|
clearIdpSession(issuer: string): void {
|
|
this.store.getState().clearIdpSession(issuer);
|
|
}
|
|
|
|
clearEnterpriseManagedResourceServers(): void {
|
|
this.store.getState().clearEnterpriseManagedResourceServers();
|
|
}
|
|
}
|