fix(keycardai-oauth): update test to expect OAuthProtocolError for structured error bodies

Author: kamil-keycard

packages/mcp/tests/keycardai/mcp/server/auth/test_provider.py

@@ -122,7 +122,7 @@ async def test_function_called_without_context_value(self, auth_provider_config,
         def test_function(access_ctx: AccessContext, ctx: Context, user_id: str) -> dict:
             if access_ctx.has_error():
                 error = access_ctx.get_error()
-                return {"error": error["error"]}
+                return {"error": error["message"]}
             return {"success": True}
 
         # Call without providing ctx parameter - should cause TypeError due to missing required argument
@@ -141,7 +141,7 @@ async def test_function_called_with_context_as_none(self, auth_provider_config,
         def test_function(access_ctx: AccessContext, ctx: Context, user_id: str) -> dict:
             if access_ctx.has_error():
                 error = access_ctx.get_error()
-                return {"error": error["error"]}
+                return {"error": error["message"]}
             return {"success": True}
 
         # Call with ctx=None - should cause error
@@ -161,7 +161,7 @@ async def test_function_called_with_context_via_positional_args(self, auth_provi
         def test_function(access_ctx: AccessContext, ctx: Context, user_id: str) -> dict:
             if access_ctx.has_error():
                 error = access_ctx.get_error()
-                return {"error": error["error"]}
+                return {"error": error["message"]}
             return {"success": True, "user_id": user_id}
 
         mock_context = self.create_mock_context_with_auth()
@@ -185,7 +185,7 @@ async def test_function_called_with_context_via_kwargs(self, auth_provider_confi
         def test_function(access_ctx: AccessContext, ctx: Context, user_id: str) -> dict:
             if access_ctx.has_error():
                 error = access_ctx.get_error()
-                return {"error": error["error"]}
+                return {"error": error["message"]}
             return {"success": True, "user_id": user_id}
 
         mock_context = self.create_mock_context_with_auth()
@@ -211,7 +211,7 @@ def test_function(access_ctx: AccessContext, ctx: Context, user_id: str) -> dict
             assert isinstance(access_ctx, AccessContext)
             if access_ctx.has_error():
                 error = access_ctx.get_error()
-                return {"error": error["error"]}
+                return {"error": error["message"]}
             return {"success": True, "has_access_ctx": True}
 
         mock_context = self.create_mock_context_with_auth()
@@ -235,7 +235,7 @@ async def test_function_called_with_access_context_via_positional_args(self, aut
         def test_function(access_ctx: AccessContext, ctx: Context, user_id: str) -> dict:
             if access_ctx.has_error():
                 error = access_ctx.get_error()
-                return {"error": error["error"]}
+                return {"error": error["message"]}
             return {"success": True, "user_id": user_id}
 
         mock_context = self.create_mock_context_with_auth()
@@ -260,7 +260,7 @@ async def test_function_called_with_access_context_via_kwargs(self, auth_provide
         def test_function(access_ctx: AccessContext, ctx: Context, user_id: str) -> dict:
             if access_ctx.has_error():
                 error = access_ctx.get_error()
-                return {"error": error["error"]}
+                return {"error": error["message"]}
             return {"success": True, "user_id": user_id}
 
         mock_context = self.create_mock_context_with_auth()
@@ -306,7 +306,7 @@ async def test_context_extraction_from_fastmcp_context(self, auth_provider_confi
         def test_function(access_ctx: AccessContext, ctx: Context, user_id: str) -> dict:
             if access_ctx.has_error():
                 error = access_ctx.get_error()
-                return {"error": error["error"]}
+                return {"error": error["message"]}
             return {"success": True}
 
         # Create mock Context with request_context
@@ -330,7 +330,7 @@ async def test_context_extraction_from_request_context_directly(self, auth_provi
         def test_function(access_ctx: AccessContext, ctx: RequestContext, user_id: str) -> dict:
             if access_ctx.has_error():
                 error = access_ctx.get_error()
-                return {"error": error["error"]}
+                return {"error": error["message"]}
             return {"success": True}
 
         mock_request_context = self.create_mock_request_context_with_auth()
@@ -351,7 +351,7 @@ async def test_missing_auth_info_in_context(self, auth_provider_config, mock_cli
         def test_function(access_ctx: AccessContext, ctx: Context, user_id: str) -> dict:
             if access_ctx.has_error():
                 error = access_ctx.get_error()
-                return {"error": error["error"]}
+                return {"error": error["message"]}
             return {"success": True}
 
         # Create mock Context without auth info
@@ -435,7 +435,7 @@ async def test_parameter_order_with_positional_args(self, auth_provider_config,
         def test_function(access_ctx: AccessContext, ctx: Context, user_id: str, extra_param: str = "default") -> dict:
             if access_ctx.has_error():
                 error = access_ctx.get_error()
-                return {"error": error["error"]}
+                return {"error": error["message"]}
             return {
                 "success": True,
                 "user_id": user_id,
@@ -466,7 +466,7 @@ async def test_mixed_args_and_kwargs(self, auth_provider_config, mock_client_fac
         def test_function(access_ctx: AccessContext, ctx: Context, user_id: str, extra_param: str = "default") -> dict:
             if access_ctx.has_error():
                 error = access_ctx.get_error()
-                return {"error": error["error"]}
+                return {"error": error["message"]}
             return {
                 "success": True,
                 "user_id": user_id,
@@ -574,7 +574,7 @@ async def test_multiple_resources_token_exchange(self, auth_provider_config, moc
         def test_function(access_ctx: AccessContext, ctx: Context, user_id: str) -> dict:
             if access_ctx.has_error():
                 error = access_ctx.get_error()
-                return {"error": error["error"]}
+                return {"error": error["message"]}
 
             # Try to access both resources
             try:

packages/oauth/tests/keycardai/oauth/operations/test_token_exchange.py

@@ -91,14 +91,28 @@ def test_parse_token_exchange_http_response_success(self):
         assert " ".join(result.scope) == "read write"  # scope is parsed as a list
 
     def test_parse_token_exchange_http_response_http_error(self):
-        """Test parsing HTTP error response."""
+        """Test parsing HTTP error response with structured OAuth error body."""
         http_response = HttpResponse(
             status=400,
             headers={"Content-Type": "application/json"},
             body=b'{"error": "invalid_request", "error_description": "Invalid subject_token"}'
         )
 
-        with pytest.raises(OAuthHttpError, match="HTTP 400"):
+        with pytest.raises(OAuthProtocolError, match="invalid_request") as exc_info:
+            parse_token_exchange_http_response(http_response)
+
+        assert exc_info.value.error == "invalid_request"
+        assert exc_info.value.error_description == "Invalid subject_token"
+
+    def test_parse_token_exchange_http_response_http_error_non_json(self):
+        """Test parsing HTTP error response with non-JSON body."""
+        http_response = HttpResponse(
+            status=500,
+            headers={"Content-Type": "text/plain"},
+            body=b"Internal Server Error"
+        )
+
+        with pytest.raises(OAuthHttpError, match="HTTP 500"):
             parse_token_exchange_http_response(http_response)
 
     def test_parse_token_exchange_http_response_invalid_json(self):