Skip to content

Commit 5e3f63f

Browse files
authored
[auth] use sdk function for selecting resource (#537)
* use sdk function * bump typescript sdk
1 parent 0ff4727 commit 5e3f63f

File tree

3 files changed

+11
-17
lines changed

3 files changed

+11
-17
lines changed

client/src/lib/oauth-state-machine.ts

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ import {
66
startAuthorization,
77
exchangeAuthorization,
88
discoverOAuthProtectedResourceMetadata,
9+
selectResourceURL,
910
} from "@modelcontextprotocol/sdk/client/auth.js";
10-
import { resourceUrlFromServerUrl } from "@modelcontextprotocol/sdk/shared/auth-utils.js";
1111
import {
1212
OAuthMetadataSchema,
1313
OAuthProtectedResourceMetadata,
@@ -49,16 +49,11 @@ export const oauthTransitions: Record<OAuthStep, StateTransition> = {
4949
}
5050
}
5151

52-
let resource: URL | undefined;
53-
if (resourceMetadata) {
54-
// TODO: use SDK function selectResourceURL once version bump lands to be consistent
55-
resource = resourceUrlFromServerUrl(new URL(context.serverUrl));
56-
if (resource.href !== resourceMetadata.resource) {
57-
resourceMetadataError = new Error(
58-
`Warning: metadata resource ${resourceMetadata.resource} does not match serverUrl ${context.serverUrl}`,
59-
);
60-
}
61-
}
52+
const resource = selectResourceURL(
53+
context.serverUrl,
54+
context.provider,
55+
resourceMetadata,
56+
);
6257

6358
const metadata = await discoverOAuthMetadata(authServerUrl);
6459
if (!metadata) {

package-lock.json

Lines changed: 4 additions & 5 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"@modelcontextprotocol/inspector-cli": "^0.14.3",
4747
"@modelcontextprotocol/inspector-client": "^0.14.3",
4848
"@modelcontextprotocol/inspector-server": "^0.14.3",
49-
"@modelcontextprotocol/sdk": "^1.13.0",
49+
"@modelcontextprotocol/sdk": "^1.13.1",
5050
"concurrently": "^9.0.1",
5151
"open": "^10.1.0",
5252
"shell-quote": "^1.8.2",

0 commit comments

Comments
 (0)