From a8a874b9e3dab159b35e0028849f013beca9328a Mon Sep 17 00:00:00 2001 From: Paul Carleton Date: Fri, 20 Jun 2025 11:38:10 +0100 Subject: [PATCH 1/2] use sdk function --- client/src/lib/oauth-state-machine.ts | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/client/src/lib/oauth-state-machine.ts b/client/src/lib/oauth-state-machine.ts index 884caf1fb..13443542a 100644 --- a/client/src/lib/oauth-state-machine.ts +++ b/client/src/lib/oauth-state-machine.ts @@ -6,8 +6,8 @@ import { startAuthorization, exchangeAuthorization, discoverOAuthProtectedResourceMetadata, + selectResourceURL, } from "@modelcontextprotocol/sdk/client/auth.js"; -import { resourceUrlFromServerUrl } from "@modelcontextprotocol/sdk/shared/auth-utils.js"; import { OAuthMetadataSchema, OAuthProtectedResourceMetadata, @@ -49,16 +49,11 @@ export const oauthTransitions: Record = { } } - let resource: URL | undefined; - if (resourceMetadata) { - // TODO: use SDK function selectResourceURL once version bump lands to be consistent - resource = resourceUrlFromServerUrl(new URL(context.serverUrl)); - if (resource.href !== resourceMetadata.resource) { - resourceMetadataError = new Error( - `Warning: metadata resource ${resourceMetadata.resource} does not match serverUrl ${context.serverUrl}`, - ); - } - } + const resource = selectResourceURL( + context.serverUrl, + context.provider, + resourceMetadata, + ); const metadata = await discoverOAuthMetadata(authServerUrl); if (!metadata) { From 8c65d73fa85e832269849dbfc7b4b94248e65597 Mon Sep 17 00:00:00 2001 From: Paul Carleton Date: Mon, 23 Jun 2025 14:46:22 +0100 Subject: [PATCH 2/2] bump typescript sdk --- package-lock.json | 8 ++++---- package.json | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package-lock.json b/package-lock.json index da7d57b4a..266e6a2e4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17,7 +17,7 @@ "@modelcontextprotocol/inspector-cli": "^0.14.3", "@modelcontextprotocol/inspector-client": "^0.14.3", "@modelcontextprotocol/inspector-server": "^0.14.3", - "@modelcontextprotocol/sdk": "^1.13.0", + "@modelcontextprotocol/sdk": "^1.13.1", "concurrently": "^9.0.1", "open": "^10.1.0", "shell-quote": "^1.8.2", @@ -2005,9 +2005,9 @@ "link": true }, "node_modules/@modelcontextprotocol/sdk": { - "version": "1.13.0", - "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.13.0.tgz", - "integrity": "sha512-P5FZsXU0kY881F6Hbk9GhsYx02/KgWK1DYf7/tyE/1lcFKhDYPQR9iYjhQXJn+Sg6hQleMo3DB7h7+p4wgp2Lw==", + "version": "1.13.1", + "resolved": "https://registry.npmjs.org/@modelcontextprotocol/sdk/-/sdk-1.13.1.tgz", + "integrity": "sha512-8q6+9aF0yA39/qWT/uaIj6zTpC+Qu07DnN/lb9mjoquCJsAh6l3HyYqc9O3t2j7GilseOQOQimLg7W3By6jqvg==", "dependencies": { "ajv": "^6.12.6", "content-type": "^1.0.5", diff --git a/package.json b/package.json index 782ae83ce..6af3879d4 100644 --- a/package.json +++ b/package.json @@ -46,7 +46,7 @@ "@modelcontextprotocol/inspector-cli": "^0.14.3", "@modelcontextprotocol/inspector-client": "^0.14.3", "@modelcontextprotocol/inspector-server": "^0.14.3", - "@modelcontextprotocol/sdk": "^1.13.0", + "@modelcontextprotocol/sdk": "^1.13.1", "concurrently": "^9.0.1", "open": "^10.1.0", "shell-quote": "^1.8.2",