@mcp-use/client 2.1.3 → 2.1.4-canary.1
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/dist/.tsbuildinfo +1 -1
- package/dist/auth/browser.d.ts +4 -1
- package/dist/auth/browser.d.ts.map +1 -1
- package/dist/index-browser.js +32 -5
- package/dist/index-browser.js.map +1 -1
- package/dist/index.js +1 -1
- package/dist/react/index.js +32 -5
- package/dist/react/index.js.map +1 -1
- package/package.json +1 -1
package/dist/auth/browser.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type
|
|
1
|
+
import { type OAuthClientInformation, type OAuthClientInformationContext, type OAuthClientMetadata, type OAuthClientProvider, type OAuthDiscoveryState, type OAuthTokens } from "@modelcontextprotocol/client";
|
|
2
2
|
/** Options for the browser implementation of the SDK `OAuthClientProvider`. */
|
|
3
3
|
export interface BrowserOAuthOptions {
|
|
4
4
|
/** Prefix used for persisted OAuth keys. */
|
|
@@ -61,6 +61,8 @@ export declare class BrowserOAuthClientProvider implements OAuthClientProvider {
|
|
|
61
61
|
private proxyOAuthRequests;
|
|
62
62
|
private lastAttemptedAuthUrl;
|
|
63
63
|
private authorizationPending;
|
|
64
|
+
/** Latest protected-resource metadata URL advertised by an MCP 401. */
|
|
65
|
+
private challengedResourceMetadataUrl;
|
|
64
66
|
/** Callback invoked immediately before an authorization popup opens. */
|
|
65
67
|
readonly onPopupWindow: ((url: string, features: string, window: globalThis.Window | null) => void) | undefined;
|
|
66
68
|
constructor(serverUrl: string, options?: BrowserOAuthOptions);
|
|
@@ -106,6 +108,7 @@ export declare class BrowserOAuthClientProvider implements OAuthClientProvider {
|
|
|
106
108
|
* insertion using the server's path instead of the proxy's.
|
|
107
109
|
*/
|
|
108
110
|
private reanchorWellKnownUrl;
|
|
111
|
+
private rememberResourceMetadataChallenge;
|
|
109
112
|
/**
|
|
110
113
|
* Returns a `fetch` function, scoped to this provider, that routes OAuth
|
|
111
114
|
* metadata and non-browser OAuth endpoint requests through the configured
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../src/auth/browser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../src/auth/browser.ts"],"names":[],"mappings":"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"}
|
package/dist/index-browser.js
CHANGED
|
@@ -128,7 +128,7 @@ var Logger = class {
|
|
|
128
128
|
var logger = Logger.get();
|
|
129
129
|
|
|
130
130
|
// src/utils/version.ts
|
|
131
|
-
var VERSION = "2.1.
|
|
131
|
+
var VERSION = "2.1.4-canary.1";
|
|
132
132
|
function getPackageVersion() {
|
|
133
133
|
return VERSION;
|
|
134
134
|
}
|
|
@@ -635,6 +635,11 @@ setConnectorTelemetryTracker(
|
|
|
635
635
|
(data) => Telemetry.getInstance().trackConnectorInit(data).catch(() => void 0)
|
|
636
636
|
);
|
|
637
637
|
|
|
638
|
+
// src/auth/browser.ts
|
|
639
|
+
import {
|
|
640
|
+
extractWWWAuthenticateParams
|
|
641
|
+
} from "@modelcontextprotocol/client";
|
|
642
|
+
|
|
638
643
|
// src/auth/storage.ts
|
|
639
644
|
var AUTH_CRYPTO_DATABASE = "mcp-use-oauth-crypto";
|
|
640
645
|
var AUTH_CRYPTO_STORE = "keys";
|
|
@@ -1174,6 +1179,8 @@ var BrowserOAuthClientProvider = class {
|
|
|
1174
1179
|
proxyOAuthRequests;
|
|
1175
1180
|
lastAttemptedAuthUrl = null;
|
|
1176
1181
|
authorizationPending = false;
|
|
1182
|
+
/** Latest protected-resource metadata URL advertised by an MCP 401. */
|
|
1183
|
+
challengedResourceMetadataUrl;
|
|
1177
1184
|
/** Callback invoked immediately before an authorization popup opens. */
|
|
1178
1185
|
onPopupWindow;
|
|
1179
1186
|
constructor(serverUrl, options = {}) {
|
|
@@ -1281,6 +1288,13 @@ var BrowserOAuthClientProvider = class {
|
|
|
1281
1288
|
return url;
|
|
1282
1289
|
}
|
|
1283
1290
|
}
|
|
1291
|
+
rememberResourceMetadataChallenge(response) {
|
|
1292
|
+
if (response.status !== 401) return false;
|
|
1293
|
+
const { resourceMetadataUrl } = extractWWWAuthenticateParams(response);
|
|
1294
|
+
if (!resourceMetadataUrl) return false;
|
|
1295
|
+
this.challengedResourceMetadataUrl = resourceMetadataUrl.toString();
|
|
1296
|
+
return true;
|
|
1297
|
+
}
|
|
1284
1298
|
/**
|
|
1285
1299
|
* Returns a `fetch` function, scoped to this provider, that routes OAuth
|
|
1286
1300
|
* metadata and non-browser OAuth endpoint requests through the configured
|
|
@@ -1319,10 +1333,12 @@ var BrowserOAuthClientProvider = class {
|
|
|
1319
1333
|
}
|
|
1320
1334
|
const isMetadata = pathname.includes("/.well-known/");
|
|
1321
1335
|
if (!oauthProxyUrl) {
|
|
1322
|
-
|
|
1336
|
+
const response2 = await base(
|
|
1323
1337
|
isMetadata ? url : input,
|
|
1324
1338
|
isMetadata ? { ...init, cache: "no-store" } : init
|
|
1325
1339
|
);
|
|
1340
|
+
if (!isMetadata) this.rememberResourceMetadataChallenge(response2);
|
|
1341
|
+
return response2;
|
|
1326
1342
|
}
|
|
1327
1343
|
if (!restoredDiscovery) {
|
|
1328
1344
|
restoredDiscovery = true;
|
|
@@ -1342,7 +1358,11 @@ var BrowserOAuthClientProvider = class {
|
|
|
1342
1358
|
pathname
|
|
1343
1359
|
);
|
|
1344
1360
|
if (!isMetadata && !isProxiedEndpoint) {
|
|
1345
|
-
|
|
1361
|
+
const response2 = await base(input, init);
|
|
1362
|
+
if (this.rememberResourceMetadataChallenge(response2)) {
|
|
1363
|
+
discoveredEndpoints.clear();
|
|
1364
|
+
}
|
|
1365
|
+
return response2;
|
|
1346
1366
|
}
|
|
1347
1367
|
try {
|
|
1348
1368
|
const urlObj = new URL(url);
|
|
@@ -1479,8 +1499,15 @@ var BrowserOAuthClientProvider = class {
|
|
|
1479
1499
|
return this.session.saveDiscoveryState(state);
|
|
1480
1500
|
}
|
|
1481
1501
|
/** Return previously saved OAuth discovery state, or `undefined`. */
|
|
1482
|
-
discoveryState() {
|
|
1483
|
-
|
|
1502
|
+
async discoveryState() {
|
|
1503
|
+
const state = await this.session.discoveryState();
|
|
1504
|
+
const challengedUrl = this.challengedResourceMetadataUrl;
|
|
1505
|
+
this.challengedResourceMetadataUrl = void 0;
|
|
1506
|
+
if (challengedUrl && state) {
|
|
1507
|
+
await this.session.invalidateCredentials("discovery");
|
|
1508
|
+
return void 0;
|
|
1509
|
+
}
|
|
1510
|
+
return state;
|
|
1484
1511
|
}
|
|
1485
1512
|
/**
|
|
1486
1513
|
* Return the token endpoint from the SDK's persisted discovery state.
|