Merge branch 'main' into adam-bloomston--strict-zod-validation

Author: abloomston

package-lock.json

@@ -1,6 +1,6 @@
 {
     "name": "@modelcontextprotocol/sdk",
-    "version": "1.20.1",
+    "version": "1.20.2",
     "description": "Model Context Protocol implementation for TypeScript",
     "license": "MIT",
     "author": "Anthropic, PBC (https://anthropic.com)",
@@ -31,6 +31,18 @@
             "import": "./dist/esm/server/index.js",
             "require": "./dist/cjs/server/index.js"
         },
+        "./validation": {
+            "import": "./dist/esm/validation/index.js",
+            "require": "./dist/cjs/validation/index.js"
+        },
+        "./validation/ajv": {
+            "import": "./dist/esm/validation/ajv-provider.js",
+            "require": "./dist/cjs/validation/ajv-provider.js"
+        },
+        "./validation/cfworker": {
+            "import": "./dist/esm/validation/cfworker-provider.js",
+            "require": "./dist/cjs/validation/cfworker-provider.js"
+        },
         "./*": {
             "import": "./dist/esm/*",
             "require": "./dist/cjs/*"
@@ -63,7 +75,8 @@
         "client": "tsx src/cli.ts client"
     },
     "dependencies": {
-        "ajv": "^6.12.6",
+        "ajv": "^8.17.1",
+        "ajv-formats": "^3.0.1",
         "content-type": "^1.0.5",
         "cors": "^2.8.5",
         "cross-spawn": "^7.0.5",
@@ -76,7 +89,16 @@
         "zod": "^3.23.8",
         "zod-to-json-schema": "^3.24.1"
     },
+    "peerDependencies": {
+        "@cfworker/json-schema": "^4.1.1"
+    },
+    "peerDependenciesMeta": {
+        "@cfworker/json-schema": {
+            "optional": true
+        }
+    },
     "devDependencies": {
+        "@cfworker/json-schema": "^4.1.1",
         "@eslint/js": "^9.8.0",
         "@jest-mock/express": "^3.0.0",
         "@types/content-type": "^1.1.8",
@@ -91,8 +113,8 @@
         "@types/ws": "^8.5.12",
         "eslint": "^9.8.0",
         "eslint-config-prettier": "^10.1.8",
-        "prettier": "3.6.2",
         "jest": "^29.7.0",
+        "prettier": "3.6.2",
         "supertest": "^7.0.0",
         "ts-jest": "^29.2.4",
         "tsx": "^4.16.5",

package.json

@@ -10,7 +10,8 @@ import {
     discoverOAuthProtectedResourceMetadata,
     extractResourceMetadataUrl,
     auth,
-    type OAuthClientProvider
+    type OAuthClientProvider,
+    selectClientAuthMethod
 } from './auth.js';
 import { ServerError } from '../server/auth/errors.js';
 import { AuthorizationServerMetadata } from '../shared/auth.js';
@@ -881,6 +882,25 @@ describe('OAuth Authorization', () => {
         });
     });
 
+    describe('selectClientAuthMethod', () => {
+        it('selects the correct client authentication method from client information', () => {
+            const clientInfo = {
+                client_id: 'test-client-id',
+                client_secret: 'test-client-secret',
+                token_endpoint_auth_method: 'client_secret_basic'
+            };
+            const supportedMethods = ['client_secret_post', 'client_secret_basic', 'none'];
+            const authMethod = selectClientAuthMethod(clientInfo, supportedMethods);
+            expect(authMethod).toBe('client_secret_basic');
+        });
+        it('selects the correct client authentication method from supported methods', () => {
+            const clientInfo = { client_id: 'test-client-id' };
+            const supportedMethods = ['client_secret_post', 'client_secret_basic', 'none'];
+            const authMethod = selectClientAuthMethod(clientInfo, supportedMethods);
+            expect(authMethod).toBe('none');
+        });
+    });
+
     describe('startAuthorization', () => {
         const validMetadata = {
             issuer: 'https://auth.example.com',