@mcp-use/client 2.0.0-beta.10 → 2.0.0-beta.12
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.map +1 -1
- package/dist/auth/session-store.d.ts +1 -1
- package/dist/auth/session-store.d.ts.map +1 -1
- package/dist/core/session.d.ts +84 -21
- package/dist/core/session.d.ts.map +1 -1
- package/dist/index-browser.js +91 -16
- package/dist/index-browser.js.map +1 -1
- package/dist/index.js +44 -10
- package/dist/index.js.map +1 -1
- package/dist/react/index.js +113 -20
- package/dist/react/index.js.map +1 -1
- package/dist/react/useMcp-helpers.d.ts.map +1 -1
- package/dist/react/useMcp-operations.d.ts +24 -6
- package/dist/react/useMcp-operations.d.ts.map +1 -1
- package/dist/react/useMcp.d.ts.map +1 -1
- package/dist/react/useMcpServerQueues.d.ts +36 -9
- package/dist/react/useMcpServerQueues.d.ts.map +1 -1
- package/dist/transport/base.d.ts +84 -21
- package/dist/transport/base.d.ts.map +1 -1
- package/package.json +4 -3
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../src/auth/browser.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EACV,sBAAsB,EACtB,6BAA6B,EAC7B,mBAAmB,EACnB,mBAAmB,EACnB,mBAAmB,EACnB,WAAW,EACZ,MAAM,8BAA8B,CAAC;AAiBtC,6EAA6E;AAC7E,MAAM,WAAW,mBAAmB;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,eAAe,CAAC,EAAE,OAAO,CAAC;IAC1B,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,6EAA6E;IAC7E,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,yEAAyE;IACzE,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B;;;;;;;;OAQG;IACH,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B;;;;;OAKG;IACH,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IAC1C,wEAAwE;IACxE,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,aAAa,CAAC,EAAE,CACd,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI,KAC7B,IAAI,CAAC;CACX;AAED;;GAEG;AACH,qBAAa,0BAA2B,YAAW,mBAAmB;IACpE,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;IACnD,OAAO,CAAC,OAAO,CAAoB;IAGnC,QAAQ,CAAC,eAAe,CAAC,EAAE,OAAO,CAAC;IACnC,OAAO,CAAC,eAAe,CAAC,CAAU;IAClC,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,aAAa,CAAC,CAAS;IAC/B,OAAO,CAAC,kBAAkB,CAAU;IACpC,QAAQ,CAAC,aAAa,EAClB,CAAC,CACC,GAAG,EAAE,MAAM,EACX,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,UAAU,CAAC,MAAM,GAAG,IAAI,KAC7B,IAAI,CAAC,GACV,SAAS,CAAC;gBAEF,SAAS,EAAE,MAAM,EAAE,OAAO,GAAE,mBAAwB;IAuBhE,IAAI,gBAAgB,IAAI,MAAM,CAE7B;IAED,IAAI,aAAa,IAAI,MAAM,CAE1B;IAED,IAAI,UAAU,IAAI,MAAM,CAEvB;IAED,IAAI,SAAS,IAAI,MAAM,CAEtB;IAED,IAAI,OAAO,IAAI,MAAM,CAEpB;IAED,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,KAAK,IAAI,MAAM,GAAG,SAAS,CAE9B;IAED,IAAI,iBAAiB,IAAI,MAAM,GAAG,SAAS,CAE1C;IAED,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIjC;;;;;;;;;;;;;;OAcG;IACH,OAAO,CAAC,oBAAoB;IA2B5B;;;;;;;;;;;;;;;;;;;;;OAqBG;IACH,aAAa,CAAC,SAAS,CAAC,EAAE,OAAO,KAAK,GAAG,OAAO,KAAK,GAAG,SAAS;
|
|
1
|
+
{"version":3,"file":"browser.d.ts","sourceRoot":"","sources":["../../src/auth/browser.ts"],"names":[],"mappings":"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"}
|
|
@@ -86,7 +86,7 @@ export declare class OAuthSessionStore {
|
|
|
86
86
|
saveClientInformation(clientInformation: OAuthClientInformation, ctx?: OAuthClientInformationContext): Promise<void>;
|
|
87
87
|
saveCodeVerifier(codeVerifier: string): Promise<void>;
|
|
88
88
|
codeVerifier(): Promise<string>;
|
|
89
|
-
invalidateCredentials(scope: "all" | "client" | "tokens" | "verifier" | "discovery"): Promise<void>;
|
|
89
|
+
invalidateCredentials(scope: "all" | "registration" | "client" | "tokens" | "verifier" | "discovery"): Promise<void>;
|
|
90
90
|
/**
|
|
91
91
|
* Persist the OAuth discovery state (authorization-server metadata resolved
|
|
92
92
|
* during the auth flow). Stored with the same durability as the code
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/auth/session-store.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EACV,sBAAsB,EACtB,6BAA6B,EAC7B,mBAAmB,EACnB,mBAAmB,EACnB,iBAAiB,EAClB,MAAM,8BAA8B,CAAC;AAGtC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,cAAc,CAAC;AAE5C;;;GAGG;AACH,MAAM,WAAW,WAAW;IAC1B,MAAM,EAAE,MAAM,CAAC;IACf,aAAa,EAAE,MAAM,CAAC;IACtB,eAAe,EAAE;QACf,SAAS,EAAE,MAAM,CAAC;QAClB,gBAAgB,EAAE,MAAM,CAAC;QACzB,UAAU,EAAE,MAAM,CAAC;QACnB,SAAS,EAAE,MAAM,CAAC;QAClB,WAAW,EAAE,MAAM,CAAC;QACpB,aAAa,CAAC,EAAE,MAAM,CAAC;QACvB,iBAAiB,CAAC,EAAE,MAAM,CAAC;QAC3B,gBAAgB,CAAC,EAAE,sBAAsB,CAAC;QAC1C,KAAK,CAAC,EAAE,MAAM,CAAC;KAChB,CAAC;IACF,QAAQ,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;GAIG;AACH,MAAM,WAAW,wBAAwB;IACvC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,yEAAyE;IACzE,iBAAiB,CAAC,EAAE,OAAO,CAAC;IAC5B,wEAAwE;IACxE,KAAK,CAAC,EAAE,MAAM,CAAC;CAChB;AAED;;;;;GAKG;AACH,UAAU,8BAA8B;IACtC;;;OAGG;IACH,oBAAoB,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;IAC/C,QAAQ,CAAC,EAAE,OAAO,GAAG,UAAU,CAAC;IAChC,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED;;;;;;;GAOG;AACH,qBAAa,iBAAiB;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;IACpC,QAAQ,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;IAExB,OAAO,CAAC,KAAK,CAAU;IACvB,OAAO,CAAC,iBAAiB,CAAU;gBAGjC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,wBAAwB,EACjC,KAAK,EAAE,OAAO;IAyBhB,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM;IAIjC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM;IAYtC,IAAI,WAAW,IAAI,MAAM,CAExB;IAED,IAAI,cAAc,IAAI,mBAAmB,CAWxC;IAED,OAAO,CAAC,aAAa;YASP,cAAc;IAyCtB,MAAM,CACV,GAAG,CAAC,EAAE,6BAA6B,GAClC,OAAO,CAAC,iBAAiB,GAAG,SAAS,CAAC;IAInC,UAAU,CACd,MAAM,EAAE,iBAAiB,EACzB,GAAG,CAAC,EAAE,6BAA6B,GAClC,OAAO,CAAC,IAAI,CAAC;
|
|
1
|
+
{"version":3,"file":"session-store.d.ts","sourceRoot":"","sources":["../../src/auth/session-store.ts"],"names":[],"mappings":"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"}
|
package/dist/core/session.d.ts
CHANGED
|
@@ -348,9 +348,18 @@ export declare class MCPConnection {
|
|
|
348
348
|
}[];
|
|
349
349
|
_meta?: {
|
|
350
350
|
[x: string]: unknown;
|
|
351
|
-
|
|
352
|
-
|
|
353
|
-
|
|
351
|
+
"io.modelcontextprotocol/serverInfo"?: {
|
|
352
|
+
version: string;
|
|
353
|
+
name: string;
|
|
354
|
+
websiteUrl?: string | undefined;
|
|
355
|
+
description?: string | undefined;
|
|
356
|
+
icons?: {
|
|
357
|
+
src: string;
|
|
358
|
+
mimeType?: string | undefined;
|
|
359
|
+
sizes?: string[] | undefined;
|
|
360
|
+
theme?: "light" | "dark" | undefined;
|
|
361
|
+
}[] | undefined;
|
|
362
|
+
title?: string | undefined;
|
|
354
363
|
} | undefined;
|
|
355
364
|
} | undefined;
|
|
356
365
|
nextCursor?: string | undefined;
|
|
@@ -407,9 +416,18 @@ export declare class MCPConnection {
|
|
|
407
416
|
}[];
|
|
408
417
|
_meta?: {
|
|
409
418
|
[x: string]: unknown;
|
|
410
|
-
|
|
411
|
-
|
|
412
|
-
|
|
419
|
+
"io.modelcontextprotocol/serverInfo"?: {
|
|
420
|
+
version: string;
|
|
421
|
+
name: string;
|
|
422
|
+
websiteUrl?: string | undefined;
|
|
423
|
+
description?: string | undefined;
|
|
424
|
+
icons?: {
|
|
425
|
+
src: string;
|
|
426
|
+
mimeType?: string | undefined;
|
|
427
|
+
sizes?: string[] | undefined;
|
|
428
|
+
theme?: "light" | "dark" | undefined;
|
|
429
|
+
}[] | undefined;
|
|
430
|
+
title?: string | undefined;
|
|
413
431
|
} | undefined;
|
|
414
432
|
} | undefined;
|
|
415
433
|
nextCursor?: string | undefined;
|
|
@@ -464,9 +482,18 @@ export declare class MCPConnection {
|
|
|
464
482
|
})[];
|
|
465
483
|
_meta?: {
|
|
466
484
|
[x: string]: unknown;
|
|
467
|
-
|
|
468
|
-
|
|
469
|
-
|
|
485
|
+
"io.modelcontextprotocol/serverInfo"?: {
|
|
486
|
+
version: string;
|
|
487
|
+
name: string;
|
|
488
|
+
websiteUrl?: string | undefined;
|
|
489
|
+
description?: string | undefined;
|
|
490
|
+
icons?: {
|
|
491
|
+
src: string;
|
|
492
|
+
mimeType?: string | undefined;
|
|
493
|
+
sizes?: string[] | undefined;
|
|
494
|
+
theme?: "light" | "dark" | undefined;
|
|
495
|
+
}[] | undefined;
|
|
496
|
+
title?: string | undefined;
|
|
470
497
|
} | undefined;
|
|
471
498
|
} | undefined;
|
|
472
499
|
}>;
|
|
@@ -485,9 +512,18 @@ export declare class MCPConnection {
|
|
|
485
512
|
subscribeToResource(uri: string, options?: RequestOptions): Promise<{
|
|
486
513
|
_meta?: {
|
|
487
514
|
[x: string]: unknown;
|
|
488
|
-
|
|
489
|
-
|
|
490
|
-
|
|
515
|
+
"io.modelcontextprotocol/serverInfo"?: {
|
|
516
|
+
version: string;
|
|
517
|
+
name: string;
|
|
518
|
+
websiteUrl?: string | undefined;
|
|
519
|
+
description?: string | undefined;
|
|
520
|
+
icons?: {
|
|
521
|
+
src: string;
|
|
522
|
+
mimeType?: string | undefined;
|
|
523
|
+
sizes?: string[] | undefined;
|
|
524
|
+
theme?: "light" | "dark" | undefined;
|
|
525
|
+
}[] | undefined;
|
|
526
|
+
title?: string | undefined;
|
|
491
527
|
} | undefined;
|
|
492
528
|
} | undefined;
|
|
493
529
|
}>;
|
|
@@ -505,9 +541,18 @@ export declare class MCPConnection {
|
|
|
505
541
|
unsubscribeFromResource(uri: string, options?: RequestOptions): Promise<{
|
|
506
542
|
_meta?: {
|
|
507
543
|
[x: string]: unknown;
|
|
508
|
-
|
|
509
|
-
|
|
510
|
-
|
|
544
|
+
"io.modelcontextprotocol/serverInfo"?: {
|
|
545
|
+
version: string;
|
|
546
|
+
name: string;
|
|
547
|
+
websiteUrl?: string | undefined;
|
|
548
|
+
description?: string | undefined;
|
|
549
|
+
icons?: {
|
|
550
|
+
src: string;
|
|
551
|
+
mimeType?: string | undefined;
|
|
552
|
+
sizes?: string[] | undefined;
|
|
553
|
+
theme?: "light" | "dark" | undefined;
|
|
554
|
+
}[] | undefined;
|
|
555
|
+
title?: string | undefined;
|
|
511
556
|
} | undefined;
|
|
512
557
|
} | undefined;
|
|
513
558
|
}>;
|
|
@@ -545,9 +590,18 @@ export declare class MCPConnection {
|
|
|
545
590
|
}[];
|
|
546
591
|
_meta?: {
|
|
547
592
|
[x: string]: unknown;
|
|
548
|
-
|
|
549
|
-
|
|
550
|
-
|
|
593
|
+
"io.modelcontextprotocol/serverInfo"?: {
|
|
594
|
+
version: string;
|
|
595
|
+
name: string;
|
|
596
|
+
websiteUrl?: string | undefined;
|
|
597
|
+
description?: string | undefined;
|
|
598
|
+
icons?: {
|
|
599
|
+
src: string;
|
|
600
|
+
mimeType?: string | undefined;
|
|
601
|
+
sizes?: string[] | undefined;
|
|
602
|
+
theme?: "light" | "dark" | undefined;
|
|
603
|
+
}[] | undefined;
|
|
604
|
+
title?: string | undefined;
|
|
551
605
|
} | undefined;
|
|
552
606
|
} | undefined;
|
|
553
607
|
nextCursor?: string | undefined;
|
|
@@ -655,9 +709,18 @@ export declare class MCPConnection {
|
|
|
655
709
|
}[];
|
|
656
710
|
_meta?: {
|
|
657
711
|
[x: string]: unknown;
|
|
658
|
-
|
|
659
|
-
|
|
660
|
-
|
|
712
|
+
"io.modelcontextprotocol/serverInfo"?: {
|
|
713
|
+
version: string;
|
|
714
|
+
name: string;
|
|
715
|
+
websiteUrl?: string | undefined;
|
|
716
|
+
description?: string | undefined;
|
|
717
|
+
icons?: {
|
|
718
|
+
src: string;
|
|
719
|
+
mimeType?: string | undefined;
|
|
720
|
+
sizes?: string[] | undefined;
|
|
721
|
+
theme?: "light" | "dark" | undefined;
|
|
722
|
+
}[] | undefined;
|
|
723
|
+
title?: string | undefined;
|
|
661
724
|
} | undefined;
|
|
662
725
|
} | undefined;
|
|
663
726
|
description?: string | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/core/session.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/core/session.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.0.0-beta.
|
|
131
|
+
var VERSION = "2.0.0-beta.11";
|
|
132
132
|
function getPackageVersion() {
|
|
133
133
|
return VERSION;
|
|
134
134
|
}
|
|
@@ -741,29 +741,39 @@ var OAuthSessionStore = class _OAuthSessionStore {
|
|
|
741
741
|
if (ctx) await this.store.set(this.credentialKey("tokens"), serialized);
|
|
742
742
|
await this.store.remove(this.getKey("code_verifier"));
|
|
743
743
|
await this.store.remove(this.getKey("last_auth_url"));
|
|
744
|
+
await this.store.remove(this.getKey("last_auth_callback_url"));
|
|
744
745
|
}
|
|
745
746
|
async clientInformation(ctx) {
|
|
747
|
+
if (!this.allowClientSecret) {
|
|
748
|
+
const registeredRedirectUri = await this.store.get(
|
|
749
|
+
this.getKey("client_info_redirect_uri")
|
|
750
|
+
);
|
|
751
|
+
if (registeredRedirectUri !== this.redirectUrl) {
|
|
752
|
+
await this.invalidateCredentials("registration");
|
|
753
|
+
console.info(
|
|
754
|
+
`[${this.storageKeyPrefix}] Re-registering browser OAuth client after its Inspector callback changed or could not be verified.`
|
|
755
|
+
);
|
|
756
|
+
return void 0;
|
|
757
|
+
}
|
|
758
|
+
}
|
|
746
759
|
const stored = await this.readCredential("client_info", ctx);
|
|
747
760
|
if (!stored) return void 0;
|
|
748
761
|
const { key, value: clientInfo } = stored;
|
|
749
762
|
try {
|
|
750
763
|
if (!this.allowClientSecret && clientInfo.client_secret) {
|
|
751
|
-
await this.
|
|
752
|
-
if (ctx) await this.store.remove(this.credentialKey("client_info"));
|
|
764
|
+
await this.invalidateCredentials("registration");
|
|
753
765
|
console.warn(
|
|
754
|
-
`[${this.storageKeyPrefix}]
|
|
766
|
+
`[${this.storageKeyPrefix}] Recovered stale browser OAuth credentials containing a client_secret.`
|
|
755
767
|
);
|
|
756
768
|
return void 0;
|
|
757
769
|
}
|
|
758
770
|
const storedRedirectUris = Array.isArray(clientInfo.redirect_uris) ? clientInfo.redirect_uris : [];
|
|
759
|
-
const hasMatchingRedirect = storedRedirectUris.length === 0 || storedRedirectUris.includes(this.redirectUrl);
|
|
771
|
+
const hasMatchingRedirect = storedRedirectUris.length === 0 && this.allowClientSecret || storedRedirectUris.includes(this.redirectUrl);
|
|
760
772
|
if (!hasMatchingRedirect) {
|
|
761
773
|
console.info(
|
|
762
|
-
`[${this.storageKeyPrefix}]
|
|
774
|
+
`[${this.storageKeyPrefix}] Recovering cached OAuth credentials after a redirect URI change.`
|
|
763
775
|
);
|
|
764
|
-
await this.
|
|
765
|
-
await this.store.remove(this.credentialKey("tokens", ctx));
|
|
766
|
-
await this.store.remove(this.getKey("last_auth_url"));
|
|
776
|
+
await this.invalidateCredentials("registration");
|
|
767
777
|
return void 0;
|
|
768
778
|
}
|
|
769
779
|
return clientInfo;
|
|
@@ -781,11 +791,20 @@ var OAuthSessionStore = class _OAuthSessionStore {
|
|
|
781
791
|
"Browser OAuth clients must be public clients; client_secret persistence is not allowed."
|
|
782
792
|
);
|
|
783
793
|
}
|
|
784
|
-
const
|
|
794
|
+
const persistedClientInformation = !this.allowClientSecret && (!("redirect_uris" in clientInformation) || !Array.isArray(
|
|
795
|
+
clientInformation.redirect_uris
|
|
796
|
+
) || clientInformation.redirect_uris.length === 0) ? { ...clientInformation, redirect_uris: [this.redirectUrl] } : clientInformation;
|
|
797
|
+
const serialized = JSON.stringify(persistedClientInformation);
|
|
785
798
|
await this.store.set(this.credentialKey("client_info", ctx), serialized);
|
|
786
799
|
if (ctx) {
|
|
787
800
|
await this.store.set(this.credentialKey("client_info"), serialized);
|
|
788
801
|
}
|
|
802
|
+
if (!this.allowClientSecret) {
|
|
803
|
+
await this.store.set(
|
|
804
|
+
this.getKey("client_info_redirect_uri"),
|
|
805
|
+
this.redirectUrl
|
|
806
|
+
);
|
|
807
|
+
}
|
|
789
808
|
}
|
|
790
809
|
async saveCodeVerifier(codeVerifier) {
|
|
791
810
|
await this.store.set(this.getKey("code_verifier"), codeVerifier);
|
|
@@ -810,11 +829,22 @@ var OAuthSessionStore = class _OAuthSessionStore {
|
|
|
810
829
|
}
|
|
811
830
|
};
|
|
812
831
|
switch (scope) {
|
|
832
|
+
case "registration":
|
|
833
|
+
await removeCredentialKeys("tokens");
|
|
834
|
+
await removeCredentialKeys("client_info");
|
|
835
|
+
await this.store.remove(this.getKey("code_verifier"));
|
|
836
|
+
await this.store.remove(this.getKey("last_auth_url"));
|
|
837
|
+
await this.store.remove(this.getKey("last_auth_callback_url"));
|
|
838
|
+
await this.store.remove(this.getKey("client_info_redirect_uri"));
|
|
839
|
+
await this.store.remove(this.getKey("token_endpoint"));
|
|
840
|
+
break;
|
|
813
841
|
case "all":
|
|
814
842
|
await removeCredentialKeys("tokens");
|
|
815
843
|
await removeCredentialKeys("client_info");
|
|
816
844
|
await this.store.remove(this.getKey("code_verifier"));
|
|
817
845
|
await this.store.remove(this.getKey("last_auth_url"));
|
|
846
|
+
await this.store.remove(this.getKey("last_auth_callback_url"));
|
|
847
|
+
await this.store.remove(this.getKey("client_info_redirect_uri"));
|
|
818
848
|
await this.store.remove(this.getKey("discovery_state"));
|
|
819
849
|
await this.store.remove(this.getKey("token_endpoint"));
|
|
820
850
|
break;
|
|
@@ -884,6 +914,10 @@ var OAuthSessionStore = class _OAuthSessionStore {
|
|
|
884
914
|
authorizationUrl.searchParams.set("state", state);
|
|
885
915
|
const sanitizedAuthUrl = sanitizeUrl(authorizationUrl.toString());
|
|
886
916
|
await this.store.set(stateKey, JSON.stringify(stateData));
|
|
917
|
+
await this.store.set(
|
|
918
|
+
this.getKey("last_auth_callback_url"),
|
|
919
|
+
this.redirectUrl
|
|
920
|
+
);
|
|
887
921
|
await this.store.set(this.getKey("last_auth_url"), sanitizedAuthUrl);
|
|
888
922
|
return sanitizedAuthUrl;
|
|
889
923
|
}
|
|
@@ -1103,23 +1137,40 @@ var BrowserOAuthClientProvider = class {
|
|
|
1103
1137
|
}
|
|
1104
1138
|
return response2;
|
|
1105
1139
|
}
|
|
1106
|
-
const
|
|
1140
|
+
const inputRequest = input instanceof Request ? input : void 0;
|
|
1141
|
+
const method = init?.method ?? inputRequest?.method ?? "POST";
|
|
1142
|
+
const requestHeaders = init?.headers ?? inputRequest?.headers;
|
|
1143
|
+
let body;
|
|
1144
|
+
if (init?.body !== void 0 && init.body !== null) {
|
|
1145
|
+
body = await serializeBody(init.body);
|
|
1146
|
+
} else if (inputRequest?.body && method !== "GET" && method !== "HEAD") {
|
|
1147
|
+
body = await inputRequest.clone().text();
|
|
1148
|
+
}
|
|
1107
1149
|
const response = await base(proxyEndpoint, {
|
|
1108
1150
|
method: "POST",
|
|
1109
1151
|
headers: { "Content-Type": "application/json" },
|
|
1110
1152
|
body: JSON.stringify({
|
|
1111
1153
|
serverUrl: this.serverUrl,
|
|
1112
1154
|
url,
|
|
1113
|
-
method
|
|
1114
|
-
headers:
|
|
1155
|
+
method,
|
|
1156
|
+
headers: requestHeaders ? Object.fromEntries(new Headers(requestHeaders)) : {},
|
|
1115
1157
|
body
|
|
1116
1158
|
})
|
|
1117
1159
|
});
|
|
1118
1160
|
const data = await response.json();
|
|
1161
|
+
if (!response.ok || typeof data.status !== "number") {
|
|
1162
|
+
return new Response(JSON.stringify(data), {
|
|
1163
|
+
status: response.status,
|
|
1164
|
+
statusText: response.statusText,
|
|
1165
|
+
headers: response.headers
|
|
1166
|
+
});
|
|
1167
|
+
}
|
|
1119
1168
|
return new Response(JSON.stringify(data.body), {
|
|
1120
1169
|
status: data.status,
|
|
1121
|
-
statusText: data.statusText,
|
|
1122
|
-
headers: new Headers(
|
|
1170
|
+
statusText: typeof data.statusText === "string" ? data.statusText : void 0,
|
|
1171
|
+
headers: new Headers(
|
|
1172
|
+
data.headers && typeof data.headers === "object" ? data.headers : void 0
|
|
1173
|
+
)
|
|
1123
1174
|
});
|
|
1124
1175
|
};
|
|
1125
1176
|
}
|
|
@@ -1263,7 +1314,31 @@ var BrowserOAuthClientProvider = class {
|
|
|
1263
1314
|
getLastAttemptedAuthUrl() {
|
|
1264
1315
|
const storedUrl = localStorage.getItem(this.getKey("last_auth_url"));
|
|
1265
1316
|
if (!storedUrl) return null;
|
|
1266
|
-
|
|
1317
|
+
const storedCallbackUrl = localStorage.getItem(
|
|
1318
|
+
this.getKey("last_auth_callback_url")
|
|
1319
|
+
);
|
|
1320
|
+
if (storedCallbackUrl !== this.callbackUrl) {
|
|
1321
|
+
console.info(
|
|
1322
|
+
`[${this.storageKeyPrefix}] Recovering stale OAuth state whose callback cannot be verified.`
|
|
1323
|
+
);
|
|
1324
|
+
this.clearStorage();
|
|
1325
|
+
return null;
|
|
1326
|
+
}
|
|
1327
|
+
const sanitized = sanitizeUrl(storedUrl);
|
|
1328
|
+
try {
|
|
1329
|
+
const redirectUri = new URL(sanitized).searchParams.get("redirect_uri");
|
|
1330
|
+
if (redirectUri && new URL(redirectUri).toString() !== new URL(this.callbackUrl).toString()) {
|
|
1331
|
+
console.info(
|
|
1332
|
+
`[${this.storageKeyPrefix}] Recovering stale OAuth state after the Inspector callback path changed.`
|
|
1333
|
+
);
|
|
1334
|
+
this.clearStorage();
|
|
1335
|
+
return null;
|
|
1336
|
+
}
|
|
1337
|
+
} catch {
|
|
1338
|
+
this.clearStorage();
|
|
1339
|
+
return null;
|
|
1340
|
+
}
|
|
1341
|
+
return sanitized;
|
|
1267
1342
|
}
|
|
1268
1343
|
clearStorage() {
|
|
1269
1344
|
const prefixPattern = `${this.storageKeyPrefix}_${this.serverUrlHash}_`;
|