@pentoshi/clai 4.10.2 → 4.11.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +40 -7
- package/dist/agent/runner.js +114 -25
- package/dist/agent/runner.js.map +1 -1
- package/dist/agent/task-evidence.js +0 -63
- package/dist/agent/task-evidence.js.map +1 -1
- package/dist/app/adapters/current-store-adapter.js +8 -2
- package/dist/app/adapters/current-store-adapter.js.map +1 -1
- package/dist/app/commands/catalog.js +19 -2
- package/dist/app/commands/catalog.js.map +1 -1
- package/dist/app/controllers/session-controller.d.ts +4 -2
- package/dist/app/controllers/session-controller.js +26 -38
- package/dist/app/controllers/session-controller.js.map +1 -1
- package/dist/app/controllers/session-loop-recovery.d.ts +13 -0
- package/dist/app/controllers/session-loop-recovery.js +43 -0
- package/dist/app/controllers/session-loop-recovery.js.map +1 -0
- package/dist/app/ports/persistence-port.d.ts +3 -1
- package/dist/classic/bootstrap/start-classic.d.ts +1 -0
- package/dist/classic/bootstrap/start-classic.js +12 -4
- package/dist/classic/bootstrap/start-classic.js.map +1 -1
- package/dist/commands/providers.js +2 -0
- package/dist/commands/providers.js.map +1 -1
- package/dist/index.js +1 -0
- package/dist/index.js.map +1 -1
- package/dist/llm/capabilities.js +13 -0
- package/dist/llm/capabilities.js.map +1 -1
- package/dist/llm/free-default-model.d.ts +6 -0
- package/dist/llm/free-default-model.js +32 -0
- package/dist/llm/free-default-model.js.map +1 -0
- package/dist/llm/free.js +39 -0
- package/dist/llm/free.js.map +1 -1
- package/dist/llm/merge-gateway.d.ts +6 -0
- package/dist/llm/merge-gateway.js +157 -0
- package/dist/llm/merge-gateway.js.map +1 -0
- package/dist/llm/meta.d.ts +1 -2
- package/dist/llm/meta.js +31 -1140
- package/dist/llm/meta.js.map +1 -1
- package/dist/llm/provider-model-layers.js +6 -0
- package/dist/llm/provider-model-layers.js.map +1 -1
- package/dist/llm/provider-profile-layers.js +21 -0
- package/dist/llm/provider-profile-layers.js.map +1 -1
- package/dist/llm/provider.js +68 -0
- package/dist/llm/provider.js.map +1 -1
- package/dist/llm/reasoning-capability.js +8 -0
- package/dist/llm/reasoning-capability.js.map +1 -1
- package/dist/llm/responses-complete.d.ts +4 -0
- package/dist/llm/responses-complete.js +28 -0
- package/dist/llm/responses-complete.js.map +1 -0
- package/dist/llm/responses-config.d.ts +22 -0
- package/dist/llm/responses-config.js +19 -0
- package/dist/llm/responses-config.js.map +1 -0
- package/dist/llm/responses-dialect.d.ts +6 -0
- package/dist/llm/responses-dialect.js +6 -0
- package/dist/llm/responses-dialect.js.map +1 -0
- package/dist/llm/responses-http.d.ts +13 -0
- package/dist/llm/responses-http.js +88 -0
- package/dist/llm/responses-http.js.map +1 -0
- package/dist/llm/responses-parse.d.ts +42 -0
- package/dist/llm/responses-parse.js +242 -0
- package/dist/llm/responses-parse.js.map +1 -0
- package/dist/llm/responses-request.d.ts +15 -0
- package/dist/llm/responses-request.js +209 -0
- package/dist/llm/responses-request.js.map +1 -0
- package/dist/llm/responses-stream-accumulator.d.ts +38 -0
- package/dist/llm/responses-stream-accumulator.js +102 -0
- package/dist/llm/responses-stream-accumulator.js.map +1 -0
- package/dist/llm/responses-stream-events.d.ts +6 -0
- package/dist/llm/responses-stream-events.js +398 -0
- package/dist/llm/responses-stream-events.js.map +1 -0
- package/dist/llm/responses-stream-watchdog.d.ts +14 -0
- package/dist/llm/responses-stream-watchdog.js +64 -0
- package/dist/llm/responses-stream-watchdog.js.map +1 -0
- package/dist/llm/responses-stream.d.ts +4 -0
- package/dist/llm/responses-stream.js +264 -0
- package/dist/llm/responses-stream.js.map +1 -0
- package/dist/llm/router.js +3 -0
- package/dist/llm/router.js.map +1 -1
- package/dist/llm/tool-protocol.js +35 -3
- package/dist/llm/tool-protocol.js.map +1 -1
- package/dist/mcp/auth/host-credentials.d.ts +11 -0
- package/dist/mcp/auth/host-credentials.js +54 -0
- package/dist/mcp/auth/host-credentials.js.map +1 -0
- package/dist/mcp/auth/loopback.d.ts +16 -0
- package/dist/mcp/auth/loopback.js +126 -0
- package/dist/mcp/auth/loopback.js.map +1 -0
- package/dist/mcp/auth/metadata.d.ts +9 -0
- package/dist/mcp/auth/metadata.js +102 -0
- package/dist/mcp/auth/metadata.js.map +1 -0
- package/dist/mcp/auth/pkce.d.ts +3 -0
- package/dist/mcp/auth/pkce.js +17 -0
- package/dist/mcp/auth/pkce.js.map +1 -0
- package/dist/mcp/auth/provider.d.ts +24 -0
- package/dist/mcp/auth/provider.js +372 -0
- package/dist/mcp/auth/provider.js.map +1 -0
- package/dist/mcp/auth/registration.d.ts +12 -0
- package/dist/mcp/auth/registration.js +38 -0
- package/dist/mcp/auth/registration.js.map +1 -0
- package/dist/mcp/auth/security.d.ts +2 -0
- package/dist/mcp/auth/security.js +29 -0
- package/dist/mcp/auth/security.js.map +1 -0
- package/dist/mcp/auth/token-exchange.d.ts +24 -0
- package/dist/mcp/auth/token-exchange.js +66 -0
- package/dist/mcp/auth/token-exchange.js.map +1 -0
- package/dist/mcp/auth/token-store.d.ts +3 -0
- package/dist/mcp/auth/token-store.js +170 -0
- package/dist/mcp/auth/token-store.js.map +1 -0
- package/dist/mcp/auth/types.d.ts +62 -0
- package/dist/mcp/auth/types.js +2 -0
- package/dist/mcp/auth/types.js.map +1 -0
- package/dist/mcp/auth/www-authenticate.d.ts +2 -0
- package/dist/mcp/auth/www-authenticate.js +42 -0
- package/dist/mcp/auth/www-authenticate.js.map +1 -0
- package/dist/mcp/discovery.js +48 -1
- package/dist/mcp/discovery.js.map +1 -1
- package/dist/mcp/manager.d.ts +19 -0
- package/dist/mcp/manager.js +102 -10
- package/dist/mcp/manager.js.map +1 -1
- package/dist/mcp/mentions.js +2 -2
- package/dist/mcp/mentions.js.map +1 -1
- package/dist/mcp/runtime.d.ts +12 -0
- package/dist/mcp/runtime.js +146 -8
- package/dist/mcp/runtime.js.map +1 -1
- package/dist/mcp/transport-http.d.ts +12 -1
- package/dist/mcp/transport-http.js +160 -45
- package/dist/mcp/transport-http.js.map +1 -1
- package/dist/mcp/types.d.ts +18 -0
- package/dist/mcp/types.js.map +1 -1
- package/dist/mcp/validation.d.ts +10 -1
- package/dist/mcp/validation.js +111 -1
- package/dist/mcp/validation.js.map +1 -1
- package/dist/noninteractive/cancellation.d.ts +15 -0
- package/dist/noninteractive/cancellation.js +49 -0
- package/dist/noninteractive/cancellation.js.map +1 -0
- package/dist/noninteractive/readline-prompts.d.ts +1 -0
- package/dist/noninteractive/readline-prompts.js +14 -0
- package/dist/noninteractive/readline-prompts.js.map +1 -1
- package/dist/noninteractive/start-noninteractive.js +11 -10
- package/dist/noninteractive/start-noninteractive.js.map +1 -1
- package/dist/os/screen-sequences.d.ts +4 -0
- package/dist/os/screen-sequences.js +9 -0
- package/dist/os/screen-sequences.js.map +1 -1
- package/dist/os/terminal-rescue.js +2 -2
- package/dist/os/terminal-rescue.js.map +1 -1
- package/dist/os/terminal-write.d.ts +5 -0
- package/dist/os/terminal-write.js +45 -0
- package/dist/os/terminal-write.js.map +1 -0
- package/dist/safety/classifier.js +7 -2
- package/dist/safety/classifier.js.map +1 -1
- package/dist/session-runtime/alt-screen.js +2 -1
- package/dist/session-runtime/alt-screen.js.map +1 -1
- package/dist/session-runtime/child-bridge.d.ts +1 -1
- package/dist/session-runtime/child-bridge.js +7 -2
- package/dist/session-runtime/child-bridge.js.map +1 -1
- package/dist/session-runtime/client.js +13 -5
- package/dist/session-runtime/client.js.map +1 -1
- package/dist/session-runtime/host.d.ts +2 -0
- package/dist/session-runtime/host.js +19 -2
- package/dist/session-runtime/host.js.map +1 -1
- package/dist/session-runtime/reaper.d.ts +4 -0
- package/dist/session-runtime/reaper.js +64 -0
- package/dist/session-runtime/reaper.js.map +1 -0
- package/dist/session-runtime/terminal-modes.d.ts +8 -0
- package/dist/session-runtime/terminal-modes.js +51 -0
- package/dist/session-runtime/terminal-modes.js.map +1 -0
- package/dist/session-runtime/types.d.ts +2 -0
- package/dist/store/config.js +1 -0
- package/dist/store/config.js.map +1 -1
- package/dist/store/history.d.ts +9 -3
- package/dist/store/history.js +39 -8
- package/dist/store/history.js.map +1 -1
- package/dist/store/session-model.d.ts +28 -0
- package/dist/store/session-model.js +212 -0
- package/dist/store/session-model.js.map +1 -0
- package/dist/tools/definitions.d.ts +2 -0
- package/dist/tools/definitions.js +54 -0
- package/dist/tools/definitions.js.map +1 -1
- package/dist/tui-v2/bootstrap/renderer-handle.d.ts +2 -1
- package/dist/tui-v2/bootstrap/renderer-handle.js +2 -1
- package/dist/tui-v2/bootstrap/renderer-handle.js.map +1 -1
- package/dist/tui-v2/bootstrap/resize-repaint.d.ts +3 -1
- package/dist/tui-v2/bootstrap/resize-repaint.js +18 -2
- package/dist/tui-v2/bootstrap/resize-repaint.js.map +1 -1
- package/dist/tui-v2/bootstrap/start-tui-v2.d.ts +1 -0
- package/dist/tui-v2/bootstrap/start-tui-v2.js +20 -17
- package/dist/tui-v2/bootstrap/start-tui-v2.js.map +1 -1
- package/dist/tui-v2/components/transcript/intro-card.js +2 -2
- package/dist/tui-v2/components/transcript/intro-card.js.map +1 -1
- package/dist/tui-v2/composer/composer-editor.js +4 -2
- package/dist/tui-v2/composer/composer-editor.js.map +1 -1
- package/dist/types.d.ts +1 -1
- package/dist/types.js +1 -0
- package/dist/types.js.map +1 -1
- package/dist/ui-core/bootstrap/composition-root.d.ts +2 -2
- package/dist/ui-core/bootstrap/composition-root.js +3 -1
- package/dist/ui-core/bootstrap/composition-root.js.map +1 -1
- package/dist/ui-core/bootstrap/exit-epilogue.d.ts +2 -2
- package/dist/ui-core/bootstrap/exit-epilogue.js +1 -1
- package/dist/ui-core/bootstrap/exit-epilogue.js.map +1 -1
- package/dist/ui-core/bootstrap/session-resume.js +10 -0
- package/dist/ui-core/bootstrap/session-resume.js.map +1 -1
- package/dist/ui-core/commands/mcp-commands.js +182 -70
- package/dist/ui-core/commands/mcp-commands.js.map +1 -1
- package/dist/ui-core/commands/picker-commands.js +10 -8
- package/dist/ui-core/commands/picker-commands.js.map +1 -1
- package/dist/ui-core/commands/session-commands.js +41 -8
- package/dist/ui-core/commands/session-commands.js.map +1 -1
- package/dist/version.generated.d.ts +2 -2
- package/dist/version.generated.js +2 -2
- package/package.json +1 -1
|
@@ -0,0 +1,372 @@
|
|
|
1
|
+
import { McpTransportError } from "../transport.js";
|
|
2
|
+
import { buildProtectedResourceMetadataUrl, discoverAuthorizationServerMetadata, discoverProtectedResourceMetadata, } from "./metadata.js";
|
|
3
|
+
import { createPkcePair } from "./pkce.js";
|
|
4
|
+
import { registerOAuthClient } from "./registration.js";
|
|
5
|
+
import { runLoopbackAuthorization, } from "./loopback.js";
|
|
6
|
+
import { canonicalResourceUri } from "./security.js";
|
|
7
|
+
import { findGithubCredential, githubCredentialHint, isGithubHost, } from "./host-credentials.js";
|
|
8
|
+
import { exchangeAuthorizationCode, refreshAccessToken, } from "./token-exchange.js";
|
|
9
|
+
import { defaultOAuthTokenStore, oauthTokenKey } from "./token-store.js";
|
|
10
|
+
const REFRESH_SKEW_MS = 60_000;
|
|
11
|
+
const DEFAULT_CLIENT_NAME = "clai";
|
|
12
|
+
function bearerHeader(tokenType, accessToken) {
|
|
13
|
+
const raw = tokenType.trim();
|
|
14
|
+
const scheme = raw.length === 0 || raw.toLowerCase() === "bearer" ? "Bearer" : raw;
|
|
15
|
+
return { authorization: `${scheme} ${accessToken}` };
|
|
16
|
+
}
|
|
17
|
+
class NoAuthProvider {
|
|
18
|
+
kind = "none";
|
|
19
|
+
async headers() {
|
|
20
|
+
return {};
|
|
21
|
+
}
|
|
22
|
+
async onUnauthorized() {
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
liveSecrets() {
|
|
26
|
+
return [];
|
|
27
|
+
}
|
|
28
|
+
}
|
|
29
|
+
class BearerAuthProvider {
|
|
30
|
+
token;
|
|
31
|
+
kind = "bearer";
|
|
32
|
+
constructor(token) {
|
|
33
|
+
this.token = token;
|
|
34
|
+
}
|
|
35
|
+
async headers() {
|
|
36
|
+
return bearerHeader("Bearer", this.token);
|
|
37
|
+
}
|
|
38
|
+
async onUnauthorized() {
|
|
39
|
+
return false;
|
|
40
|
+
}
|
|
41
|
+
liveSecrets() {
|
|
42
|
+
return this.token.length > 0 ? [this.token] : [];
|
|
43
|
+
}
|
|
44
|
+
}
|
|
45
|
+
class HeaderAuthProvider {
|
|
46
|
+
staticHeaders;
|
|
47
|
+
kind = "header";
|
|
48
|
+
constructor(staticHeaders) {
|
|
49
|
+
this.staticHeaders = staticHeaders;
|
|
50
|
+
}
|
|
51
|
+
async headers() {
|
|
52
|
+
return { ...this.staticHeaders };
|
|
53
|
+
}
|
|
54
|
+
async onUnauthorized() {
|
|
55
|
+
return false;
|
|
56
|
+
}
|
|
57
|
+
liveSecrets() {
|
|
58
|
+
return Object.values(this.staticHeaders).filter((value) => value.length > 0);
|
|
59
|
+
}
|
|
60
|
+
}
|
|
61
|
+
class OAuthProvider {
|
|
62
|
+
config;
|
|
63
|
+
deps;
|
|
64
|
+
kind = "oauth";
|
|
65
|
+
cached;
|
|
66
|
+
metadata;
|
|
67
|
+
issuer;
|
|
68
|
+
clientId;
|
|
69
|
+
clientSecret;
|
|
70
|
+
scope;
|
|
71
|
+
resource;
|
|
72
|
+
warmed = false;
|
|
73
|
+
inFlight;
|
|
74
|
+
store;
|
|
75
|
+
constructor(config, deps) {
|
|
76
|
+
this.config = config;
|
|
77
|
+
this.deps = deps;
|
|
78
|
+
this.resource = canonicalResourceUri(config.resource ?? deps.serverUrl);
|
|
79
|
+
this.store = deps.tokenStore ?? defaultOAuthTokenStore;
|
|
80
|
+
this.clientId = config.clientId;
|
|
81
|
+
this.clientSecret = config.clientSecret;
|
|
82
|
+
}
|
|
83
|
+
now() {
|
|
84
|
+
return (this.deps.now ?? Date.now)();
|
|
85
|
+
}
|
|
86
|
+
metadataDeps() {
|
|
87
|
+
return {
|
|
88
|
+
...(this.deps.fetchImpl ? { fetchImpl: this.deps.fetchImpl } : {}),
|
|
89
|
+
...(this.deps.validateUrl ? { validateUrl: this.deps.validateUrl } : {}),
|
|
90
|
+
};
|
|
91
|
+
}
|
|
92
|
+
tokenDeps() {
|
|
93
|
+
return this.metadataDeps();
|
|
94
|
+
}
|
|
95
|
+
isValid(tokens) {
|
|
96
|
+
if (tokens.expiresAt === undefined)
|
|
97
|
+
return true;
|
|
98
|
+
return tokens.expiresAt - this.now() > REFRESH_SKEW_MS;
|
|
99
|
+
}
|
|
100
|
+
async headers() {
|
|
101
|
+
const tokens = (await this.warmCached()) ?? this.cached;
|
|
102
|
+
if (!tokens)
|
|
103
|
+
return {};
|
|
104
|
+
if (this.isValid(tokens))
|
|
105
|
+
return bearerHeader(tokens.tokenType, tokens.accessToken);
|
|
106
|
+
if (tokens.refreshToken && this.metadata) {
|
|
107
|
+
const refreshed = await this.tryRefresh(tokens).catch(() => undefined);
|
|
108
|
+
if (refreshed)
|
|
109
|
+
return bearerHeader(refreshed.tokenType, refreshed.accessToken);
|
|
110
|
+
}
|
|
111
|
+
return {};
|
|
112
|
+
}
|
|
113
|
+
async warmCached() {
|
|
114
|
+
if (this.cached)
|
|
115
|
+
return this.cached;
|
|
116
|
+
if (this.warmed)
|
|
117
|
+
return undefined;
|
|
118
|
+
this.warmed = true;
|
|
119
|
+
const stored = await this.store
|
|
120
|
+
.loadForResource?.(this.resource)
|
|
121
|
+
.catch(() => undefined);
|
|
122
|
+
if (stored) {
|
|
123
|
+
this.applyStoredClient(stored);
|
|
124
|
+
this.cached = stored;
|
|
125
|
+
return stored;
|
|
126
|
+
}
|
|
127
|
+
return this.adoptHostCredential();
|
|
128
|
+
}
|
|
129
|
+
async adoptHostCredential() {
|
|
130
|
+
const credential = await findGithubCredential(this.deps.serverUrl, this.hostCredentialDeps()).catch(() => undefined);
|
|
131
|
+
if (!credential)
|
|
132
|
+
return undefined;
|
|
133
|
+
this.cached = { accessToken: credential.token, tokenType: "Bearer" };
|
|
134
|
+
return this.cached;
|
|
135
|
+
}
|
|
136
|
+
hostCredentialDeps() {
|
|
137
|
+
return {
|
|
138
|
+
...(this.deps.env ? { env: this.deps.env } : {}),
|
|
139
|
+
...(this.deps.readHostToken ? { readCliToken: this.deps.readHostToken } : {}),
|
|
140
|
+
};
|
|
141
|
+
}
|
|
142
|
+
canInteract() {
|
|
143
|
+
return this.deps.interactive !== false && typeof this.deps.openBrowser === "function";
|
|
144
|
+
}
|
|
145
|
+
reauthMessage() {
|
|
146
|
+
return (`MCP server ${this.deps.serverUrl} requires OAuth sign-in and no browser is available here. ` +
|
|
147
|
+
"Re-authenticate in an interactive session with /mcp login or the mcp.login tool.");
|
|
148
|
+
}
|
|
149
|
+
missingClientMessage() {
|
|
150
|
+
const issuer = this.issuer ?? "its authorization server";
|
|
151
|
+
const remedy = isGithubHost(this.deps.serverUrl)
|
|
152
|
+
? `${githubCredentialHint()}, or add a token explicitly — `
|
|
153
|
+
: "Add a token instead — ";
|
|
154
|
+
return (`MCP server ${this.deps.serverUrl} cannot complete OAuth: ${issuer} does not support ` +
|
|
155
|
+
`dynamic client registration, so clai has no client to sign in with. ${remedy}` +
|
|
156
|
+
'"auth": {"kind": "bearer", "token": "${env:YOUR_TOKEN}"} — ' +
|
|
157
|
+
'or register an OAuth app and set "auth": {"kind": "oauth", "clientId": "…"} ' +
|
|
158
|
+
"in the server entry of .clai/mcp.json.");
|
|
159
|
+
}
|
|
160
|
+
async discoverEndpoints(challenge) {
|
|
161
|
+
const metadataUrl = challenge?.resourceMetadataUrl ?? buildProtectedResourceMetadataUrl(this.resource);
|
|
162
|
+
const prm = await discoverProtectedResourceMetadata(metadataUrl, this.metadataDeps());
|
|
163
|
+
if (prm.resource)
|
|
164
|
+
this.resource = canonicalResourceUri(prm.resource);
|
|
165
|
+
const issuer = this.config.authorizationServer ?? prm.authorizationServers[0];
|
|
166
|
+
const metadata = await discoverAuthorizationServerMetadata(issuer, this.metadataDeps());
|
|
167
|
+
return { issuer, metadata, scopes: prm.scopesSupported };
|
|
168
|
+
}
|
|
169
|
+
cacheMetadata(issuer, metadata) {
|
|
170
|
+
this.issuer = issuer;
|
|
171
|
+
this.metadata = metadata;
|
|
172
|
+
}
|
|
173
|
+
resolveScope(prmScopes, metadata, challenge) {
|
|
174
|
+
if (this.config.scopes && this.config.scopes.length > 0)
|
|
175
|
+
return this.config.scopes.join(" ");
|
|
176
|
+
if (challenge?.scope)
|
|
177
|
+
return challenge.scope;
|
|
178
|
+
if (prmScopes.length > 0)
|
|
179
|
+
return prmScopes.join(" ");
|
|
180
|
+
if (metadata.scopesSupported.length > 0)
|
|
181
|
+
return metadata.scopesSupported.join(" ");
|
|
182
|
+
return undefined;
|
|
183
|
+
}
|
|
184
|
+
async reuseStored(issuer) {
|
|
185
|
+
const stored = await this.store.load(oauthTokenKey(this.resource, issuer));
|
|
186
|
+
if (!stored)
|
|
187
|
+
return false;
|
|
188
|
+
this.applyStoredClient(stored);
|
|
189
|
+
if (this.isValid(stored)) {
|
|
190
|
+
this.cached = stored;
|
|
191
|
+
return true;
|
|
192
|
+
}
|
|
193
|
+
this.cached = stored;
|
|
194
|
+
return false;
|
|
195
|
+
}
|
|
196
|
+
applyStoredClient(stored) {
|
|
197
|
+
if (!this.clientId && stored.clientId)
|
|
198
|
+
this.clientId = stored.clientId;
|
|
199
|
+
if (!this.clientSecret && stored.clientSecret)
|
|
200
|
+
this.clientSecret = stored.clientSecret;
|
|
201
|
+
if (!this.scope && stored.scope)
|
|
202
|
+
this.scope = stored.scope;
|
|
203
|
+
}
|
|
204
|
+
async refreshStored(issuer, metadata, scope) {
|
|
205
|
+
const tokens = this.cached;
|
|
206
|
+
if (!tokens?.refreshToken || !this.clientId)
|
|
207
|
+
return false;
|
|
208
|
+
this.scope = scope ?? this.scope;
|
|
209
|
+
const refreshed = await this.tryRefresh(tokens).catch(() => undefined);
|
|
210
|
+
return refreshed !== undefined;
|
|
211
|
+
}
|
|
212
|
+
async tryRefresh(tokens) {
|
|
213
|
+
if (!tokens.refreshToken || !this.clientId || !this.metadata || !this.issuer)
|
|
214
|
+
return undefined;
|
|
215
|
+
const response = await refreshAccessToken({
|
|
216
|
+
tokenEndpoint: this.metadata.tokenEndpoint,
|
|
217
|
+
refreshToken: tokens.refreshToken,
|
|
218
|
+
clientId: this.clientId,
|
|
219
|
+
...(this.clientSecret ? { clientSecret: this.clientSecret } : {}),
|
|
220
|
+
resource: this.resource,
|
|
221
|
+
...(this.scope ? { scope: this.scope } : {}),
|
|
222
|
+
}, this.tokenDeps());
|
|
223
|
+
const next = this.toTokenSet(response, tokens.refreshToken);
|
|
224
|
+
await this.persist(this.issuer, next);
|
|
225
|
+
return next;
|
|
226
|
+
}
|
|
227
|
+
async ensureClient(metadata, scope, redirectUris) {
|
|
228
|
+
if (this.clientId) {
|
|
229
|
+
return {
|
|
230
|
+
clientId: this.clientId,
|
|
231
|
+
...(this.clientSecret ? { clientSecret: this.clientSecret } : {}),
|
|
232
|
+
};
|
|
233
|
+
}
|
|
234
|
+
if (!metadata.registrationEndpoint) {
|
|
235
|
+
throw new McpTransportError("protocol", this.missingClientMessage());
|
|
236
|
+
}
|
|
237
|
+
const registration = await registerOAuthClient({
|
|
238
|
+
registrationEndpoint: metadata.registrationEndpoint,
|
|
239
|
+
redirectUris,
|
|
240
|
+
clientName: this.deps.clientName ?? DEFAULT_CLIENT_NAME,
|
|
241
|
+
...(scope ? { scope } : {}),
|
|
242
|
+
}, this.metadataDeps());
|
|
243
|
+
this.clientId = registration.clientId;
|
|
244
|
+
this.clientSecret = registration.clientSecret;
|
|
245
|
+
return registration;
|
|
246
|
+
}
|
|
247
|
+
authorizationUrlBuilder(metadata, clientId, scope, pkce) {
|
|
248
|
+
return (redirectUri, state) => {
|
|
249
|
+
const url = new URL(metadata.authorizationEndpoint);
|
|
250
|
+
url.searchParams.set("response_type", "code");
|
|
251
|
+
url.searchParams.set("client_id", clientId);
|
|
252
|
+
url.searchParams.set("redirect_uri", redirectUri);
|
|
253
|
+
url.searchParams.set("state", state);
|
|
254
|
+
url.searchParams.set("code_challenge", pkce.challenge);
|
|
255
|
+
url.searchParams.set("code_challenge_method", pkce.method);
|
|
256
|
+
url.searchParams.set("resource", this.resource);
|
|
257
|
+
if (scope)
|
|
258
|
+
url.searchParams.set("scope", scope);
|
|
259
|
+
return url.toString();
|
|
260
|
+
};
|
|
261
|
+
}
|
|
262
|
+
async requireConsent(metadata, scope) {
|
|
263
|
+
if (!this.deps.requestConsent)
|
|
264
|
+
return;
|
|
265
|
+
const ok = await this.deps.requestConsent({
|
|
266
|
+
serverUrl: this.deps.serverUrl,
|
|
267
|
+
issuer: this.issuer,
|
|
268
|
+
authorizationEndpoint: metadata.authorizationEndpoint,
|
|
269
|
+
scope,
|
|
270
|
+
});
|
|
271
|
+
if (!ok)
|
|
272
|
+
throw new McpTransportError("network", "MCP OAuth authorization was declined.");
|
|
273
|
+
}
|
|
274
|
+
async runFullFlow(metadata, scope) {
|
|
275
|
+
await this.requireConsent(metadata, scope);
|
|
276
|
+
const pkce = createPkcePair();
|
|
277
|
+
const loopback = this.deps.runLoopback ?? runLoopbackAuthorization;
|
|
278
|
+
const bootstrapClientId = this.clientId ?? this.deps.clientName ?? DEFAULT_CLIENT_NAME;
|
|
279
|
+
let registration = {
|
|
280
|
+
clientId: bootstrapClientId,
|
|
281
|
+
...(this.clientSecret ? { clientSecret: this.clientSecret } : {}),
|
|
282
|
+
};
|
|
283
|
+
const result = await loopback({
|
|
284
|
+
buildAuthorizationUrl: async (redirectUri, state) => {
|
|
285
|
+
registration = await this.ensureClient(metadata, scope, [redirectUri]);
|
|
286
|
+
return this.authorizationUrlBuilder(metadata, registration.clientId, scope, pkce)(redirectUri, state);
|
|
287
|
+
},
|
|
288
|
+
openBrowser: this.deps.openBrowser,
|
|
289
|
+
});
|
|
290
|
+
const response = await exchangeAuthorizationCode({
|
|
291
|
+
tokenEndpoint: metadata.tokenEndpoint,
|
|
292
|
+
code: result.code,
|
|
293
|
+
redirectUri: result.redirectUri,
|
|
294
|
+
clientId: registration.clientId,
|
|
295
|
+
...(registration.clientSecret ? { clientSecret: registration.clientSecret } : {}),
|
|
296
|
+
codeVerifier: pkce.verifier,
|
|
297
|
+
resource: this.resource,
|
|
298
|
+
}, this.tokenDeps());
|
|
299
|
+
const next = this.toTokenSet(response, undefined);
|
|
300
|
+
await this.persist(this.issuer, next);
|
|
301
|
+
}
|
|
302
|
+
toTokenSet(response, fallbackRefresh) {
|
|
303
|
+
const refreshToken = response.refreshToken ?? fallbackRefresh;
|
|
304
|
+
return {
|
|
305
|
+
accessToken: response.accessToken,
|
|
306
|
+
tokenType: response.tokenType,
|
|
307
|
+
...(refreshToken ? { refreshToken } : {}),
|
|
308
|
+
...(response.expiresIn !== undefined
|
|
309
|
+
? { expiresAt: this.now() + response.expiresIn * 1000 }
|
|
310
|
+
: {}),
|
|
311
|
+
...(response.scope ?? this.scope ? { scope: response.scope ?? this.scope } : {}),
|
|
312
|
+
...(this.clientId ? { clientId: this.clientId } : {}),
|
|
313
|
+
...(this.clientSecret ? { clientSecret: this.clientSecret } : {}),
|
|
314
|
+
};
|
|
315
|
+
}
|
|
316
|
+
async persist(issuer, tokens) {
|
|
317
|
+
this.cached = tokens;
|
|
318
|
+
if (!issuer)
|
|
319
|
+
return;
|
|
320
|
+
await this.store.save(oauthTokenKey(this.resource, issuer), tokens);
|
|
321
|
+
}
|
|
322
|
+
async onUnauthorized(challenge) {
|
|
323
|
+
if (this.inFlight)
|
|
324
|
+
return this.inFlight;
|
|
325
|
+
const attempt = this.authorize(challenge);
|
|
326
|
+
this.inFlight = attempt;
|
|
327
|
+
try {
|
|
328
|
+
return await attempt;
|
|
329
|
+
}
|
|
330
|
+
finally {
|
|
331
|
+
this.inFlight = undefined;
|
|
332
|
+
}
|
|
333
|
+
}
|
|
334
|
+
async authorize(challenge) {
|
|
335
|
+
const { issuer, metadata, scopes } = await this.discoverEndpoints(challenge);
|
|
336
|
+
this.cacheMetadata(issuer, metadata);
|
|
337
|
+
if (await this.reuseStored(issuer))
|
|
338
|
+
return true;
|
|
339
|
+
const scope = this.resolveScope(scopes, metadata, challenge);
|
|
340
|
+
this.scope = scope ?? this.scope;
|
|
341
|
+
if (await this.refreshStored(issuer, metadata, scope))
|
|
342
|
+
return true;
|
|
343
|
+
if (!this.clientId && !metadata.registrationEndpoint) {
|
|
344
|
+
if (await this.adoptHostCredential())
|
|
345
|
+
return true;
|
|
346
|
+
}
|
|
347
|
+
if (!this.canInteract())
|
|
348
|
+
throw new McpTransportError("network", this.reauthMessage());
|
|
349
|
+
await this.runFullFlow(metadata, scope);
|
|
350
|
+
return true;
|
|
351
|
+
}
|
|
352
|
+
liveSecrets() {
|
|
353
|
+
const secrets = [];
|
|
354
|
+
if (this.cached?.accessToken)
|
|
355
|
+
secrets.push(this.cached.accessToken);
|
|
356
|
+
if (this.cached?.refreshToken)
|
|
357
|
+
secrets.push(this.cached.refreshToken);
|
|
358
|
+
if (this.clientSecret)
|
|
359
|
+
secrets.push(this.clientSecret);
|
|
360
|
+
return secrets;
|
|
361
|
+
}
|
|
362
|
+
}
|
|
363
|
+
export function createAuthProvider(config, deps) {
|
|
364
|
+
if (!config || config.kind === "none")
|
|
365
|
+
return new NoAuthProvider();
|
|
366
|
+
if (config.kind === "bearer")
|
|
367
|
+
return new BearerAuthProvider(config.token);
|
|
368
|
+
if (config.kind === "header")
|
|
369
|
+
return new HeaderAuthProvider(config.headers);
|
|
370
|
+
return new OAuthProvider(config, deps);
|
|
371
|
+
}
|
|
372
|
+
//# sourceMappingURL=provider.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provider.js","sourceRoot":"","sources":["../../../src/mcp/auth/provider.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { OAuthClientRegistration } from "./types.js";
|
|
2
|
+
export interface RegistrationParams {
|
|
3
|
+
readonly registrationEndpoint: string;
|
|
4
|
+
readonly redirectUris: readonly string[];
|
|
5
|
+
readonly clientName: string;
|
|
6
|
+
readonly scope?: string | undefined;
|
|
7
|
+
}
|
|
8
|
+
export interface RegistrationDeps {
|
|
9
|
+
readonly fetchImpl?: typeof fetch | undefined;
|
|
10
|
+
readonly validateUrl?: ((url: string) => URL) | undefined;
|
|
11
|
+
}
|
|
12
|
+
export declare function registerOAuthClient(params: RegistrationParams, deps?: RegistrationDeps): Promise<OAuthClientRegistration>;
|
|
@@ -0,0 +1,38 @@
|
|
|
1
|
+
import { McpTransportError } from "../transport.js";
|
|
2
|
+
import { assertSafeDiscoveryUrl } from "./security.js";
|
|
3
|
+
export async function registerOAuthClient(params, deps = {}) {
|
|
4
|
+
const validate = deps.validateUrl ?? assertSafeDiscoveryUrl;
|
|
5
|
+
const target = validate(params.registrationEndpoint);
|
|
6
|
+
const impl = deps.fetchImpl ?? fetch;
|
|
7
|
+
const body = {
|
|
8
|
+
client_name: params.clientName,
|
|
9
|
+
redirect_uris: [...params.redirectUris],
|
|
10
|
+
grant_types: ["authorization_code", "refresh_token"],
|
|
11
|
+
response_types: ["code"],
|
|
12
|
+
token_endpoint_auth_method: "none",
|
|
13
|
+
...(params.scope ? { scope: params.scope } : {}),
|
|
14
|
+
};
|
|
15
|
+
const response = await impl(target.toString(), {
|
|
16
|
+
method: "POST",
|
|
17
|
+
headers: { "content-type": "application/json", accept: "application/json" },
|
|
18
|
+
body: JSON.stringify(body),
|
|
19
|
+
redirect: "manual",
|
|
20
|
+
});
|
|
21
|
+
if (!response.ok) {
|
|
22
|
+
const detail = await response.text().catch(() => "");
|
|
23
|
+
throw new McpTransportError("protocol", `MCP OAuth dynamic client registration failed with ${response.status}${detail ? `: ${detail.slice(0, 200)}` : ""}.`);
|
|
24
|
+
}
|
|
25
|
+
const record = (await response.json().catch(() => undefined));
|
|
26
|
+
const clientId = record?.client_id;
|
|
27
|
+
if (typeof clientId !== "string" || clientId.length === 0) {
|
|
28
|
+
throw new McpTransportError("protocol", "MCP OAuth dynamic client registration returned no client_id.");
|
|
29
|
+
}
|
|
30
|
+
const clientSecret = record?.client_secret;
|
|
31
|
+
return {
|
|
32
|
+
clientId,
|
|
33
|
+
...(typeof clientSecret === "string" && clientSecret.length > 0
|
|
34
|
+
? { clientSecret }
|
|
35
|
+
: {}),
|
|
36
|
+
};
|
|
37
|
+
}
|
|
38
|
+
//# sourceMappingURL=registration.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"registration.js","sourceRoot":"","sources":["../../../src/mcp/auth/registration.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,EAAE,sBAAsB,EAAE,MAAM,eAAe,CAAC;AAevD,MAAM,CAAC,KAAK,UAAU,mBAAmB,CACvC,MAA0B,EAC1B,OAAyB,EAAE;IAE3B,MAAM,QAAQ,GAAG,IAAI,CAAC,WAAW,IAAI,sBAAsB,CAAC;IAC5D,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,oBAAoB,CAAC,CAAC;IACrD,MAAM,IAAI,GAAG,IAAI,CAAC,SAAS,IAAI,KAAK,CAAC;IACrC,MAAM,IAAI,GAAG;QACX,WAAW,EAAE,MAAM,CAAC,UAAU;QAC9B,aAAa,EAAE,CAAC,GAAG,MAAM,CAAC,YAAY,CAAC;QACvC,WAAW,EAAE,CAAC,oBAAoB,EAAE,eAAe,CAAC;QACpD,cAAc,EAAE,CAAC,MAAM,CAAC;QACxB,0BAA0B,EAAE,MAAM;QAClC,GAAG,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;KACjD,CAAC;IACF,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,MAAM,CAAC,QAAQ,EAAE,EAAE;QAC7C,MAAM,EAAE,MAAM;QACd,OAAO,EAAE,EAAE,cAAc,EAAE,kBAAkB,EAAE,MAAM,EAAE,kBAAkB,EAAE;QAC3E,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC;QAC1B,QAAQ,EAAE,QAAQ;KACnB,CAAC,CAAC;IACH,IAAI,CAAC,QAAQ,CAAC,EAAE,EAAE,CAAC;QACjB,MAAM,MAAM,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,EAAE,CAAC,CAAC;QACrD,MAAM,IAAI,iBAAiB,CACzB,UAAU,EACV,qDAAqD,QAAQ,CAAC,MAAM,GAAG,MAAM,CAAC,CAAC,CAAC,KAAK,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,GAAG,CACpH,CAAC;IACJ,CAAC;IACD,MAAM,MAAM,GAAG,CAAC,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,GAAG,EAAE,CAAC,SAAS,CAAC,CAE/C,CAAC;IACd,MAAM,QAAQ,GAAG,MAAM,EAAE,SAAS,CAAC;IACnC,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;QAC1D,MAAM,IAAI,iBAAiB,CACzB,UAAU,EACV,8DAA8D,CAC/D,CAAC;IACJ,CAAC;IACD,MAAM,YAAY,GAAG,MAAM,EAAE,aAAa,CAAC;IAC3C,OAAO;QACL,QAAQ;QACR,GAAG,CAAC,OAAO,YAAY,KAAK,QAAQ,IAAI,YAAY,CAAC,MAAM,GAAG,CAAC;YAC7D,CAAC,CAAC,EAAE,YAAY,EAAE;YAClB,CAAC,CAAC,EAAE,CAAC;KACR,CAAC;AACJ,CAAC"}
|
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { classifyHost } from "../../tools/web/ssrf-guard.js";
|
|
2
|
+
import { McpTransportError } from "../transport.js";
|
|
3
|
+
export function assertSafeDiscoveryUrl(raw) {
|
|
4
|
+
let url;
|
|
5
|
+
try {
|
|
6
|
+
url = new URL(raw);
|
|
7
|
+
}
|
|
8
|
+
catch {
|
|
9
|
+
throw new McpTransportError("protocol", `MCP OAuth discovery URL is not parseable: ${raw}`);
|
|
10
|
+
}
|
|
11
|
+
const hostname = url.hostname.replace(/^\[|\]$/g, "");
|
|
12
|
+
const classification = classifyHost(hostname);
|
|
13
|
+
const isLoopback = classification?.class === "loopback";
|
|
14
|
+
if (url.protocol !== "https:" && !(url.protocol === "http:" && isLoopback)) {
|
|
15
|
+
throw new McpTransportError("protocol", `MCP OAuth discovery refuses ${url.protocol} for ${url.host}; https is required except on loopback.`);
|
|
16
|
+
}
|
|
17
|
+
if (classification && classification.class !== "loopback") {
|
|
18
|
+
throw new McpTransportError("protocol", `MCP OAuth discovery refuses ${classification.class} address ${url.host}.`);
|
|
19
|
+
}
|
|
20
|
+
return url;
|
|
21
|
+
}
|
|
22
|
+
export function canonicalResourceUri(raw) {
|
|
23
|
+
const url = new URL(raw);
|
|
24
|
+
url.hash = "";
|
|
25
|
+
if (url.pathname === "/" && url.search.length === 0)
|
|
26
|
+
return url.origin;
|
|
27
|
+
return url.toString();
|
|
28
|
+
}
|
|
29
|
+
//# sourceMappingURL=security.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"security.js","sourceRoot":"","sources":["../../../src/mcp/auth/security.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,iBAAiB,CAAC;AAEpD,MAAM,UAAU,sBAAsB,CAAC,GAAW;IAChD,IAAI,GAAQ,CAAC;IACb,IAAI,CAAC;QACH,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACrB,CAAC;IAAC,MAAM,CAAC;QACP,MAAM,IAAI,iBAAiB,CAAC,UAAU,EAAE,6CAA6C,GAAG,EAAE,CAAC,CAAC;IAC9F,CAAC;IACD,MAAM,QAAQ,GAAG,GAAG,CAAC,QAAQ,CAAC,OAAO,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC;IACtD,MAAM,cAAc,GAAG,YAAY,CAAC,QAAQ,CAAC,CAAC;IAC9C,MAAM,UAAU,GAAG,cAAc,EAAE,KAAK,KAAK,UAAU,CAAC;IACxD,IAAI,GAAG,CAAC,QAAQ,KAAK,QAAQ,IAAI,CAAC,CAAC,GAAG,CAAC,QAAQ,KAAK,OAAO,IAAI,UAAU,CAAC,EAAE,CAAC;QAC3E,MAAM,IAAI,iBAAiB,CACzB,UAAU,EACV,+BAA+B,GAAG,CAAC,QAAQ,QAAQ,GAAG,CAAC,IAAI,yCAAyC,CACrG,CAAC;IACJ,CAAC;IACD,IAAI,cAAc,IAAI,cAAc,CAAC,KAAK,KAAK,UAAU,EAAE,CAAC;QAC1D,MAAM,IAAI,iBAAiB,CACzB,UAAU,EACV,+BAA+B,cAAc,CAAC,KAAK,YAAY,GAAG,CAAC,IAAI,GAAG,CAC3E,CAAC;IACJ,CAAC;IACD,OAAO,GAAG,CAAC;AACb,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,GAAW;IAC9C,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,CAAC;IACzB,GAAG,CAAC,IAAI,GAAG,EAAE,CAAC;IACd,IAAI,GAAG,CAAC,QAAQ,KAAK,GAAG,IAAI,GAAG,CAAC,MAAM,CAAC,MAAM,KAAK,CAAC;QAAE,OAAO,GAAG,CAAC,MAAM,CAAC;IACvE,OAAO,GAAG,CAAC,QAAQ,EAAE,CAAC;AACxB,CAAC"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { TokenResponse } from "./types.js";
|
|
2
|
+
export interface TokenEndpointDeps {
|
|
3
|
+
readonly fetchImpl?: typeof fetch | undefined;
|
|
4
|
+
readonly validateUrl?: ((url: string) => URL) | undefined;
|
|
5
|
+
}
|
|
6
|
+
export interface ExchangeAuthorizationCodeParams {
|
|
7
|
+
readonly tokenEndpoint: string;
|
|
8
|
+
readonly code: string;
|
|
9
|
+
readonly redirectUri: string;
|
|
10
|
+
readonly clientId: string;
|
|
11
|
+
readonly clientSecret?: string | undefined;
|
|
12
|
+
readonly codeVerifier: string;
|
|
13
|
+
readonly resource?: string | undefined;
|
|
14
|
+
}
|
|
15
|
+
export interface RefreshAccessTokenParams {
|
|
16
|
+
readonly tokenEndpoint: string;
|
|
17
|
+
readonly refreshToken: string;
|
|
18
|
+
readonly clientId: string;
|
|
19
|
+
readonly clientSecret?: string | undefined;
|
|
20
|
+
readonly resource?: string | undefined;
|
|
21
|
+
readonly scope?: string | undefined;
|
|
22
|
+
}
|
|
23
|
+
export declare function exchangeAuthorizationCode(params: ExchangeAuthorizationCodeParams, deps?: TokenEndpointDeps): Promise<TokenResponse>;
|
|
24
|
+
export declare function refreshAccessToken(params: RefreshAccessTokenParams, deps?: TokenEndpointDeps): Promise<TokenResponse>;
|
|
@@ -0,0 +1,66 @@
|
|
|
1
|
+
import { McpTransportError } from "../transport.js";
|
|
2
|
+
import { assertSafeDiscoveryUrl } from "./security.js";
|
|
3
|
+
function applySecret(form, headers, clientId, clientSecret) {
|
|
4
|
+
if (clientSecret === undefined)
|
|
5
|
+
return;
|
|
6
|
+
const basic = Buffer.from(`${clientId}:${clientSecret}`).toString("base64");
|
|
7
|
+
headers.authorization = `Basic ${basic}`;
|
|
8
|
+
}
|
|
9
|
+
async function postToken(tokenEndpoint, form, headers, deps) {
|
|
10
|
+
const validate = deps.validateUrl ?? assertSafeDiscoveryUrl;
|
|
11
|
+
const target = validate(tokenEndpoint);
|
|
12
|
+
const impl = deps.fetchImpl ?? fetch;
|
|
13
|
+
const response = await impl(target.toString(), {
|
|
14
|
+
method: "POST",
|
|
15
|
+
headers: {
|
|
16
|
+
"content-type": "application/x-www-form-urlencoded",
|
|
17
|
+
accept: "application/json",
|
|
18
|
+
...headers,
|
|
19
|
+
},
|
|
20
|
+
body: form.toString(),
|
|
21
|
+
redirect: "manual",
|
|
22
|
+
});
|
|
23
|
+
if (!response.ok) {
|
|
24
|
+
const detail = await response.text().catch(() => "");
|
|
25
|
+
throw new McpTransportError("protocol", `MCP OAuth token request failed with ${response.status}${detail ? `: ${detail.slice(0, 200)}` : ""}.`);
|
|
26
|
+
}
|
|
27
|
+
const record = (await response.json().catch(() => undefined));
|
|
28
|
+
const accessToken = record?.access_token;
|
|
29
|
+
if (typeof accessToken !== "string" || accessToken.length === 0) {
|
|
30
|
+
throw new McpTransportError("protocol", "MCP OAuth token response had no access_token.");
|
|
31
|
+
}
|
|
32
|
+
return {
|
|
33
|
+
accessToken,
|
|
34
|
+
tokenType: typeof record?.token_type === "string" ? record.token_type : "Bearer",
|
|
35
|
+
...(typeof record?.expires_in === "number" ? { expiresIn: record.expires_in } : {}),
|
|
36
|
+
...(typeof record?.refresh_token === "string" ? { refreshToken: record.refresh_token } : {}),
|
|
37
|
+
...(typeof record?.scope === "string" ? { scope: record.scope } : {}),
|
|
38
|
+
};
|
|
39
|
+
}
|
|
40
|
+
export async function exchangeAuthorizationCode(params, deps = {}) {
|
|
41
|
+
const form = new URLSearchParams();
|
|
42
|
+
form.set("grant_type", "authorization_code");
|
|
43
|
+
form.set("code", params.code);
|
|
44
|
+
form.set("redirect_uri", params.redirectUri);
|
|
45
|
+
form.set("client_id", params.clientId);
|
|
46
|
+
form.set("code_verifier", params.codeVerifier);
|
|
47
|
+
if (params.resource)
|
|
48
|
+
form.set("resource", params.resource);
|
|
49
|
+
const headers = {};
|
|
50
|
+
applySecret(form, headers, params.clientId, params.clientSecret);
|
|
51
|
+
return postToken(params.tokenEndpoint, form, headers, deps);
|
|
52
|
+
}
|
|
53
|
+
export async function refreshAccessToken(params, deps = {}) {
|
|
54
|
+
const form = new URLSearchParams();
|
|
55
|
+
form.set("grant_type", "refresh_token");
|
|
56
|
+
form.set("refresh_token", params.refreshToken);
|
|
57
|
+
form.set("client_id", params.clientId);
|
|
58
|
+
if (params.resource)
|
|
59
|
+
form.set("resource", params.resource);
|
|
60
|
+
if (params.scope)
|
|
61
|
+
form.set("scope", params.scope);
|
|
62
|
+
const headers = {};
|
|
63
|
+
applySecret(form, headers, params.clientId, params.clientSecret);
|
|
64
|
+
return postToken(params.tokenEndpoint, form, headers, deps);
|
|
65
|
+
}
|
|
66
|
+
//# sourceMappingURL=token-exchange.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"token-exchange.js","sourceRoot":"","sources":["../../../src/mcp/auth/token-exchange.ts"],"names":[],"mappings":"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"}
|