13dafe457b* 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>
42 lines
1.2 KiB
TypeScript
42 lines
1.2 KiB
TypeScript
import type { MCPServerConfig, ServerType } from "./types.js";
|
|
|
|
/**
|
|
* Returns the transport type for an MCP server configuration.
|
|
* If type is omitted, defaults to "stdio". Throws if type is invalid.
|
|
*/
|
|
export function getServerType(config: MCPServerConfig): ServerType {
|
|
if (!("type" in config) || config.type === undefined) {
|
|
return "stdio";
|
|
}
|
|
const type = config.type;
|
|
if (type === "stdio") {
|
|
return "stdio";
|
|
}
|
|
if (type === "sse") {
|
|
return "sse";
|
|
}
|
|
if (type === "streamable-http") {
|
|
return "streamable-http";
|
|
}
|
|
throw new Error(
|
|
`Invalid server type: ${type}. Valid types are: stdio, sse, streamable-http`,
|
|
);
|
|
}
|
|
|
|
/** OAuth and enterprise-managed auth apply only to remote HTTP-based transports. */
|
|
export function isOAuthCapableServerType(type: ServerType): boolean {
|
|
return type === "sse" || type === "streamable-http";
|
|
}
|
|
|
|
/**
|
|
* MCP server URL used as the OAuth storage key (includes path, for discovery).
|
|
* Undefined for stdio transports.
|
|
*/
|
|
export function getOAuthServerUrl(
|
|
config: MCPServerConfig,
|
|
): string | undefined {
|
|
if (config.type === "sse" || config.type === "streamable-http") {
|
|
return config.url;
|
|
}
|
|
return undefined;
|
|
}
|