json fix

Author: ihrpr

src/mcp/client/auth.py

@@ -137,19 +137,19 @@ async def _discover_protected_resource_metadata(self, server_url: str) -> Protec
                 if response.status_code == 404:
                     return None
                 response.raise_for_status()
-                metadata_json = response.json()
-                logger.debug(f"Protected resource metadata discovered: {metadata_json}")
-                return ProtectedResourceMetadata.model_validate(metadata_json)
+                metadata = ProtectedResourceMetadata.model_validate_json(response.content)
+                logger.debug(f"Protected resource metadata discovered: {metadata}")
+                return metadata
             except TypeError:
                 # Retry without MCP header for CORS compatibility
                 try:
                     response = await client.get(url)
                     if response.status_code == 404:
                         return None
                     response.raise_for_status()
-                    metadata_json = response.json()
-                    logger.debug(f"Protected resource metadata discovered (no MCP header): {metadata_json}")
-                    return ProtectedResourceMetadata.model_validate(metadata_json)
+                    metadata = ProtectedResourceMetadata.model_validate_json(response.content)
+                    logger.debug(f"Protected resource metadata discovered (no MCP header): {metadata}")
+                    return metadata
                 except Exception:
                     logger.exception("Failed to discover protected resource metadata")
                     return None
@@ -172,19 +172,19 @@ async def _discover_oauth_metadata(self, server_url: str) -> OAuthMetadata | Non
                 if response.status_code == 404:
                     return None
                 response.raise_for_status()
-                metadata_json = response.json()
-                logger.debug(f"OAuth metadata discovered: {metadata_json}")
-                return OAuthMetadata.model_validate(metadata_json)
+                metadata = OAuthMetadata.model_validate_json(response.content)
+                logger.debug(f"OAuth metadata discovered: {metadata}")
+                return metadata
             except Exception:
                 # Retry without MCP header for CORS compatibility
                 try:
                     response = await client.get(url)
                     if response.status_code == 404:
                         return None
                     response.raise_for_status()
-                    metadata_json = response.json()
-                    logger.debug(f"OAuth metadata discovered (no MCP header): {metadata_json}")
-                    return OAuthMetadata.model_validate(metadata_json)
+                    metadata = OAuthMetadata.model_validate_json(response.content)
+                    logger.debug(f"OAuth metadata discovered (no MCP header): {metadata}")
+                    return metadata
                 except Exception:
                     logger.exception("Failed to discover OAuth metadata")
                     return None
@@ -230,9 +230,9 @@ async def _register_oauth_client(
                         response=response,
                     )
 
-                response_data = response.json()
-                logger.debug(f"Registration successful: {response_data}")
-                return OAuthClientInformationFull.model_validate(response_data)
+                client_info = OAuthClientInformationFull.model_validate_json(response.content)
+                logger.debug(f"Registration successful: {client_info}")
+                return client_info
 
             except httpx.HTTPStatusError:
                 raise
@@ -439,7 +439,7 @@ async def _exchange_code_for_token(self, auth_code: str, client_info: OAuthClien
                     raise Exception(f"Token exchange failed: {response.status_code} {response.text}")
 
             # Parse token response
-            token_response = OAuthToken.model_validate(response.json())
+            token_response = OAuthToken.model_validate_json(response.content)
 
             # Validate token scopes
             await self._validate_token_scopes(token_response)
@@ -493,7 +493,7 @@ async def _refresh_access_token(self) -> bool:
                     return False
 
                 # Parse refreshed tokens
-                token_response = OAuthToken.model_validate(response.json())
+                token_response = OAuthToken.model_validate_json(response.content)
 
                 # Validate token scopes
                 await self._validate_token_scopes(token_response)

tests/client/test_auth.py

@@ -199,7 +199,7 @@ async def test_discover_oauth_metadata_success(self, oauth_provider, oauth_metad
 
             mock_response = Mock()
             mock_response.status_code = 200
-            mock_response.json.return_value = metadata_response
+            mock_response.content = oauth_metadata.model_dump_json()
             mock_client.get.return_value = mock_response
 
             result = await oauth_provider._discover_oauth_metadata("https://api.example.com/v1/mcp")
@@ -240,7 +240,7 @@ async def test_discover_oauth_metadata_cors_fallback(self, oauth_provider, oauth
             # First call fails (CORS), second succeeds
             mock_response_success = Mock()
             mock_response_success.status_code = 200
-            mock_response_success.json.return_value = metadata_response
+            mock_response_success.content = oauth_metadata.model_dump_json()
 
             mock_client.get.side_effect = [
                 TypeError("CORS error"),  # First call fails
@@ -263,7 +263,7 @@ async def test_register_oauth_client_success(self, oauth_provider, oauth_metadat
 
             mock_response = Mock()
             mock_response.status_code = 201
-            mock_response.json.return_value = registration_response
+            mock_response.content = oauth_client_info.model_dump_json()
             mock_client.post.return_value = mock_response
 
             result = await oauth_provider._register_oauth_client(
@@ -291,7 +291,7 @@ async def test_register_oauth_client_fallback_endpoint(self, oauth_provider, oau
 
             mock_response = Mock()
             mock_response.status_code = 201
-            mock_response.json.return_value = registration_response
+            mock_response.content = oauth_client_info.model_dump_json()
             mock_client.post.return_value = mock_response
 
             # Mock metadata discovery to return None (fallback)
@@ -447,15 +447,14 @@ async def test_get_or_register_client_register_new(self, oauth_provider, oauth_c
     async def test_exchange_code_for_token_success(self, oauth_provider, oauth_client_info, oauth_token):
         """Test successful code exchange for token."""
         oauth_provider._code_verifier = "test_verifier"
-        token_response = oauth_token.model_dump(by_alias=True, mode="json")
 
         with patch("httpx.AsyncClient") as mock_client_class:
             mock_client = AsyncMock()
             mock_client_class.return_value.__aenter__.return_value = mock_client
 
             mock_response = Mock()
             mock_response.status_code = 200
-            mock_response.json.return_value = token_response
+            mock_response.content = oauth_token.model_dump_json()
             mock_client.post.return_value = mock_response
 
             with patch.object(oauth_provider, "_validate_token_scopes") as mock_validate:
@@ -502,7 +501,7 @@ async def test_refresh_access_token_success(self, oauth_provider, oauth_client_i
 
             mock_response = Mock()
             mock_response.status_code = 200
-            mock_response.json.return_value = token_response
+            mock_response.content = new_token.model_dump_json()
             mock_client.post.return_value = mock_response
 
             with patch.object(oauth_provider, "_validate_token_scopes") as mock_validate:
@@ -925,7 +924,7 @@ async def test_discover_protected_resource_metadata_success(self, oauth_provider
             # Mock successful response
             mock_response = Mock()
             mock_response.status_code = 200
-            mock_response.json.return_value = protected_resource_metadata.model_dump(mode="json")
+            mock_response.content = protected_resource_metadata.model_dump_json()
             mock_client.get.return_value = mock_response
 
             result = await oauth_provider._discover_protected_resource_metadata("https://resource.example.com/mcp")
@@ -985,7 +984,7 @@ def mock_get_side_effect(*args, **kwargs):
                     # Second call without header - success
                     mock_response = Mock()
                     mock_response.status_code = 200
-                    mock_response.json.return_value = protected_resource_metadata.model_dump(mode="json")
+                    mock_response.content = protected_resource_metadata.model_dump_json()
                     return mock_response
 
             mock_client.get.side_effect = mock_get_side_effect