Adds enterprise-managed authorization (EMA): browser-side IdP login + RFC 8693 token-exchange and JWT-bearer resource-token mint, per-server EMA opt-in in Server Settings, IdP config in Client Settings, and IdP clientSecret keychain storage. Includes the v2/main merge and review follow-ups (400 on malformed client config; normalizeIdpIssuer import consolidation).
This commit is contained in:
parent
5ee347571f
commit
5de4e911e3
1 changed files with 7585 additions and 595 deletions
|
|
@ -9,6 +9,7 @@ import {
|
|||
} from "@modelcontextprotocol/sdk/shared/auth.js";
|
||||
import type { OAuthStorage } from "./storage.js";
|
||||
import { type createOAuthStore, type ServerOAuthState } from "./store.js";
|
||||
import type { IdpSessionState, SaveTokensOptions } from "./storage.js";
|
||||
|
||||
/**
|
||||
* Concrete OAuthStorage implementation parameterized on a Zustand store.
|
||||
|
|
@ -77,8 +78,15 @@ export class OAuthStorageBase implements OAuthStorage {
|
|||
return await OAuthTokensSchema.parseAsync(state.tokens);
|
||||
}
|
||||
|
||||
async saveTokens(serverUrl: string, tokens: OAuthTokens): Promise<void> {
|
||||
this.store.getState().setServerState(serverUrl, { 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 {
|
||||
|
|
@ -139,4 +147,31 @@ export class OAuthStorageBase implements OAuthStorage {
|
|||
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();
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in a new issue