test: close ≥90% per-file coverage gaps for mid-session auth
The mid-session auth work passed `validate`/CI but failed the local-only
`npm run test:coverage` per-file gate (≥90% lines/statements/functions/
branches) on 12 files. Add targeted unit/integration tests so every changed
file clears the gate; annotate provably-dead defensive branches with justified
`/* v8 ignore */` comments rather than relaxing the gate.
Files brought to ≥90 on all four dimensions:
- core/auth: mcpAuth, oauthUx, utils, challenge, node/runner-interactive-oauth
- core/mcp: oauthManager, inspectorClient, node/authChallengeFetch,
remote/remoteClientTransport, remote/node/{remote-session,server}
- clients/web/src/utils: oauthResume, browserTabVisibility
`npm run test:coverage` now passes (3575 tests, 0 threshold failures);
`npm run validate` green across all four clients.
Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01DZyeWManYTvcXxjcrhxSQc
This commit is contained in:
cliffhall
parent
a066873e37
commit
f4b6095719
8 changed files with 3447 additions and 37 deletions
|
|
@ -146,6 +146,39 @@ describe("parseAuthChallengeFromResponse", () => {
|
|||
const response = new Response(null, { status: 500 });
|
||||
expect(parseAuthChallengeFromResponse(response)).toBeUndefined();
|
||||
});
|
||||
|
||||
it("carries error_description into the challenge message", () => {
|
||||
const response = new Response(null, {
|
||||
status: 401,
|
||||
headers: {
|
||||
"WWW-Authenticate":
|
||||
'Bearer error="invalid_token", error_description="Token expired"',
|
||||
},
|
||||
});
|
||||
|
||||
expect(parseAuthChallengeFromResponse(response)).toEqual({
|
||||
reason: "invalid_token",
|
||||
message: "Token expired",
|
||||
raw: {
|
||||
httpStatus: 401,
|
||||
wwwAuthenticate:
|
||||
'Bearer error="invalid_token", error_description="Token expired"',
|
||||
},
|
||||
});
|
||||
});
|
||||
|
||||
it("maps 403 with a non-scope error to unauthorized", () => {
|
||||
const response = new Response(null, {
|
||||
status: 403,
|
||||
headers: {
|
||||
"WWW-Authenticate": 'Bearer error="invalid_token"',
|
||||
},
|
||||
});
|
||||
|
||||
expect(parseAuthChallengeFromResponse(response)?.reason).toBe(
|
||||
"unauthorized",
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("parseAuthChallengeFromError", () => {
|
||||
|
|
@ -174,6 +207,82 @@ describe("parseAuthChallengeFromError", () => {
|
|||
it("returns undefined for bare 401 without auth markers", () => {
|
||||
expect(parseAuthChallengeFromError({ status: 401 })).toBeUndefined();
|
||||
});
|
||||
|
||||
it("returns the challenge directly for AuthChallengeError instances", () => {
|
||||
const err = new AuthChallengeError({ reason: "invalid_token" }, 401);
|
||||
expect(parseAuthChallengeFromError(err)).toEqual({
|
||||
reason: "invalid_token",
|
||||
});
|
||||
});
|
||||
|
||||
it("returns undefined for non-object and null errors", () => {
|
||||
expect(parseAuthChallengeFromError("boom")).toBeUndefined();
|
||||
expect(parseAuthChallengeFromError(null)).toBeUndefined();
|
||||
});
|
||||
|
||||
it("merges context into an embedded authChallenge", () => {
|
||||
expect(
|
||||
parseAuthChallengeFromError(
|
||||
{
|
||||
authChallenge: { reason: "token_expired", context: { method: "x" } },
|
||||
},
|
||||
{ toolName: "get_temp" },
|
||||
),
|
||||
).toEqual({
|
||||
reason: "token_expired",
|
||||
context: { method: "x", toolName: "get_temp" },
|
||||
});
|
||||
});
|
||||
|
||||
it("falls back to the numeric code when status is absent", () => {
|
||||
expect(
|
||||
parseAuthChallengeFromError({
|
||||
code: 403,
|
||||
wwwAuthenticate: 'Bearer error="insufficient_scope", scope="admin"',
|
||||
}),
|
||||
).toMatchObject({
|
||||
reason: "insufficient_scope",
|
||||
requiredScopes: ["admin"],
|
||||
raw: { httpStatus: 403 },
|
||||
});
|
||||
});
|
||||
|
||||
it("returns undefined when the status is neither 401 nor 403", () => {
|
||||
expect(parseAuthChallengeFromError({ status: 500 })).toBeUndefined();
|
||||
});
|
||||
|
||||
it("reads WWW-Authenticate from a headers.get accessor", () => {
|
||||
expect(
|
||||
parseAuthChallengeFromError({
|
||||
status: 401,
|
||||
headers: {
|
||||
get: (name: string) =>
|
||||
name === "WWW-Authenticate" ? 'Bearer error="invalid_token"' : null,
|
||||
},
|
||||
}),
|
||||
).toMatchObject({
|
||||
reason: "invalid_token",
|
||||
raw: { httpStatus: 401, wwwAuthenticate: 'Bearer error="invalid_token"' },
|
||||
});
|
||||
});
|
||||
|
||||
it("reads WWW-Authenticate from an embedded raw challenge", () => {
|
||||
expect(
|
||||
parseAuthChallengeFromError({
|
||||
status: 401,
|
||||
authChallenge: { raw: { wwwAuthenticate: "Bearer realm=mcp" } },
|
||||
}),
|
||||
).toMatchObject({
|
||||
reason: "token_expired",
|
||||
raw: { httpStatus: 401, wwwAuthenticate: "Bearer realm=mcp" },
|
||||
});
|
||||
});
|
||||
|
||||
it("returns undefined for an empty WWW-Authenticate header", () => {
|
||||
expect(
|
||||
parseAuthChallengeFromError({ status: 401, wwwAuthenticate: "" }),
|
||||
).toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe("isAuthChallengeError", () => {
|
||||
|
|
@ -206,6 +315,53 @@ describe("isAuthChallengeError", () => {
|
|||
it("does not treat connect-time unauthorized wording as auth challenge", () => {
|
||||
expect(isAuthChallengeError(new Error("network failed"))).toBe(false);
|
||||
});
|
||||
|
||||
it("returns false for non-object and null errors", () => {
|
||||
expect(isAuthChallengeError("boom")).toBe(false);
|
||||
expect(isAuthChallengeError(null)).toBe(false);
|
||||
});
|
||||
|
||||
it("detects an embedded authChallenge with a reason", () => {
|
||||
expect(
|
||||
isAuthChallengeError({ authChallenge: { reason: "token_expired" } }),
|
||||
).toBe(true);
|
||||
});
|
||||
|
||||
it("uses the numeric code when status is absent", () => {
|
||||
expect(
|
||||
isAuthChallengeError({
|
||||
code: 403,
|
||||
wwwAuthenticate: 'Bearer error="insufficient_scope"',
|
||||
}),
|
||||
).toBe(true);
|
||||
});
|
||||
|
||||
it("reads WWW-Authenticate from a headers.get accessor", () => {
|
||||
expect(
|
||||
isAuthChallengeError({
|
||||
status: 401,
|
||||
headers: {
|
||||
get: (name: string) =>
|
||||
name === "WWW-Authenticate" ? "Bearer realm=mcp" : null,
|
||||
},
|
||||
}),
|
||||
).toBe(true);
|
||||
});
|
||||
|
||||
it("reads WWW-Authenticate from an embedded raw challenge", () => {
|
||||
expect(
|
||||
isAuthChallengeError({
|
||||
status: 401,
|
||||
authChallenge: { raw: { wwwAuthenticate: "Bearer realm=mcp" } },
|
||||
}),
|
||||
).toBe(true);
|
||||
});
|
||||
|
||||
it("returns false for an empty WWW-Authenticate header", () => {
|
||||
expect(isAuthChallengeError({ status: 401, wwwAuthenticate: "" })).toBe(
|
||||
false,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("isConnectAuthRecoveryError", () => {
|
||||
|
|
|
|||
|
|
@ -6,11 +6,15 @@ const {
|
|||
discoverOAuthServerInfo,
|
||||
startAuthorization,
|
||||
selectResourceURL,
|
||||
registerClient,
|
||||
isHttpsUrl,
|
||||
} = vi.hoisted(() => ({
|
||||
sdkAuth: vi.fn(),
|
||||
discoverOAuthServerInfo: vi.fn(),
|
||||
startAuthorization: vi.fn(),
|
||||
selectResourceURL: vi.fn(),
|
||||
registerClient: vi.fn(),
|
||||
isHttpsUrl: vi.fn(),
|
||||
}));
|
||||
|
||||
vi.mock("@modelcontextprotocol/sdk/client/auth.js", async (importOriginal) => {
|
||||
|
|
@ -24,12 +28,17 @@ vi.mock("@modelcontextprotocol/sdk/client/auth.js", async (importOriginal) => {
|
|||
discoverOAuthServerInfo,
|
||||
selectResourceURL,
|
||||
startAuthorization,
|
||||
registerClient,
|
||||
isHttpsUrl,
|
||||
};
|
||||
});
|
||||
|
||||
import { mcpAuth } from "@inspector/core/auth/mcpAuth.js";
|
||||
import { InvalidClientMetadataError } from "@modelcontextprotocol/sdk/server/auth/errors.js";
|
||||
|
||||
function makeProvider(): OAuthClientProvider {
|
||||
function makeProvider(
|
||||
overrides: Partial<OAuthClientProvider> = {},
|
||||
): OAuthClientProvider {
|
||||
return {
|
||||
redirectUrl: "http://localhost/callback",
|
||||
clientMetadata: {
|
||||
|
|
@ -47,12 +56,38 @@ function makeProvider(): OAuthClientProvider {
|
|||
redirectToAuthorization: vi.fn(),
|
||||
saveCodeVerifier: vi.fn(),
|
||||
codeVerifier: vi.fn().mockReturnValue("verifier"),
|
||||
...overrides,
|
||||
};
|
||||
}
|
||||
|
||||
/**
|
||||
* Arrange the discovery + authorization mocks used by the
|
||||
* `forceReauthorization` (authorize-without-refresh) path.
|
||||
*/
|
||||
function stubForcePath(
|
||||
discovery: Partial<{
|
||||
authorizationServerUrl: string;
|
||||
authorizationServerMetadata: Record<string, unknown>;
|
||||
resourceMetadata: unknown;
|
||||
}> = {},
|
||||
): void {
|
||||
discoverOAuthServerInfo.mockResolvedValue({
|
||||
authorizationServerUrl: "https://as.example.com",
|
||||
authorizationServerMetadata: { issuer: "https://as.example.com" },
|
||||
resourceMetadata: undefined,
|
||||
...discovery,
|
||||
});
|
||||
selectResourceURL.mockResolvedValue(undefined);
|
||||
startAuthorization.mockResolvedValue({
|
||||
authorizationUrl: new URL("https://as.example.com/authorize"),
|
||||
codeVerifier: "cv",
|
||||
});
|
||||
}
|
||||
|
||||
describe("mcpAuth", () => {
|
||||
beforeEach(() => {
|
||||
vi.clearAllMocks();
|
||||
isHttpsUrl.mockReturnValue(true);
|
||||
});
|
||||
|
||||
it("delegates to SDK auth() when forceReauthorization is not set", async () => {
|
||||
|
|
@ -76,17 +111,24 @@ describe("mcpAuth", () => {
|
|||
expect(discoverOAuthServerInfo).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("rejects forceReauthorization combined with authorizationCode", async () => {
|
||||
const provider = makeProvider();
|
||||
|
||||
await expect(
|
||||
mcpAuth(provider, {
|
||||
serverUrl: "https://mcp.example.com",
|
||||
authorizationCode: "code",
|
||||
forceReauthorization: true,
|
||||
}),
|
||||
).rejects.toThrow(
|
||||
"forceReauthorization cannot be combined with authorizationCode",
|
||||
);
|
||||
expect(sdkAuth).not.toHaveBeenCalled();
|
||||
expect(discoverOAuthServerInfo).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("uses discovery + startAuthorization when forceReauthorization is true", async () => {
|
||||
discoverOAuthServerInfo.mockResolvedValue({
|
||||
authorizationServerUrl: "https://as.example.com",
|
||||
authorizationServerMetadata: { issuer: "https://as.example.com" },
|
||||
resourceMetadata: undefined,
|
||||
});
|
||||
selectResourceURL.mockResolvedValue(undefined);
|
||||
startAuthorization.mockResolvedValue({
|
||||
authorizationUrl: new URL("https://as.example.com/authorize"),
|
||||
codeVerifier: "cv",
|
||||
});
|
||||
stubForcePath();
|
||||
const provider = makeProvider();
|
||||
|
||||
const result = await mcpAuth(provider, {
|
||||
|
|
@ -102,4 +144,172 @@ describe("mcpAuth", () => {
|
|||
expect(provider.saveCodeVerifier).toHaveBeenCalledWith("cv");
|
||||
expect(provider.redirectToAuthorization).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("persists discovery state and forwards the selected resource + state", async () => {
|
||||
stubForcePath({
|
||||
resourceMetadata: { resource: "https://mcp.example.com" },
|
||||
});
|
||||
selectResourceURL.mockResolvedValue(new URL("https://mcp.example.com/r"));
|
||||
const saveDiscoveryState = vi.fn().mockResolvedValue(undefined);
|
||||
const state = vi.fn().mockResolvedValue("state-123");
|
||||
const provider = makeProvider({ saveDiscoveryState, state });
|
||||
|
||||
await mcpAuth(provider, {
|
||||
serverUrl: "https://mcp.example.com",
|
||||
resourceMetadataUrl: new URL("https://mcp.example.com/.well-known/x"),
|
||||
forceReauthorization: true,
|
||||
});
|
||||
|
||||
expect(saveDiscoveryState).toHaveBeenCalledWith(
|
||||
expect.objectContaining({
|
||||
authorizationServerUrl: "https://as.example.com",
|
||||
resourceMetadataUrl: "https://mcp.example.com/.well-known/x",
|
||||
}),
|
||||
);
|
||||
expect(state).toHaveBeenCalled();
|
||||
expect(startAuthorization).toHaveBeenCalledWith(
|
||||
"https://as.example.com",
|
||||
expect.objectContaining({
|
||||
state: "state-123",
|
||||
resource: new URL("https://mcp.example.com/r"),
|
||||
}),
|
||||
);
|
||||
});
|
||||
|
||||
it("derives scope from resourceMetadata.scopes_supported when no scope given", async () => {
|
||||
stubForcePath({
|
||||
resourceMetadata: { scopes_supported: ["mcp", "weather:read"] },
|
||||
});
|
||||
const provider = makeProvider();
|
||||
|
||||
await mcpAuth(provider, {
|
||||
serverUrl: "https://mcp.example.com",
|
||||
forceReauthorization: true,
|
||||
});
|
||||
|
||||
expect(startAuthorization).toHaveBeenCalledWith(
|
||||
"https://as.example.com",
|
||||
expect.objectContaining({ scope: "mcp weather:read" }),
|
||||
);
|
||||
});
|
||||
|
||||
it("falls back to clientMetadata.scope when nothing else provides scope", async () => {
|
||||
stubForcePath();
|
||||
const provider = makeProvider({
|
||||
clientMetadata: {
|
||||
...makeProvider().clientMetadata,
|
||||
scope: "fallback:scope",
|
||||
},
|
||||
});
|
||||
|
||||
await mcpAuth(provider, {
|
||||
serverUrl: "https://mcp.example.com",
|
||||
forceReauthorization: true,
|
||||
});
|
||||
|
||||
expect(startAuthorization).toHaveBeenCalledWith(
|
||||
"https://as.example.com",
|
||||
expect.objectContaining({ scope: "fallback:scope" }),
|
||||
);
|
||||
});
|
||||
|
||||
it("dynamically registers a client when no client information exists", async () => {
|
||||
stubForcePath();
|
||||
registerClient.mockResolvedValue({ client_id: "registered" });
|
||||
const saveClientInformation = vi.fn().mockResolvedValue(undefined);
|
||||
const provider = makeProvider({
|
||||
clientInformation: vi.fn().mockResolvedValue(undefined),
|
||||
saveClientInformation,
|
||||
});
|
||||
|
||||
const result = await mcpAuth(provider, {
|
||||
serverUrl: "https://mcp.example.com",
|
||||
scope: "mcp",
|
||||
forceReauthorization: true,
|
||||
});
|
||||
|
||||
expect(result).toBe("REDIRECT");
|
||||
expect(registerClient).toHaveBeenCalledWith(
|
||||
"https://as.example.com",
|
||||
expect.objectContaining({ scope: "mcp" }),
|
||||
);
|
||||
expect(saveClientInformation).toHaveBeenCalledWith({
|
||||
client_id: "registered",
|
||||
});
|
||||
});
|
||||
|
||||
it("uses a URL-based client id when the AS supports it", async () => {
|
||||
stubForcePath({
|
||||
authorizationServerMetadata: {
|
||||
issuer: "https://as.example.com",
|
||||
client_id_metadata_document_supported: true,
|
||||
},
|
||||
});
|
||||
isHttpsUrl.mockReturnValue(true);
|
||||
const saveClientInformation = vi.fn().mockResolvedValue(undefined);
|
||||
const provider = makeProvider({
|
||||
clientInformation: vi.fn().mockResolvedValue(undefined),
|
||||
clientMetadataUrl: "https://app.example.com/client.json",
|
||||
saveClientInformation,
|
||||
});
|
||||
|
||||
await mcpAuth(provider, {
|
||||
serverUrl: "https://mcp.example.com",
|
||||
forceReauthorization: true,
|
||||
});
|
||||
|
||||
expect(registerClient).not.toHaveBeenCalled();
|
||||
expect(saveClientInformation).toHaveBeenCalledWith({
|
||||
client_id: "https://app.example.com/client.json",
|
||||
});
|
||||
});
|
||||
|
||||
it("rejects a non-HTTPS clientMetadataUrl", async () => {
|
||||
stubForcePath();
|
||||
isHttpsUrl.mockReturnValue(false);
|
||||
const provider = makeProvider({
|
||||
clientInformation: vi.fn().mockResolvedValue(undefined),
|
||||
clientMetadataUrl: "http://insecure.example.com/client.json",
|
||||
saveClientInformation: vi.fn(),
|
||||
});
|
||||
|
||||
await expect(
|
||||
mcpAuth(provider, {
|
||||
serverUrl: "https://mcp.example.com",
|
||||
forceReauthorization: true,
|
||||
}),
|
||||
).rejects.toBeInstanceOf(InvalidClientMetadataError);
|
||||
expect(registerClient).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("requires saveClientInformation for dynamic registration", async () => {
|
||||
stubForcePath();
|
||||
const provider = makeProvider({
|
||||
clientInformation: vi.fn().mockResolvedValue(undefined),
|
||||
saveClientInformation: undefined,
|
||||
});
|
||||
|
||||
await expect(
|
||||
mcpAuth(provider, {
|
||||
serverUrl: "https://mcp.example.com",
|
||||
forceReauthorization: true,
|
||||
}),
|
||||
).rejects.toThrow(
|
||||
"OAuth client information must be saveable for dynamic registration",
|
||||
);
|
||||
expect(registerClient).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("requires a redirectUrl for the authorization_code flow", async () => {
|
||||
stubForcePath();
|
||||
const provider = makeProvider({ redirectUrl: undefined });
|
||||
|
||||
await expect(
|
||||
mcpAuth(provider, {
|
||||
serverUrl: "https://mcp.example.com",
|
||||
forceReauthorization: true,
|
||||
}),
|
||||
).rejects.toThrow("redirectUrl is required for authorization_code flow");
|
||||
expect(startAuthorization).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,11 +1,22 @@
|
|||
import { describe, it, expect } from "vitest";
|
||||
import {
|
||||
authRecoveryRestoredMessage,
|
||||
emaStepUpFailureMessage,
|
||||
emaStepUpInProgressMessage,
|
||||
emaStepUpSuccessMessage,
|
||||
isActionTriggeredOAuthRecovery,
|
||||
isEmaStepUp,
|
||||
isReAuthBannerReason,
|
||||
isStandardOAuthStepUp,
|
||||
isStepUpConfirmation,
|
||||
oauthPreRedirectToastCopy,
|
||||
oauthResumeAbandonedMessage,
|
||||
oauthResumeSuccessMessage,
|
||||
reAuthBannerMessage,
|
||||
stepUpAdditionalScopes,
|
||||
stepUpConfirmMessage,
|
||||
stepUpFollowUpMessage,
|
||||
stepUpInsufficientScopeMessage,
|
||||
stepUpModalTitle,
|
||||
stepUpAuthorizeActionLabel,
|
||||
} from "@inspector/core/auth/oauthUx.js";
|
||||
|
|
@ -34,6 +45,48 @@ describe("oauthUx step-up copy", () => {
|
|||
).toBe("This operation needs additional scope: weather:read.");
|
||||
});
|
||||
|
||||
it("stepUpConfirmMessage uses plural label and organization language for multiple EMA scopes", () => {
|
||||
expect(
|
||||
stepUpConfirmMessage(
|
||||
{
|
||||
reason: "insufficient_scope",
|
||||
requiredScopes: ["weather:read", "weather:write"],
|
||||
},
|
||||
{ enterpriseManaged: true },
|
||||
),
|
||||
).toBe(
|
||||
"This operation needs additional organization scopes: weather:read, weather:write.",
|
||||
);
|
||||
});
|
||||
|
||||
it("stepUpConfirmMessage uses plural label for multiple standard scopes", () => {
|
||||
expect(
|
||||
stepUpConfirmMessage({
|
||||
reason: "insufficient_scope",
|
||||
requiredScopes: ["weather:read", "weather:write"],
|
||||
}),
|
||||
).toBe(
|
||||
"This operation needs additional scopes: weather:read, weather:write.",
|
||||
);
|
||||
});
|
||||
|
||||
it("stepUpConfirmMessage falls back to generic standard copy with no tool or scopes", () => {
|
||||
expect(stepUpConfirmMessage({ reason: "insufficient_scope" })).toBe(
|
||||
"This operation needs additional OAuth scopes before it can continue.",
|
||||
);
|
||||
});
|
||||
|
||||
it("stepUpConfirmMessage falls back to generic EMA copy with no tool or scopes", () => {
|
||||
expect(
|
||||
stepUpConfirmMessage(
|
||||
{ reason: "insufficient_scope", requiredScopes: ["", ""] },
|
||||
{ enterpriseManaged: true },
|
||||
),
|
||||
).toBe(
|
||||
"This operation needs additional permissions from your organization before it can continue.",
|
||||
);
|
||||
});
|
||||
|
||||
it("stepUpConfirmMessage uses organization language for EMA", () => {
|
||||
expect(
|
||||
stepUpConfirmMessage(challenge, { enterpriseManaged: true }),
|
||||
|
|
@ -41,15 +94,25 @@ describe("oauthUx step-up copy", () => {
|
|||
expect(stepUpFollowUpMessage({ enterpriseManaged: true })).toMatch(
|
||||
/identity provider/i,
|
||||
);
|
||||
expect(stepUpFollowUpMessage()).toMatch(/redirected to authorize/i);
|
||||
expect(stepUpModalTitle({ enterpriseManaged: true })).toMatch(
|
||||
/organization/i,
|
||||
);
|
||||
expect(stepUpModalTitle()).toBe("Additional permissions required");
|
||||
expect(stepUpAuthorizeActionLabel({ enterpriseManaged: true })).toBe(
|
||||
"Authorize",
|
||||
);
|
||||
expect(stepUpAuthorizeActionLabel()).toBe("Authorize (opens browser)");
|
||||
});
|
||||
|
||||
it("isStandardOAuthStepUp is true only for non-EMA insufficient_scope", () => {
|
||||
expect(isStandardOAuthStepUp(challenge)).toBe(true);
|
||||
expect(isStandardOAuthStepUp(challenge, { enterpriseManaged: true })).toBe(
|
||||
false,
|
||||
);
|
||||
expect(isStandardOAuthStepUp({ reason: "token_expired" })).toBe(false);
|
||||
});
|
||||
|
||||
it("isStepUpConfirmation covers standard OAuth and EMA insufficient_scope", () => {
|
||||
expect(isStepUpConfirmation(challenge)).toBe(true);
|
||||
expect(isStepUpConfirmation(challenge, { enterpriseManaged: true })).toBe(
|
||||
|
|
@ -67,6 +130,10 @@ describe("oauthUx step-up copy", () => {
|
|||
).toBe(false);
|
||||
});
|
||||
|
||||
it("emaStepUpInProgressMessage describes requesting organization permissions", () => {
|
||||
expect(emaStepUpInProgressMessage()).toMatch(/organization/i);
|
||||
});
|
||||
|
||||
it("emaStepUpSuccessMessage suggests retry only for command-scoped recovery", () => {
|
||||
expect(emaStepUpSuccessMessage()).toBe(
|
||||
"Organization permissions were updated.",
|
||||
|
|
@ -76,7 +143,194 @@ describe("oauthUx step-up copy", () => {
|
|||
);
|
||||
});
|
||||
|
||||
it("emaStepUpFailureMessage returns detail when present, else generic copy", () => {
|
||||
expect(emaStepUpFailureMessage("boom")).toBe("boom");
|
||||
expect(emaStepUpFailureMessage(" ")).toBe(
|
||||
"Could not obtain the additional permissions from your organization.",
|
||||
);
|
||||
expect(emaStepUpFailureMessage()).toBe(
|
||||
"Could not obtain the additional permissions from your organization.",
|
||||
);
|
||||
});
|
||||
|
||||
it("stepUpAdditionalScopes returns requiredScopes only", () => {
|
||||
expect(stepUpAdditionalScopes(challenge)).toEqual(["weather:read"]);
|
||||
});
|
||||
|
||||
it("stepUpAdditionalScopes returns empty array when requiredScopes undefined", () => {
|
||||
expect(stepUpAdditionalScopes({ reason: "insufficient_scope" })).toEqual(
|
||||
[],
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("oauthUx recovery-source predicates", () => {
|
||||
it("isActionTriggeredOAuthRecovery is true for action sources, false otherwise", () => {
|
||||
for (const source of ["tool", "prompt", "resource", "app"] as const) {
|
||||
expect(isActionTriggeredOAuthRecovery(source)).toBe(true);
|
||||
}
|
||||
expect(isActionTriggeredOAuthRecovery("ambient")).toBe(false);
|
||||
expect(isActionTriggeredOAuthRecovery(undefined)).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("oauthUx resume/restore copy", () => {
|
||||
it("oauthResumeSuccessMessage step_up varies with retry", () => {
|
||||
expect(
|
||||
oauthResumeSuccessMessage("step_up", { recoverySource: "tool" }),
|
||||
).toBe("Step-up authorization succeeded. Retry your action.");
|
||||
expect(oauthResumeSuccessMessage("step_up")).toBe(
|
||||
"Step-up authorization succeeded.",
|
||||
);
|
||||
});
|
||||
|
||||
it("oauthResumeSuccessMessage reauth varies with retry", () => {
|
||||
expect(
|
||||
oauthResumeSuccessMessage("reauth", { recoverySource: "prompt" }),
|
||||
).toBe("Authentication succeeded. Retry your action.");
|
||||
expect(oauthResumeSuccessMessage("reauth")).toBe(
|
||||
"Authentication succeeded.",
|
||||
);
|
||||
});
|
||||
|
||||
it("authRecoveryRestoredMessage varies with retry", () => {
|
||||
expect(authRecoveryRestoredMessage({ recoverySource: "resource" })).toBe(
|
||||
"Session credentials were updated. Retry your action.",
|
||||
);
|
||||
expect(authRecoveryRestoredMessage()).toBe(
|
||||
"Session credentials were updated.",
|
||||
);
|
||||
});
|
||||
|
||||
it("oauthResumeAbandonedMessage reauth is retry-agnostic", () => {
|
||||
expect(
|
||||
oauthResumeAbandonedMessage("reauth", { recoverySource: "tool" }),
|
||||
).toBe("Sign-in was not completed. Re-authenticate to restore access.");
|
||||
expect(oauthResumeAbandonedMessage("reauth")).toBe(
|
||||
"Sign-in was not completed. Re-authenticate to restore access.",
|
||||
);
|
||||
});
|
||||
|
||||
it("oauthResumeAbandonedMessage step_up varies with retry", () => {
|
||||
expect(
|
||||
oauthResumeAbandonedMessage("step_up", { recoverySource: "app" }),
|
||||
).toBe("Step-up authorization was not completed. Retry your action.");
|
||||
expect(oauthResumeAbandonedMessage("step_up")).toBe(
|
||||
"Step-up authorization was not completed.",
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("oauthUx insufficient-scope resolution copy", () => {
|
||||
it("prefers tool context", () => {
|
||||
expect(
|
||||
stepUpInsufficientScopeMessage({
|
||||
reason: "insufficient_scope",
|
||||
context: { toolName: "get_temp" },
|
||||
}),
|
||||
).toMatch(/tool "get_temp"/);
|
||||
});
|
||||
|
||||
it("uses authorizationScopes when present and no tool", () => {
|
||||
expect(
|
||||
stepUpInsufficientScopeMessage({
|
||||
reason: "insufficient_scope",
|
||||
authorizationScopes: ["a", "b"],
|
||||
requiredScopes: ["c"],
|
||||
}),
|
||||
).toBe(
|
||||
"Authorization completed, but required scopes were not granted (a, b). Grant the requested permissions on the authorization server, then retry your action.",
|
||||
);
|
||||
});
|
||||
|
||||
it("falls back to requiredScopes when authorizationScopes absent", () => {
|
||||
expect(
|
||||
stepUpInsufficientScopeMessage({
|
||||
reason: "insufficient_scope",
|
||||
requiredScopes: ["c"],
|
||||
}),
|
||||
).toMatch(/\(c\)/);
|
||||
});
|
||||
|
||||
it("uses generic copy when no tool or scopes", () => {
|
||||
expect(
|
||||
stepUpInsufficientScopeMessage({ reason: "insufficient_scope" }),
|
||||
).toBe(
|
||||
"Authorization completed, but the required permissions were not granted. Grant the requested scopes on the authorization server, then retry your action.",
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("oauthUx pre-redirect toast copy", () => {
|
||||
it("returns undefined for a fresh connect handshake", () => {
|
||||
expect(
|
||||
oauthPreRedirectToastCopy("reauth", { context: "connect" }),
|
||||
).toBeUndefined();
|
||||
});
|
||||
|
||||
it("step_up toast includes server name when provided", () => {
|
||||
expect(oauthPreRedirectToastCopy("step_up", { serverName: "svc" })).toEqual(
|
||||
{
|
||||
title: 'Step-up authorization for "svc"',
|
||||
message: "Redirecting to authorize additional permissions…",
|
||||
},
|
||||
);
|
||||
expect(oauthPreRedirectToastCopy("step_up", {})).toEqual({
|
||||
title: "Step-up authorization",
|
||||
message: "Redirecting to authorize additional permissions…",
|
||||
});
|
||||
});
|
||||
|
||||
it("enterprise-managed reauth toast re-authenticates", () => {
|
||||
expect(
|
||||
oauthPreRedirectToastCopy("reauth", {
|
||||
serverName: "svc",
|
||||
enterpriseManaged: true,
|
||||
}),
|
||||
).toEqual({
|
||||
title: 'Re-authenticating "svc"',
|
||||
message: "Re-authenticating…",
|
||||
});
|
||||
expect(
|
||||
oauthPreRedirectToastCopy("reauth", { enterpriseManaged: true }),
|
||||
).toEqual({ title: "Re-authenticating", message: "Re-authenticating…" });
|
||||
});
|
||||
|
||||
it("default reauth toast signals an expired session", () => {
|
||||
expect(oauthPreRedirectToastCopy("reauth", { serverName: "svc" })).toEqual({
|
||||
title: 'Session expired for "svc"',
|
||||
message: "Session expired, re-authenticating…",
|
||||
});
|
||||
expect(oauthPreRedirectToastCopy("reauth", {})).toEqual({
|
||||
title: "Session expired",
|
||||
message: "Session expired, re-authenticating…",
|
||||
});
|
||||
});
|
||||
});
|
||||
|
||||
describe("oauthUx re-auth banner", () => {
|
||||
it("isReAuthBannerReason is true for degraded-session reasons", () => {
|
||||
for (const reason of [
|
||||
"token_expired",
|
||||
"unauthorized",
|
||||
"invalid_token",
|
||||
] as const) {
|
||||
expect(isReAuthBannerReason(reason)).toBe(true);
|
||||
}
|
||||
expect(isReAuthBannerReason("insufficient_scope")).toBe(false);
|
||||
expect(isReAuthBannerReason(undefined)).toBe(false);
|
||||
});
|
||||
|
||||
it("reAuthBannerMessage varies with server name and detail", () => {
|
||||
expect(
|
||||
reAuthBannerMessage({ serverName: "svc", detail: "Token expired." }),
|
||||
).toBe('Authentication for "svc" needs attention. Token expired.');
|
||||
expect(reAuthBannerMessage({ serverName: "svc" })).toBe(
|
||||
'Authentication for "svc" needs attention.',
|
||||
);
|
||||
expect(reAuthBannerMessage({ detail: "Token expired." })).toBe(
|
||||
"Authentication needs attention. Token expired.",
|
||||
);
|
||||
expect(reAuthBannerMessage({})).toBe("Authentication needs attention.");
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -3,12 +3,24 @@ import {
|
|||
runRunnerInteractiveOAuth,
|
||||
type RunnerInteractiveOAuthClient,
|
||||
} from "@inspector/core/auth/node/runner-interactive-oauth.js";
|
||||
import type {
|
||||
OAuthCallbackServer,
|
||||
OAuthCallbackServerStartOptions,
|
||||
import {
|
||||
createOAuthCallbackServer,
|
||||
type OAuthCallbackServer,
|
||||
type OAuthCallbackServerStartOptions,
|
||||
} from "@inspector/core/auth/node/oauth-callback-server.js";
|
||||
import type { AuthChallenge } from "@inspector/core/auth/challenge.js";
|
||||
|
||||
vi.mock(
|
||||
"@inspector/core/auth/node/oauth-callback-server.js",
|
||||
async (importOriginal) => {
|
||||
const actual =
|
||||
await importOriginal<
|
||||
typeof import("@inspector/core/auth/node/oauth-callback-server.js")
|
||||
>();
|
||||
return { ...actual, createOAuthCallbackServer: vi.fn() };
|
||||
},
|
||||
);
|
||||
|
||||
function mockClient(
|
||||
overrides: Partial<RunnerInteractiveOAuthClient> = {},
|
||||
): RunnerInteractiveOAuthClient {
|
||||
|
|
@ -308,4 +320,123 @@ describe("runRunnerInteractiveOAuth", () => {
|
|||
expect(onCallbackServer).toHaveBeenCalledTimes(1);
|
||||
expect(onCallbackServer).toHaveBeenCalledWith(mockServer);
|
||||
});
|
||||
|
||||
it("wraps a non-Error completeOAuthFlow rejection", async () => {
|
||||
const redirectUrlProvider = { redirectUrl: "" };
|
||||
const client = mockClient({
|
||||
authenticate: vi.fn(async () => {
|
||||
await simulateCallback(handlers.current).catch(() => {});
|
||||
return new URL("https://as.example/authorize");
|
||||
}),
|
||||
completeOAuthFlow: vi.fn(async () => {
|
||||
throw "string failure";
|
||||
}),
|
||||
});
|
||||
|
||||
await expect(
|
||||
runRunnerInteractiveOAuth({
|
||||
client,
|
||||
redirectUrlProvider,
|
||||
callbackListen: {
|
||||
hostname: "127.0.0.1",
|
||||
port: 6276,
|
||||
pathname: "/oauth/callback",
|
||||
},
|
||||
createCallbackServer: () => createMockCallbackServer(handlers),
|
||||
}),
|
||||
).rejects.toThrow("string failure");
|
||||
});
|
||||
|
||||
it("falls back to params.error when no error_description is present", async () => {
|
||||
const redirectUrlProvider = { redirectUrl: "" };
|
||||
const client = mockClient({
|
||||
authenticate: vi.fn(async () => {
|
||||
handlers.current.onError?.({ error: "access_denied" });
|
||||
return new URL("https://as.example/authorize");
|
||||
}),
|
||||
});
|
||||
|
||||
await expect(
|
||||
runRunnerInteractiveOAuth({
|
||||
client,
|
||||
redirectUrlProvider,
|
||||
callbackListen: {
|
||||
hostname: "127.0.0.1",
|
||||
port: 6276,
|
||||
pathname: "/oauth/callback",
|
||||
},
|
||||
createCallbackServer: () => createMockCallbackServer(handlers),
|
||||
}),
|
||||
).rejects.toThrow("access_denied");
|
||||
});
|
||||
|
||||
it("defaults to createOAuthCallbackServer when none is provided", async () => {
|
||||
const redirectUrlProvider = { redirectUrl: "" };
|
||||
vi.mocked(createOAuthCallbackServer).mockReturnValue(
|
||||
createMockCallbackServer(handlers),
|
||||
);
|
||||
const client = mockClient({
|
||||
authenticate: vi.fn(async () => undefined),
|
||||
});
|
||||
|
||||
const result = await runRunnerInteractiveOAuth({
|
||||
client,
|
||||
redirectUrlProvider,
|
||||
callbackListen: {
|
||||
hostname: "127.0.0.1",
|
||||
port: 6276,
|
||||
pathname: "/oauth/callback",
|
||||
},
|
||||
});
|
||||
|
||||
expect(result).toEqual({ kind: "already_authorized" });
|
||||
expect(createOAuthCallbackServer).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("swallows a server.stop() rejection during cleanup", async () => {
|
||||
const redirectUrlProvider = { redirectUrl: "" };
|
||||
const mockServer = createMockCallbackServer(handlers);
|
||||
vi.mocked(mockServer.stop).mockRejectedValue(new Error("stop failed"));
|
||||
const client = mockClient({
|
||||
authenticate: vi.fn(async () => {
|
||||
await simulateCallback(handlers.current);
|
||||
return new URL("https://as.example/authorize");
|
||||
}),
|
||||
});
|
||||
|
||||
const result = await runRunnerInteractiveOAuth({
|
||||
client,
|
||||
redirectUrlProvider,
|
||||
callbackListen: {
|
||||
hostname: "127.0.0.1",
|
||||
port: 6276,
|
||||
pathname: "/oauth/callback",
|
||||
},
|
||||
createCallbackServer: () => mockServer,
|
||||
});
|
||||
|
||||
expect(result).toEqual({ kind: "success" });
|
||||
expect(mockServer.stop).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("cleans up when the callback server fails to start", async () => {
|
||||
const redirectUrlProvider = { redirectUrl: "" };
|
||||
const mockServer = createMockCallbackServer(handlers);
|
||||
vi.mocked(mockServer.start).mockRejectedValue(new Error("bind failed"));
|
||||
const client = mockClient();
|
||||
|
||||
await expect(
|
||||
runRunnerInteractiveOAuth({
|
||||
client,
|
||||
redirectUrlProvider,
|
||||
callbackListen: {
|
||||
hostname: "127.0.0.1",
|
||||
port: 6276,
|
||||
pathname: "/oauth/callback",
|
||||
},
|
||||
createCallbackServer: () => mockServer,
|
||||
}),
|
||||
).rejects.toThrow("bind failed");
|
||||
expect(mockServer.stop).toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
import { describe, it, expect } from "vitest";
|
||||
import { describe, it, expect, afterEach, vi } from "vitest";
|
||||
import {
|
||||
parseHttpUrl,
|
||||
parseOAuthCallbackParams,
|
||||
|
|
@ -6,8 +6,9 @@ import {
|
|||
parseOAuthState,
|
||||
generateOAuthErrorDescription,
|
||||
formatOAuthFailureDetail,
|
||||
isUnauthorizedError,
|
||||
} from "@inspector/core/auth/utils.js";
|
||||
import { ZodError } from "zod";
|
||||
import { z, ZodError } from "zod";
|
||||
|
||||
describe("parseHttpUrl", () => {
|
||||
it("parses valid URLs", () => {
|
||||
|
|
@ -19,6 +20,12 @@ describe("parseHttpUrl", () => {
|
|||
it("throws on invalid URLs", () => {
|
||||
expect(() => parseHttpUrl("not-a-url", "test")).toThrow(/Invalid test/);
|
||||
});
|
||||
|
||||
it("includes the trimmed offending value in the thrown message", () => {
|
||||
expect(() => parseHttpUrl(" bad url ", "Server URL")).toThrow(
|
||||
/Invalid Server URL: "bad url"/,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("parseOAuthCallbackParams", () => {
|
||||
|
|
@ -122,4 +129,137 @@ describe("formatOAuthFailureDetail", () => {
|
|||
"Network timeout",
|
||||
);
|
||||
});
|
||||
|
||||
it("passes through plain strings that are not bracketed JSON", () => {
|
||||
expect(formatOAuthFailureDetail("something went wrong")).toBe(
|
||||
"something went wrong",
|
||||
);
|
||||
});
|
||||
|
||||
it("stringifies non-string/non-error values", () => {
|
||||
expect(formatOAuthFailureDetail(42)).toBe("42");
|
||||
expect(formatOAuthFailureDetail(null)).toBe("null");
|
||||
});
|
||||
|
||||
it("formats a real ZodError instance (non-token path)", () => {
|
||||
const err = z.string().safeParse(123).error!;
|
||||
const result = formatOAuthFailureDetail(err);
|
||||
expect(result).not.toMatch(/valid tokens/i);
|
||||
// Root-level failure has an empty path → "input" label
|
||||
expect(result).toMatch(/^input: /);
|
||||
});
|
||||
|
||||
it("joins non-token issues as `path: message`", () => {
|
||||
const err = new ZodError([
|
||||
{
|
||||
code: "invalid_type",
|
||||
expected: "string",
|
||||
path: ["client", "id"],
|
||||
message: "Required",
|
||||
},
|
||||
]);
|
||||
expect(formatOAuthFailureDetail(err)).toBe("client.id: Required");
|
||||
});
|
||||
|
||||
it("labels an issue with an empty path as `input` and defaults a missing message to `invalid`", () => {
|
||||
const err = new ZodError([
|
||||
{
|
||||
code: "custom",
|
||||
path: [],
|
||||
} as unknown as z.core.$ZodIssue,
|
||||
]);
|
||||
expect(formatOAuthFailureDetail(err)).toBe("input: invalid");
|
||||
});
|
||||
|
||||
it("formats a bracketed JSON string of non-token zod issues", () => {
|
||||
const json = `[ { "code": "invalid_type", "path": [ "scope" ], "message": "Required" } ]`;
|
||||
expect(formatOAuthFailureDetail(json)).toBe("scope: Required");
|
||||
});
|
||||
|
||||
it("returns the raw string when bracketed JSON is invalid", () => {
|
||||
const bad = "[ not valid json";
|
||||
expect(formatOAuthFailureDetail(bad)).toBe(bad);
|
||||
});
|
||||
|
||||
it("returns the raw string when bracketed JSON is not a zod-issue array", () => {
|
||||
// Parses fine, but empty array / first element lacks `code`
|
||||
expect(formatOAuthFailureDetail("[]")).toBe("[]");
|
||||
const notIssues = `[ { "foo": "bar" } ]`;
|
||||
expect(formatOAuthFailureDetail(notIssues)).toBe(notIssues);
|
||||
});
|
||||
|
||||
it("returns the raw string when bracketed JSON is a non-array value", () => {
|
||||
const obj = `[1, 2, 3]`;
|
||||
// Array of numbers: first element is not an object → not a zod-issue array
|
||||
expect(formatOAuthFailureDetail(obj)).toBe(obj);
|
||||
});
|
||||
});
|
||||
|
||||
describe("generateOAuthState fallback", () => {
|
||||
afterEach(() => {
|
||||
vi.unstubAllGlobals();
|
||||
});
|
||||
|
||||
it("uses the Math.random fallback when crypto is unavailable", () => {
|
||||
vi.stubGlobal("crypto", undefined);
|
||||
const state = generateOAuthState();
|
||||
expect(state).toMatch(/^[a-f0-9]{64}$/i);
|
||||
});
|
||||
});
|
||||
|
||||
describe("isUnauthorizedError", () => {
|
||||
it("returns true for an object with status 401", () => {
|
||||
expect(isUnauthorizedError({ status: 401 })).toBe(true);
|
||||
});
|
||||
|
||||
it("returns true for an object with code 401", () => {
|
||||
expect(isUnauthorizedError({ code: 401 })).toBe(true);
|
||||
});
|
||||
|
||||
it("returns true when an Error message matches the transport wording", () => {
|
||||
expect(
|
||||
isUnauthorizedError(new Error("Connection failed for server (401)")),
|
||||
).toBe(true);
|
||||
});
|
||||
|
||||
it("returns true when a non-error value stringifies to matching wording", () => {
|
||||
expect(isUnauthorizedError("request failed with status (401)")).toBe(true);
|
||||
});
|
||||
|
||||
it("returns false for unrelated (401) mentions without `failed`", () => {
|
||||
expect(isUnauthorizedError(new Error("error code (401) noted"))).toBe(
|
||||
false,
|
||||
);
|
||||
});
|
||||
|
||||
it("returns false for a non-401 object", () => {
|
||||
expect(isUnauthorizedError({ status: 500 })).toBe(false);
|
||||
});
|
||||
|
||||
it("returns false for null", () => {
|
||||
expect(isUnauthorizedError(null)).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("generateOAuthErrorDescription without description/uri", () => {
|
||||
it("omits the details and more-info lines when absent", () => {
|
||||
const message = generateOAuthErrorDescription({
|
||||
successful: false,
|
||||
error: "server_error",
|
||||
error_description: null,
|
||||
error_uri: null,
|
||||
});
|
||||
expect(message).toBe("Error: server_error.");
|
||||
});
|
||||
});
|
||||
|
||||
describe("parseOAuthCallbackParams error without description", () => {
|
||||
it("returns null description/uri when only error is present", () => {
|
||||
expect(parseOAuthCallbackParams("?error=access_denied")).toEqual({
|
||||
successful: false,
|
||||
error: "access_denied",
|
||||
error_description: null,
|
||||
error_uri: null,
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -0,0 +1,297 @@
|
|||
import { describe, it, expect, vi, beforeEach } from "vitest";
|
||||
import { AuthChallengeError } from "@inspector/core/auth/challenge.js";
|
||||
import type { AuthChallenge } from "@inspector/core/auth/challenge.js";
|
||||
import { InspectorClient } from "@inspector/core/mcp/inspectorClient.js";
|
||||
import { RemoteClientTransport } from "@inspector/core/mcp/remote/remoteClientTransport.js";
|
||||
|
||||
/**
|
||||
* Additional branch coverage for the mid-session auth recovery paths
|
||||
* (`handleAmbientAuthChallenge` / `runAmbientAuthChallenge`, `withDirectAuthRecovery`,
|
||||
* `pushRemoteAuthState`, `resumeAfterOAuth`). Complements
|
||||
* inspectorClient-ambient-auth.test.ts and inspectorClient-direct-auth-recovery.test.ts,
|
||||
* which each cover a single "happy path" through these methods.
|
||||
*
|
||||
* Uses the same `Object.create(InspectorClient.prototype)` technique as the
|
||||
* sibling test files so each test can wire up only the private fields its
|
||||
* branch needs, without a live transport or a real OAuthManager.
|
||||
*/
|
||||
|
||||
type FakeOAuthManager = {
|
||||
handleAuthChallenge: ReturnType<typeof vi.fn>;
|
||||
completeOAuthFlow?: ReturnType<typeof vi.fn>;
|
||||
};
|
||||
|
||||
type Internals = {
|
||||
oauthManager: FakeOAuthManager | null;
|
||||
baseTransport: unknown;
|
||||
ambientAuthChallengeInFlight: Map<string, Promise<void>>;
|
||||
directAuthRecovery: boolean;
|
||||
directAuthRecoveryActive: boolean | null;
|
||||
activeToolCallAbortController?: AbortController;
|
||||
status: string;
|
||||
reconnectAfterAuthRecovery: () => Promise<void>;
|
||||
withDirectAuthRecovery: <T>(
|
||||
operation: () => Promise<T>,
|
||||
context?: { method?: string; toolName?: string },
|
||||
attempt?: number,
|
||||
) => Promise<T>;
|
||||
};
|
||||
|
||||
function makeClient(): InspectorClient {
|
||||
const client = Object.create(InspectorClient.prototype) as InspectorClient;
|
||||
(client as unknown as Internals).ambientAuthChallengeInFlight = new Map();
|
||||
return client;
|
||||
}
|
||||
|
||||
function internalsOf(client: InspectorClient): Internals {
|
||||
return client as unknown as Internals;
|
||||
}
|
||||
|
||||
describe("InspectorClient pushRemoteAuthState", () => {
|
||||
beforeEach(() => {
|
||||
vi.restoreAllMocks();
|
||||
});
|
||||
|
||||
it("is a no-op when the base transport is not a RemoteClientTransport", async () => {
|
||||
const client = makeClient();
|
||||
internalsOf(client).baseTransport = null;
|
||||
|
||||
await expect(client.pushRemoteAuthState()).resolves.toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe("InspectorClient runAmbientAuthChallenge branches", () => {
|
||||
beforeEach(() => {
|
||||
vi.restoreAllMocks();
|
||||
});
|
||||
|
||||
const challenge: AuthChallenge = { reason: "token_expired" };
|
||||
|
||||
it("returns without dispatching a recovery outcome when no oauthManager is configured", async () => {
|
||||
const client = makeClient();
|
||||
internalsOf(client).oauthManager = null;
|
||||
const dispatch = vi
|
||||
.spyOn(client, "dispatchTypedEvent")
|
||||
.mockImplementation(() => {});
|
||||
|
||||
await client.handleAmbientAuthChallenge(challenge);
|
||||
|
||||
// Only the initial "ambient" announcement fires; the early return means no
|
||||
// outcome-specific event (recovered/interactive/oauthError) is dispatched.
|
||||
expect(dispatch).toHaveBeenCalledTimes(1);
|
||||
expect(dispatch).toHaveBeenCalledWith("authChallengeAmbient", {
|
||||
challenge,
|
||||
});
|
||||
});
|
||||
|
||||
it("reconnects (rather than pushing remote auth state) for a non-remote transport on a satisfied outcome", async () => {
|
||||
const client = makeClient();
|
||||
const handleAuthChallenge = vi
|
||||
.fn()
|
||||
.mockResolvedValue({ kind: "satisfied" });
|
||||
internalsOf(client).oauthManager = { handleAuthChallenge };
|
||||
internalsOf(client).baseTransport = {}; // not a RemoteClientTransport instance
|
||||
const reconnect = vi.fn().mockResolvedValue(undefined);
|
||||
internalsOf(client).reconnectAfterAuthRecovery = reconnect;
|
||||
const pushRemoteAuthState = vi
|
||||
.spyOn(client, "pushRemoteAuthState")
|
||||
.mockResolvedValue(undefined);
|
||||
const dispatch = vi
|
||||
.spyOn(client, "dispatchTypedEvent")
|
||||
.mockImplementation(() => {});
|
||||
|
||||
await client.handleAmbientAuthChallenge(challenge);
|
||||
|
||||
expect(reconnect).toHaveBeenCalledTimes(1);
|
||||
expect(pushRemoteAuthState).not.toHaveBeenCalled();
|
||||
expect(dispatch).toHaveBeenCalledWith("authChallengeRecovered", {
|
||||
challenge,
|
||||
});
|
||||
});
|
||||
|
||||
it("dispatches an interactive event with the EMA pending URL for a step_up_confirm outcome", async () => {
|
||||
const client = makeClient();
|
||||
const outcomeChallenge: AuthChallenge = {
|
||||
reason: "insufficient_scope",
|
||||
requiredScopes: ["weather:read"],
|
||||
};
|
||||
const handleAuthChallenge = vi.fn().mockResolvedValue({
|
||||
kind: "step_up_confirm",
|
||||
challenge: outcomeChallenge,
|
||||
});
|
||||
internalsOf(client).oauthManager = { handleAuthChallenge };
|
||||
const dispatch = vi
|
||||
.spyOn(client, "dispatchTypedEvent")
|
||||
.mockImplementation(() => {});
|
||||
|
||||
await client.handleAmbientAuthChallenge(challenge);
|
||||
|
||||
expect(dispatch).toHaveBeenCalledWith(
|
||||
"authChallengeInteractive",
|
||||
expect.objectContaining({ challenge: outcomeChallenge }),
|
||||
);
|
||||
});
|
||||
|
||||
it("dispatches oauthError for a failed outcome", async () => {
|
||||
const client = makeClient();
|
||||
const error = new Error("recovery failed");
|
||||
const handleAuthChallenge = vi
|
||||
.fn()
|
||||
.mockResolvedValue({ kind: "failed", error });
|
||||
internalsOf(client).oauthManager = { handleAuthChallenge };
|
||||
const dispatch = vi
|
||||
.spyOn(client, "dispatchTypedEvent")
|
||||
.mockImplementation(() => {});
|
||||
|
||||
await client.handleAmbientAuthChallenge(challenge);
|
||||
|
||||
expect(dispatch).toHaveBeenCalledWith("oauthError", { error });
|
||||
});
|
||||
|
||||
it("wraps a non-Error thrown from handleAuthChallenge before dispatching oauthError", async () => {
|
||||
const client = makeClient();
|
||||
const handleAuthChallenge = vi.fn().mockRejectedValue("boom-string");
|
||||
internalsOf(client).oauthManager = { handleAuthChallenge };
|
||||
const dispatch = vi
|
||||
.spyOn(client, "dispatchTypedEvent")
|
||||
.mockImplementation(() => {});
|
||||
|
||||
await client.handleAmbientAuthChallenge(challenge);
|
||||
|
||||
const call = dispatch.mock.calls.find(([name]) => name === "oauthError");
|
||||
expect(call).toBeDefined();
|
||||
const detail = call?.[1] as { error: Error };
|
||||
expect(detail.error).toBeInstanceOf(Error);
|
||||
expect(detail.error.message).toBe("boom-string");
|
||||
});
|
||||
|
||||
it("passes through a real Error thrown from handleAuthChallenge unwrapped", async () => {
|
||||
const client = makeClient();
|
||||
const thrown = new Error("direct failure");
|
||||
const handleAuthChallenge = vi.fn().mockRejectedValue(thrown);
|
||||
internalsOf(client).oauthManager = { handleAuthChallenge };
|
||||
const dispatch = vi
|
||||
.spyOn(client, "dispatchTypedEvent")
|
||||
.mockImplementation(() => {});
|
||||
|
||||
await client.handleAmbientAuthChallenge(challenge);
|
||||
|
||||
const call = dispatch.mock.calls.find(([name]) => name === "oauthError");
|
||||
expect(call?.[1]).toEqual({ error: thrown });
|
||||
});
|
||||
});
|
||||
|
||||
describe("InspectorClient withDirectAuthRecovery branches", () => {
|
||||
beforeEach(() => {
|
||||
vi.restoreAllMocks();
|
||||
});
|
||||
|
||||
it("rethrows immediately without consulting handleAuthChallenge for a non-auth-challenge error", async () => {
|
||||
const client = makeClient();
|
||||
internalsOf(client).directAuthRecovery = true;
|
||||
internalsOf(client).directAuthRecoveryActive = true;
|
||||
const operation = vi.fn().mockRejectedValue(new Error("network down"));
|
||||
const handleAuthChallenge = vi.spyOn(client, "handleAuthChallenge");
|
||||
|
||||
await expect(
|
||||
internalsOf(client).withDirectAuthRecovery.call(client, operation),
|
||||
).rejects.toThrow("network down");
|
||||
|
||||
expect(operation).toHaveBeenCalledTimes(1);
|
||||
expect(handleAuthChallenge).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("clears an active tool-call abort controller and retries after a satisfied recovery", async () => {
|
||||
const client = makeClient();
|
||||
internalsOf(client).directAuthRecovery = true;
|
||||
internalsOf(client).directAuthRecoveryActive = true;
|
||||
const abortController = new AbortController();
|
||||
internalsOf(client).activeToolCallAbortController = abortController;
|
||||
const reconnect = vi.fn().mockResolvedValue(undefined);
|
||||
internalsOf(client).reconnectAfterAuthRecovery = reconnect;
|
||||
|
||||
const challenge = { reason: "token_expired" as const };
|
||||
const operation = vi
|
||||
.fn()
|
||||
.mockRejectedValueOnce(new AuthChallengeError(challenge, 401))
|
||||
.mockResolvedValueOnce("ok");
|
||||
vi.spyOn(client, "handleAuthChallenge").mockResolvedValue({
|
||||
kind: "satisfied",
|
||||
});
|
||||
vi.spyOn(client, "dispatchTypedEvent").mockImplementation(() => {});
|
||||
|
||||
const result = await internalsOf(client).withDirectAuthRecovery.call(
|
||||
client,
|
||||
operation,
|
||||
);
|
||||
|
||||
expect(result).toBe("ok");
|
||||
expect(internalsOf(client).activeToolCallAbortController).toBeUndefined();
|
||||
expect(reconnect).toHaveBeenCalledTimes(1);
|
||||
expect(operation).toHaveBeenCalledTimes(2);
|
||||
});
|
||||
|
||||
it("throws AuthRecoveryRequiredError with emaStepUpConfirm for a step_up_confirm outcome", async () => {
|
||||
const client = makeClient();
|
||||
internalsOf(client).directAuthRecovery = true;
|
||||
internalsOf(client).directAuthRecoveryActive = true;
|
||||
const challenge = {
|
||||
reason: "insufficient_scope" as const,
|
||||
requiredScopes: ["weather:read"],
|
||||
};
|
||||
const operation = vi
|
||||
.fn()
|
||||
.mockRejectedValue(new AuthChallengeError(challenge, 403));
|
||||
vi.spyOn(client, "handleAuthChallenge").mockResolvedValue({
|
||||
kind: "step_up_confirm",
|
||||
challenge,
|
||||
});
|
||||
vi.spyOn(client, "dispatchTypedEvent").mockImplementation(() => {});
|
||||
|
||||
await expect(
|
||||
internalsOf(client).withDirectAuthRecovery.call(client, operation),
|
||||
).rejects.toMatchObject({
|
||||
name: "AuthRecoveryRequiredError",
|
||||
emaStepUpConfirm: true,
|
||||
});
|
||||
expect(operation).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
});
|
||||
|
||||
describe("InspectorClient resumeAfterOAuth branches", () => {
|
||||
beforeEach(() => {
|
||||
vi.restoreAllMocks();
|
||||
});
|
||||
|
||||
it("reattaches a remote session, pushes auth state, and reconnects when not connected", async () => {
|
||||
const client = makeClient();
|
||||
internalsOf(client).oauthManager = {
|
||||
handleAuthChallenge: vi.fn(),
|
||||
completeOAuthFlow: vi.fn().mockResolvedValue(undefined),
|
||||
};
|
||||
internalsOf(client).directAuthRecovery = false;
|
||||
internalsOf(client).directAuthRecoveryActive = null;
|
||||
internalsOf(client).status = "disconnected";
|
||||
|
||||
const transport = Object.create(
|
||||
RemoteClientTransport.prototype,
|
||||
) as RemoteClientTransport;
|
||||
const attachToSession = vi.fn().mockResolvedValue(undefined);
|
||||
const pushAuthState = vi.fn().mockResolvedValue(undefined);
|
||||
(transport as unknown as { attachToSession: unknown }).attachToSession =
|
||||
attachToSession;
|
||||
(transport as unknown as { pushAuthState: unknown }).pushAuthState =
|
||||
pushAuthState;
|
||||
internalsOf(client).baseTransport = transport;
|
||||
|
||||
const connectSpy = vi.spyOn(client, "connect").mockResolvedValue(undefined);
|
||||
|
||||
await client.resumeAfterOAuth("auth-code", {
|
||||
remoteSessionId: "session-1",
|
||||
});
|
||||
|
||||
expect(attachToSession).toHaveBeenCalledWith("session-1");
|
||||
expect(pushAuthState).toHaveBeenCalledTimes(1);
|
||||
expect(connectSpy).toHaveBeenCalledTimes(1);
|
||||
});
|
||||
});
|
||||
|
|
@ -49,4 +49,38 @@ describe("createAuthChallengeInterceptFetch", () => {
|
|||
);
|
||||
}
|
||||
});
|
||||
|
||||
it("cancels a present response body before throwing", async () => {
|
||||
const response = new Response("challenge body", {
|
||||
status: 401,
|
||||
headers: { "WWW-Authenticate": 'Bearer error="invalid_token"' },
|
||||
});
|
||||
const cancelSpy = vi.spyOn(response.body!, "cancel");
|
||||
const baseFetch = vi.fn(async () => response);
|
||||
const fetchFn = createAuthChallengeInterceptFetch(baseFetch);
|
||||
|
||||
await expect(fetchFn("https://example.com/mcp")).rejects.toBeInstanceOf(
|
||||
AuthChallengeError,
|
||||
);
|
||||
expect(cancelSpy).toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("swallows a body.cancel() rejection and still throws the challenge", async () => {
|
||||
const response = new Response("challenge body", {
|
||||
status: 403,
|
||||
headers: {
|
||||
"WWW-Authenticate":
|
||||
'Bearer error="insufficient_scope", scope="weather:read"',
|
||||
},
|
||||
});
|
||||
vi.spyOn(response.body!, "cancel").mockRejectedValue(
|
||||
new Error("cancel failed"),
|
||||
);
|
||||
const baseFetch = vi.fn(async () => response);
|
||||
const fetchFn = createAuthChallengeInterceptFetch(baseFetch);
|
||||
|
||||
await expect(fetchFn("https://example.com/mcp")).rejects.toBeInstanceOf(
|
||||
AuthChallengeError,
|
||||
);
|
||||
});
|
||||
});
|
||||
|
|
|
|||
|
|
@ -244,6 +244,24 @@ describe("OAuthManager", () => {
|
|||
const manager = new OAuthManager(params);
|
||||
expect(await manager.getOAuthTokens()).toBeUndefined();
|
||||
});
|
||||
|
||||
it("returns tokens from in-memory flow state without querying storage", async () => {
|
||||
mockedMcpAuth.mockResolvedValue("AUTHORIZED");
|
||||
const params = createMockParams();
|
||||
const tokens = { access_token: "cached", token_type: "Bearer" };
|
||||
storageOf(params).getTokens.mockResolvedValue(tokens);
|
||||
storageOf(params).getClientInformation.mockResolvedValue({
|
||||
client_id: "cid",
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
await manager.completeOAuthFlow("code");
|
||||
storageOf(params).getTokens.mockClear();
|
||||
|
||||
const result = await manager.getOAuthTokens();
|
||||
|
||||
expect(result).toEqual(tokens);
|
||||
expect(storageOf(params).getTokens).not.toHaveBeenCalled();
|
||||
});
|
||||
});
|
||||
|
||||
describe("isOAuthAuthorized", () => {
|
||||
|
|
@ -804,6 +822,65 @@ describe("OAuthManager", () => {
|
|||
startSpy.mockRestore();
|
||||
parseSpy.mockRestore();
|
||||
});
|
||||
|
||||
it("skips onBeforeOAuthRedirect when none is configured", async () => {
|
||||
const silentSpy = vi
|
||||
.spyOn(emaFlow, "trySilentEmaAuth")
|
||||
.mockResolvedValue({ status: "no_idp_session" });
|
||||
const authUrl = new URL(
|
||||
"https://idp.example.com/authorize?state=no-callback",
|
||||
);
|
||||
const startSpy = vi
|
||||
.spyOn(emaFlow, "startEmaIdpAuthorization")
|
||||
.mockResolvedValue(authUrl);
|
||||
const params = createMockParams({
|
||||
enterpriseManagedAuth: {
|
||||
idp: {
|
||||
issuer: "https://idp.example.com",
|
||||
clientId: "app-client",
|
||||
clientSecret: "secret",
|
||||
},
|
||||
},
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
manager.setOAuthConfig({ enterpriseManaged: true });
|
||||
|
||||
const result = await manager.authenticate();
|
||||
|
||||
expect(result).toEqual(authUrl);
|
||||
expect(
|
||||
params.initialConfig.navigation!.navigateToAuthorization,
|
||||
).toHaveBeenCalledWith(authUrl);
|
||||
|
||||
silentSpy.mockRestore();
|
||||
startSpy.mockRestore();
|
||||
});
|
||||
|
||||
it("skips onBeforeOAuthRedirect when the authorization state has no authId", async () => {
|
||||
const silentSpy = vi
|
||||
.spyOn(emaFlow, "trySilentEmaAuth")
|
||||
.mockResolvedValue({ status: "no_idp_session" });
|
||||
const authUrl = new URL(
|
||||
"https://idp.example.com/authorize?state=no-authid",
|
||||
);
|
||||
const startSpy = vi
|
||||
.spyOn(emaFlow, "startEmaIdpAuthorization")
|
||||
.mockResolvedValue(authUrl);
|
||||
const parseSpy = vi
|
||||
.spyOn(await import("@inspector/core/auth/utils.js"), "parseOAuthState")
|
||||
.mockReturnValue(null);
|
||||
const params = emaParams();
|
||||
const manager = new OAuthManager(params);
|
||||
manager.setOAuthConfig({ enterpriseManaged: true });
|
||||
|
||||
await manager.authenticate();
|
||||
|
||||
expect(params.onBeforeOAuthRedirect).not.toHaveBeenCalled();
|
||||
|
||||
silentSpy.mockRestore();
|
||||
startSpy.mockRestore();
|
||||
parseSpy.mockRestore();
|
||||
});
|
||||
});
|
||||
|
||||
describe("refreshEnterpriseManagedTokens", () => {
|
||||
|
|
@ -1505,4 +1582,643 @@ describe("OAuthManager", () => {
|
|||
expect(state?.serverUrl).toBe(SERVER_URL);
|
||||
});
|
||||
});
|
||||
|
||||
describe("getOAuthState (storage not configured)", () => {
|
||||
it("returns undefined when storage is not configured", async () => {
|
||||
const params = createMockParams({
|
||||
initialConfig: {
|
||||
redirectUrlProvider: {
|
||||
getRedirectUrl: vi
|
||||
.fn()
|
||||
.mockReturnValue("http://localhost/callback"),
|
||||
},
|
||||
navigation: { navigateToAuthorization: vi.fn() },
|
||||
} as OAuthManagerConfig,
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
await expect(manager.getOAuthState()).resolves.toBeUndefined();
|
||||
});
|
||||
});
|
||||
|
||||
describe("checkAuthChallengeSatisfied (storage not configured)", () => {
|
||||
it("returns false when storage is not configured", async () => {
|
||||
const params = createMockParams({
|
||||
initialConfig: {
|
||||
redirectUrlProvider: {
|
||||
getRedirectUrl: vi
|
||||
.fn()
|
||||
.mockReturnValue("http://localhost/callback"),
|
||||
},
|
||||
navigation: { navigateToAuthorization: vi.fn() },
|
||||
} as OAuthManagerConfig,
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
expect(
|
||||
await manager.checkAuthChallengeSatisfied({
|
||||
reason: "insufficient_scope",
|
||||
}),
|
||||
).toBe(false);
|
||||
});
|
||||
});
|
||||
|
||||
describe("handleAuthChallenge (additional branch coverage)", () => {
|
||||
it("resolves via the second satisfaction check inside the mutex", async () => {
|
||||
const params = createMockParams();
|
||||
const insufficientTokens = {
|
||||
access_token: "a1",
|
||||
token_type: "Bearer",
|
||||
scope: "mcp tools:read",
|
||||
};
|
||||
const sufficientTokens = {
|
||||
access_token: "a2",
|
||||
token_type: "Bearer",
|
||||
scope: "mcp tools:read weather:read",
|
||||
};
|
||||
storageOf(params).getScope.mockReturnValue("mcp tools:read");
|
||||
storageOf(params)
|
||||
.getTokens.mockResolvedValueOnce(insufficientTokens)
|
||||
.mockResolvedValue(sufficientTokens);
|
||||
const manager = new OAuthManager(params);
|
||||
|
||||
const outcome = await manager.handleAuthChallenge({
|
||||
reason: "insufficient_scope",
|
||||
requiredScopes: ["weather:read"],
|
||||
});
|
||||
|
||||
expect(outcome).toEqual({ kind: "satisfied" });
|
||||
expect(mockedMcpAuth).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("persists broadened scope when silent refresh already satisfies the step-up scope", async () => {
|
||||
mockedMcpAuth.mockResolvedValue("AUTHORIZED");
|
||||
const params = createMockParams();
|
||||
const insufficientTokens = {
|
||||
access_token: "a1",
|
||||
refresh_token: "r1",
|
||||
token_type: "Bearer",
|
||||
scope: "mcp tools:read",
|
||||
};
|
||||
const sufficientTokens = {
|
||||
access_token: "a2",
|
||||
refresh_token: "r2",
|
||||
token_type: "Bearer",
|
||||
scope: "mcp tools:read weather:read",
|
||||
};
|
||||
storageOf(params).getScope.mockReturnValue("mcp tools:read");
|
||||
storageOf(params)
|
||||
.getTokens.mockResolvedValueOnce(insufficientTokens)
|
||||
.mockResolvedValueOnce(insufficientTokens)
|
||||
.mockResolvedValueOnce(insufficientTokens)
|
||||
.mockResolvedValue(sufficientTokens);
|
||||
const manager = new OAuthManager(params);
|
||||
|
||||
const outcome = await manager.handleAuthChallenge({
|
||||
reason: "insufficient_scope",
|
||||
requiredScopes: ["weather:read"],
|
||||
});
|
||||
|
||||
expect(outcome).toEqual({ kind: "satisfied" });
|
||||
expect(storageOf(params).saveScope).toHaveBeenCalledWith(
|
||||
SERVER_URL,
|
||||
"mcp tools:read weather:read",
|
||||
);
|
||||
});
|
||||
|
||||
it("returns satisfied without persisting scope when the fresh grant has no scope to record", async () => {
|
||||
mockedMcpAuth.mockResolvedValue("AUTHORIZED");
|
||||
const params = createMockParams();
|
||||
// scope: "" (not omitted) avoids enrichChallengeWithAuthorizationScopes'
|
||||
// internal extra getTokens() re-fetch, which only triggers when the
|
||||
// passed grantedTokenScope is `undefined`.
|
||||
const noScopeTokens = {
|
||||
access_token: "a",
|
||||
token_type: "Bearer",
|
||||
scope: "",
|
||||
};
|
||||
const midScopeTokens = {
|
||||
access_token: "b",
|
||||
token_type: "Bearer",
|
||||
scope: "newscope",
|
||||
};
|
||||
const finalNoScopeTokens = {
|
||||
access_token: "c",
|
||||
token_type: "Bearer",
|
||||
scope: "",
|
||||
};
|
||||
storageOf(params)
|
||||
.getTokens.mockResolvedValueOnce(undefined)
|
||||
.mockResolvedValueOnce(undefined)
|
||||
.mockResolvedValueOnce(noScopeTokens)
|
||||
.mockResolvedValueOnce(midScopeTokens)
|
||||
.mockResolvedValueOnce(finalNoScopeTokens);
|
||||
const manager = new OAuthManager(params);
|
||||
|
||||
const outcome = await manager.handleAuthChallenge({
|
||||
reason: "insufficient_scope",
|
||||
});
|
||||
|
||||
expect(outcome).toEqual({ kind: "satisfied" });
|
||||
expect(storageOf(params).saveScope).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("forces reauthorization and persists the granted scope when the retry succeeds", async () => {
|
||||
mockedMcpAuth.mockResolvedValue("AUTHORIZED");
|
||||
const params = createMockParams();
|
||||
const noScopeTokens = {
|
||||
access_token: "a",
|
||||
token_type: "Bearer",
|
||||
scope: "",
|
||||
};
|
||||
const midScopeTokens = {
|
||||
access_token: "b",
|
||||
token_type: "Bearer",
|
||||
scope: "newscope",
|
||||
};
|
||||
const grantedTokens = {
|
||||
access_token: "d",
|
||||
token_type: "Bearer",
|
||||
scope: "granted:scope",
|
||||
};
|
||||
storageOf(params)
|
||||
.getTokens.mockResolvedValueOnce(undefined)
|
||||
.mockResolvedValueOnce(undefined)
|
||||
.mockResolvedValueOnce(noScopeTokens)
|
||||
.mockResolvedValueOnce(noScopeTokens)
|
||||
.mockResolvedValueOnce(midScopeTokens)
|
||||
.mockResolvedValueOnce(grantedTokens);
|
||||
const manager = new OAuthManager(params);
|
||||
|
||||
const outcome = await manager.handleAuthChallenge({
|
||||
reason: "insufficient_scope",
|
||||
});
|
||||
|
||||
expect(outcome).toEqual({ kind: "satisfied" });
|
||||
expect(mockedMcpAuth).toHaveBeenCalledTimes(2);
|
||||
expect(mockedMcpAuth).toHaveBeenNthCalledWith(
|
||||
2,
|
||||
expect.anything(),
|
||||
expect.objectContaining({ forceReauthorization: true }),
|
||||
);
|
||||
expect(storageOf(params).saveScope).toHaveBeenCalledWith(
|
||||
SERVER_URL,
|
||||
"granted:scope",
|
||||
);
|
||||
});
|
||||
|
||||
it("forces reauthorization without persisting scope when the retry grants no explicit scope", async () => {
|
||||
mockedMcpAuth.mockResolvedValue("AUTHORIZED");
|
||||
const params = createMockParams();
|
||||
const noScopeTokens = {
|
||||
access_token: "a",
|
||||
token_type: "Bearer",
|
||||
scope: "",
|
||||
};
|
||||
const midScopeTokens = {
|
||||
access_token: "b",
|
||||
token_type: "Bearer",
|
||||
scope: "newscope",
|
||||
};
|
||||
storageOf(params)
|
||||
.getTokens.mockResolvedValueOnce(undefined)
|
||||
.mockResolvedValueOnce(undefined)
|
||||
.mockResolvedValueOnce(noScopeTokens)
|
||||
.mockResolvedValueOnce(noScopeTokens)
|
||||
.mockResolvedValueOnce(midScopeTokens)
|
||||
.mockResolvedValueOnce(noScopeTokens);
|
||||
const manager = new OAuthManager(params);
|
||||
|
||||
const outcome = await manager.handleAuthChallenge({
|
||||
reason: "insufficient_scope",
|
||||
});
|
||||
|
||||
expect(outcome).toEqual({ kind: "satisfied" });
|
||||
expect(storageOf(params).saveScope).not.toHaveBeenCalled();
|
||||
});
|
||||
|
||||
it("returns failed when the forced reauthorization retry does not complete", async () => {
|
||||
mockedMcpAuth
|
||||
.mockResolvedValueOnce("AUTHORIZED")
|
||||
.mockResolvedValueOnce("REDIRECT");
|
||||
const params = createMockParams();
|
||||
storageOf(params).getScope.mockReturnValue("mcp tools:read");
|
||||
storageOf(params).getTokens.mockResolvedValue({
|
||||
access_token: "access",
|
||||
token_type: "Bearer",
|
||||
scope: "mcp tools:read",
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
|
||||
const outcome = await manager.handleAuthChallenge({
|
||||
reason: "insufficient_scope",
|
||||
requiredScopes: ["weather:read"],
|
||||
});
|
||||
|
||||
expect(outcome.kind).toBe("failed");
|
||||
if (outcome.kind === "failed") {
|
||||
expect(outcome.error.message).toMatch(/weather:read/);
|
||||
}
|
||||
});
|
||||
|
||||
it("falls back to challenge requiredScopes when no catalog scope is configured", async () => {
|
||||
mockedMcpAuth.mockResolvedValue("AUTHORIZED");
|
||||
const params = createMockParams();
|
||||
const manager = new OAuthManager(params);
|
||||
|
||||
const outcome = await manager.handleAuthChallenge({
|
||||
reason: "unauthorized",
|
||||
requiredScopes: ["fallback:scope"],
|
||||
});
|
||||
|
||||
expect(outcome).toEqual({ kind: "satisfied" });
|
||||
expect(mockedMcpAuth).toHaveBeenCalledWith(
|
||||
expect.anything(),
|
||||
expect.objectContaining({ scope: "fallback:scope" }),
|
||||
);
|
||||
});
|
||||
});
|
||||
|
||||
describe("completeOAuthFlow (non-Error rejection)", () => {
|
||||
it("wraps non-Error throw values in the dispatched error", async () => {
|
||||
const errorSpy = vi.spyOn(console, "error").mockImplementation(() => {});
|
||||
mockedMcpAuth.mockRejectedValue("plain-string-failure");
|
||||
const params = createMockParams();
|
||||
const manager = new OAuthManager(params);
|
||||
|
||||
await expect(manager.completeOAuthFlow("code")).rejects.toBe(
|
||||
"plain-string-failure",
|
||||
);
|
||||
expect(params.dispatchOAuthError).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ error: expect.any(Error) }),
|
||||
);
|
||||
const dispatchedError = (
|
||||
params.dispatchOAuthError as ReturnType<typeof vi.fn>
|
||||
).mock.calls[0][0].error as Error;
|
||||
expect(dispatchedError.message).toBe("plain-string-failure");
|
||||
errorSpy.mockRestore();
|
||||
});
|
||||
});
|
||||
|
||||
describe("handleEnterpriseManagedAuthChallenge (additional branch coverage)", () => {
|
||||
it("returns failed when EMA silent re-mint fails during confirmed step-up", async () => {
|
||||
const mintError = new Error("mint failed during step-up");
|
||||
const silentSpy = vi
|
||||
.spyOn(emaFlow, "trySilentEmaAuth")
|
||||
.mockResolvedValue({ status: "mint_failed", error: mintError });
|
||||
const params = createMockParams({
|
||||
enterpriseManagedAuth: {
|
||||
idp: {
|
||||
issuer: "https://idp.example.com",
|
||||
clientId: "app-client",
|
||||
clientSecret: "secret",
|
||||
},
|
||||
},
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
manager.setOAuthConfig({ enterpriseManaged: true });
|
||||
|
||||
const outcome = await manager.handleAuthChallenge(
|
||||
{ reason: "insufficient_scope", requiredScopes: ["weather:read"] },
|
||||
{ confirmedStepUp: true },
|
||||
);
|
||||
|
||||
expect(outcome).toEqual({ kind: "failed", error: mintError });
|
||||
silentSpy.mockRestore();
|
||||
});
|
||||
|
||||
it("returns satisfied for EMA token_expired when refreshEmaResourceTokens succeeds, using the configured fallback scope", async () => {
|
||||
const refreshSpy = vi
|
||||
.spyOn(emaFlow, "refreshEmaResourceTokens")
|
||||
.mockResolvedValue({ access_token: "R", token_type: "Bearer" });
|
||||
const params = createMockParams({
|
||||
enterpriseManagedAuth: {
|
||||
idp: {
|
||||
issuer: "https://idp.example.com",
|
||||
clientId: "app-client",
|
||||
clientSecret: "secret",
|
||||
},
|
||||
},
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
manager.setOAuthConfig({
|
||||
enterpriseManaged: true,
|
||||
scope: "fallback:scope",
|
||||
});
|
||||
|
||||
const outcome = await manager.handleAuthChallenge({
|
||||
reason: "token_expired",
|
||||
});
|
||||
|
||||
expect(outcome).toEqual({ kind: "satisfied" });
|
||||
expect(refreshSpy).toHaveBeenCalledWith(
|
||||
expect.objectContaining({ scope: "fallback:scope" }),
|
||||
);
|
||||
refreshSpy.mockRestore();
|
||||
});
|
||||
|
||||
it("returns failed when starting the EMA IdP authorization throws an Error", async () => {
|
||||
const refreshSpy = vi
|
||||
.spyOn(emaFlow, "refreshEmaResourceTokens")
|
||||
.mockResolvedValue(undefined);
|
||||
const startSpy = vi
|
||||
.spyOn(emaFlow, "startEmaIdpAuthorization")
|
||||
.mockRejectedValue(new Error("idp unreachable"));
|
||||
const params = createMockParams({
|
||||
enterpriseManagedAuth: {
|
||||
idp: {
|
||||
issuer: "https://idp.example.com",
|
||||
clientId: "app-client",
|
||||
clientSecret: "secret",
|
||||
},
|
||||
},
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
manager.setOAuthConfig({ enterpriseManaged: true });
|
||||
|
||||
const outcome = await manager.handleAuthChallenge({
|
||||
reason: "token_expired",
|
||||
});
|
||||
|
||||
expect(outcome.kind).toBe("failed");
|
||||
if (outcome.kind === "failed") {
|
||||
expect(outcome.error.message).toBe("idp unreachable");
|
||||
}
|
||||
refreshSpy.mockRestore();
|
||||
startSpy.mockRestore();
|
||||
});
|
||||
|
||||
it("wraps non-Error throw values when starting EMA IdP authorization fails", async () => {
|
||||
const refreshSpy = vi
|
||||
.spyOn(emaFlow, "refreshEmaResourceTokens")
|
||||
.mockResolvedValue(undefined);
|
||||
const startSpy = vi
|
||||
.spyOn(emaFlow, "startEmaIdpAuthorization")
|
||||
.mockRejectedValue("idp offline");
|
||||
const params = createMockParams({
|
||||
enterpriseManagedAuth: {
|
||||
idp: {
|
||||
issuer: "https://idp.example.com",
|
||||
clientId: "app-client",
|
||||
clientSecret: "secret",
|
||||
},
|
||||
},
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
manager.setOAuthConfig({ enterpriseManaged: true });
|
||||
|
||||
const outcome = await manager.handleAuthChallenge({
|
||||
reason: "token_expired",
|
||||
});
|
||||
|
||||
expect(outcome.kind).toBe("failed");
|
||||
if (outcome.kind === "failed") {
|
||||
expect(outcome.error.message).toBe("idp offline");
|
||||
}
|
||||
refreshSpy.mockRestore();
|
||||
startSpy.mockRestore();
|
||||
});
|
||||
|
||||
it("returns interactive for EMA insufficient_scope with no prior scope and no configured fallback", async () => {
|
||||
const silentSpy = vi
|
||||
.spyOn(emaFlow, "trySilentEmaAuth")
|
||||
.mockResolvedValue({ status: "no_idp_session" });
|
||||
const authUrl = new URL(
|
||||
"https://idp.example.com/authorize?state=ema-empty",
|
||||
);
|
||||
const startSpy = vi
|
||||
.spyOn(emaFlow, "startEmaIdpAuthorization")
|
||||
.mockResolvedValue(authUrl);
|
||||
const params = createMockParams({
|
||||
enterpriseManagedAuth: {
|
||||
idp: {
|
||||
issuer: "https://idp.example.com",
|
||||
clientId: "app-client",
|
||||
clientSecret: "secret",
|
||||
},
|
||||
},
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
manager.setOAuthConfig({ enterpriseManaged: true });
|
||||
|
||||
const outcome = await manager.handleAuthChallenge(
|
||||
{ reason: "insufficient_scope" },
|
||||
{ confirmedStepUp: true },
|
||||
);
|
||||
|
||||
expect(outcome).toEqual(
|
||||
expect.objectContaining({
|
||||
kind: "interactive",
|
||||
authorizationUrl: authUrl,
|
||||
}),
|
||||
);
|
||||
silentSpy.mockRestore();
|
||||
startSpy.mockRestore();
|
||||
});
|
||||
});
|
||||
|
||||
describe("beginInteractiveAuthorization", () => {
|
||||
it("records flow state, navigates, and dispatches when state carries an authId", async () => {
|
||||
const authorizationUrl = new URL(
|
||||
"https://auth.example.com/authorize?state=begin-1",
|
||||
);
|
||||
const onBeforeOAuthRedirect = vi.fn().mockResolvedValue(undefined);
|
||||
const parseSpy = vi
|
||||
.spyOn(await import("@inspector/core/auth/utils.js"), "parseOAuthState")
|
||||
.mockReturnValue({
|
||||
execution: "quick",
|
||||
authId: "begin-auth-id",
|
||||
} as ReturnType<
|
||||
typeof import("@inspector/core/auth/utils.js").parseOAuthState
|
||||
>);
|
||||
const params = createMockParams({ onBeforeOAuthRedirect });
|
||||
storageOf(params).getClientInformation.mockResolvedValue({
|
||||
client_id: "cid",
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
|
||||
await manager.beginInteractiveAuthorization(authorizationUrl);
|
||||
|
||||
expect(onBeforeOAuthRedirect).toHaveBeenCalledWith("begin-auth-id");
|
||||
expect(
|
||||
params.initialConfig.navigation!.navigateToAuthorization,
|
||||
).toHaveBeenCalledWith(authorizationUrl);
|
||||
expect(manager.getOAuthFlowStep()).toBe("authorization_code");
|
||||
expect(manager.getOAuthFlowState()?.oauthClientInfo).toEqual({
|
||||
client_id: "cid",
|
||||
});
|
||||
expect(params.dispatchOAuthAuthorizationRequired).toHaveBeenCalledWith({
|
||||
url: authorizationUrl,
|
||||
});
|
||||
|
||||
parseSpy.mockRestore();
|
||||
});
|
||||
|
||||
it("skips onBeforeOAuthRedirect when there is no state param", async () => {
|
||||
const authorizationUrl = new URL("https://auth.example.com/authorize");
|
||||
const onBeforeOAuthRedirect = vi.fn();
|
||||
const params = createMockParams({ onBeforeOAuthRedirect });
|
||||
const manager = new OAuthManager(params);
|
||||
|
||||
await manager.beginInteractiveAuthorization(authorizationUrl);
|
||||
|
||||
expect(onBeforeOAuthRedirect).not.toHaveBeenCalled();
|
||||
expect(
|
||||
params.initialConfig.navigation!.navigateToAuthorization,
|
||||
).toHaveBeenCalledWith(authorizationUrl);
|
||||
expect(params.dispatchOAuthAuthorizationRequired).toHaveBeenCalledWith({
|
||||
url: authorizationUrl,
|
||||
});
|
||||
});
|
||||
|
||||
it("skips onBeforeOAuthRedirect when state param has no authId", async () => {
|
||||
const authorizationUrl = new URL(
|
||||
"https://auth.example.com/authorize?state=zzz",
|
||||
);
|
||||
const parseSpy = vi
|
||||
.spyOn(await import("@inspector/core/auth/utils.js"), "parseOAuthState")
|
||||
.mockReturnValue(null);
|
||||
const onBeforeOAuthRedirect = vi.fn();
|
||||
const params = createMockParams({ onBeforeOAuthRedirect });
|
||||
const manager = new OAuthManager(params);
|
||||
|
||||
await manager.beginInteractiveAuthorization(authorizationUrl);
|
||||
|
||||
expect(onBeforeOAuthRedirect).not.toHaveBeenCalled();
|
||||
|
||||
parseSpy.mockRestore();
|
||||
});
|
||||
|
||||
it("throws when navigation is not configured", async () => {
|
||||
const params = createMockParams({
|
||||
initialConfig: {
|
||||
storage: createMockParams().initialConfig.storage,
|
||||
redirectUrlProvider: {
|
||||
getRedirectUrl: vi
|
||||
.fn()
|
||||
.mockReturnValue("http://localhost/callback"),
|
||||
},
|
||||
} as OAuthManagerConfig,
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
|
||||
await expect(
|
||||
manager.beginInteractiveAuthorization(
|
||||
new URL("https://auth.example.com/authorize"),
|
||||
),
|
||||
).rejects.toThrow("OAuth navigation is required.");
|
||||
});
|
||||
});
|
||||
|
||||
describe("createOAuthProvider (clientId not configured)", () => {
|
||||
it("skips savePreregisteredClientInformation when clientId is not configured", async () => {
|
||||
mockedMcpAuth.mockResolvedValue("REDIRECT");
|
||||
const capturedUrl = new URL(
|
||||
"https://auth.example.com/authorize?state=no-client-id",
|
||||
);
|
||||
const params = createMockParams();
|
||||
params.initialConfig.clientId = undefined;
|
||||
const manager = new OAuthManager(params);
|
||||
const captureSpy = vi
|
||||
.spyOn(
|
||||
(await import("@inspector/core/auth/providers.js"))
|
||||
.BaseOAuthClientProvider.prototype,
|
||||
"getCapturedAuthUrl",
|
||||
)
|
||||
.mockReturnValue(capturedUrl);
|
||||
|
||||
await manager.authenticate();
|
||||
|
||||
expect(
|
||||
storageOf(params).savePreregisteredClientInformation,
|
||||
).not.toHaveBeenCalled();
|
||||
captureSpy.mockRestore();
|
||||
});
|
||||
});
|
||||
|
||||
describe("completeOAuthFlow (oauthClientInfo null fallback)", () => {
|
||||
it("stores null clientInfo when none is available and no flow state pre-exists", async () => {
|
||||
mockedMcpAuth.mockResolvedValue("AUTHORIZED");
|
||||
const params = createMockParams();
|
||||
storageOf(params).getTokens.mockResolvedValue({
|
||||
access_token: "tok",
|
||||
token_type: "Bearer",
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
|
||||
await manager.completeOAuthFlow("code");
|
||||
|
||||
expect(manager.getOAuthFlowState()?.oauthClientInfo).toBeNull();
|
||||
});
|
||||
|
||||
it("stores null clientInfo when none is available and flow state already exists", async () => {
|
||||
const capturedUrl = new URL(
|
||||
"https://auth.example.com/authorize?state=existing-flow",
|
||||
);
|
||||
mockedMcpAuth
|
||||
.mockResolvedValueOnce("REDIRECT")
|
||||
.mockResolvedValueOnce("AUTHORIZED");
|
||||
const params = createMockParams();
|
||||
storageOf(params).getTokens.mockResolvedValue({
|
||||
access_token: "access",
|
||||
token_type: "Bearer",
|
||||
scope: "mcp",
|
||||
});
|
||||
const manager = new OAuthManager(params);
|
||||
const captureSpy = vi
|
||||
.spyOn(
|
||||
(await import("@inspector/core/auth/providers.js"))
|
||||
.BaseOAuthClientProvider.prototype,
|
||||
"getCapturedAuthUrl",
|
||||
)
|
||||
.mockReturnValue(capturedUrl);
|
||||
|
||||
await manager.handleAuthChallenge({
|
||||
reason: "insufficient_scope",
|
||||
requiredScopes: ["weather:read"],
|
||||
});
|
||||
expect(manager.getOAuthFlowState()).toBeDefined();
|
||||
|
||||
await manager.completeOAuthFlow("code");
|
||||
|
||||
expect(manager.getOAuthFlowState()?.oauthClientInfo).toBeNull();
|
||||
captureSpy.mockRestore();
|
||||
});
|
||||
});
|
||||
|
||||
describe("handleEnterpriseManagedAuthChallenge (scopeToPersist false arm)", () => {
|
||||
it("returns satisfied without persisting scope when the EMA mint has no scope to record", async () => {
|
||||
const silentSpy = vi
|
||||
.spyOn(emaFlow, "trySilentEmaAuth")
|
||||
.mockResolvedValue({ status: "success" });
|
||||
const params = createMockParams({
|
||||
enterpriseManagedAuth: {
|
||||
idp: {
|
||||
issuer: "https://idp.example.com",
|
||||
clientId: "app-client",
|
||||
clientSecret: "secret",
|
||||
},
|
||||
},
|
||||
});
|
||||
storageOf(params)
|
||||
.getTokens.mockResolvedValueOnce(undefined)
|
||||
.mockResolvedValueOnce(undefined)
|
||||
.mockResolvedValueOnce(undefined)
|
||||
.mockResolvedValueOnce({
|
||||
access_token: "g",
|
||||
token_type: "Bearer",
|
||||
scope: "granted",
|
||||
})
|
||||
.mockResolvedValueOnce({ access_token: "g2", token_type: "Bearer" });
|
||||
const manager = new OAuthManager(params);
|
||||
manager.setOAuthConfig({ enterpriseManaged: true });
|
||||
|
||||
const outcome = await manager.handleAuthChallenge(
|
||||
{ reason: "insufficient_scope" },
|
||||
{ confirmedStepUp: true },
|
||||
);
|
||||
|
||||
expect(outcome).toEqual({ kind: "satisfied" });
|
||||
expect(storageOf(params).saveScope).not.toHaveBeenCalled();
|
||||
silentSpy.mockRestore();
|
||||
});
|
||||
});
|
||||
});
|
||||
|
|
|
|||
Loading…
Reference in a new issue