refactor: update tests

Author: gao-sun

mcpauth/utils/_validate_server_config.py

@@ -99,22 +99,8 @@ def validate_server_config(
 
     errors: List[AuthServerConfigError] = []
     warnings: List[AuthServerConfigWarning] = []
-
     metadata = config.metadata
 
-    # Validate metadata
-    try:
-        # Validation is already done by Pydantic when the object is created
-        # But we can add additional validation if needed
-        pass
-    except ValidationError as e:
-        errors.append(
-            _create_error(AuthServerConfigErrorCode.INVALID_SERVER_METADATA, e)
-        )
-        return AuthServerConfigValidationResult(
-            is_valid=False, errors=errors, warnings=warnings
-        )
-
     # Check if 'code' is included in any of the supported response types
     has_code_response_type = any(
         "code" in response_type.split(" ")

tests/__init__test.py

@@ -1,9 +1,10 @@
 from contextvars import ContextVar
 import pytest
-from unittest.mock import patch, MagicMock
+from unittest.mock import AsyncMock, patch, MagicMock
 from mcpauth import MCPAuth, MCPAuthAuthServerException, AuthServerExceptionCode
 from mcpauth.config import AuthServerConfig, AuthServerType, AuthorizationServerMetadata
 from mcpauth.middleware.create_bearer_auth import BearerAuthConfig
+from mcpauth.types import AuthInfo
 
 
 class TestMCPAuth:
@@ -154,8 +155,8 @@ def test_bearer_auth_middleware_jwt_mode(self):
             "https://example.com/.well-known/jwks.json", leeway=60
         )
 
-    def test_bearer_auth_middleware_custom_verify(self):
-        # Setup
+    @pytest.mark.asyncio
+    async def test_bearer_auth_middleware_custom_verify(self):
         server_config = AuthServerConfig(
             type=AuthServerType.OAUTH,
             metadata=AuthorizationServerMetadata(
@@ -169,24 +170,25 @@ def test_bearer_auth_middleware_custom_verify(self):
         )
         auth = MCPAuth(server=server_config)
 
+        auth_info = AuthInfo(
+            token="valid_token",
+            issuer="https://example.com",
+            subject="1234567890",
+            scopes=["profile"],
+            claims={},
+        )
         custom_verify = MagicMock()
+        custom_verify.return_value = auth_info
 
-        # Exercise
-        with patch(
-            "mcpauth.middleware.create_bearer_auth.create_bearer_auth"
-        ) as mock_create_bearer_auth:
-            middleware_class = auth.bearer_auth_middleware(
-                custom_verify, required_scopes=["profile"]
-            )
+        middleware_class = auth.bearer_auth_middleware(
+            custom_verify, required_scopes=["profile"]
+        )
 
-        # Verify
-        assert middleware_class is not None
-        mock_create_bearer_auth.assert_called_once()
-        args, kwargs = mock_create_bearer_auth.call_args
-        assert args[0] == custom_verify
-        assert isinstance(kwargs, dict)
-        assert isinstance(kwargs.get("config"), BearerAuthConfig)  # type: ignore
-        assert isinstance(kwargs.get("context_var"), ContextVar)  # type: ignore
+        mock_request = MagicMock()
+        mock_request.headers = {"Authorization": "Bearer valid_token"}
+        middleware_instance = middleware_class(MagicMock())
+        await middleware_instance.dispatch(mock_request, AsyncMock())
+        assert auth.auth_info == auth_info
 
     def test_bearer_auth_middleware_jwt_without_jwks_uri(self):
         # Setup

tests/middleware/create_bearer_auth_test.py

@@ -22,41 +22,51 @@
 
 
 class TestHandleBearerAuth:
-    def test_should_return_middleware_class(self):
+    @pytest.fixture
+    def auth_info(self):
+        return ContextVar("auth_info", default=None)
+
+    def test_should_return_middleware_class(
+        self, auth_info: ContextVar[AuthInfo | None]
+    ):
         middleware = create_bearer_auth(
             lambda _: None,  # type: ignore
             BearerAuthConfig(issuer="https://example.com"),
-            ContextVar("auth_info", default=None),
+            auth_info,
         )
         assert callable(middleware)
 
-    def test_should_throw_error_if_verify_access_token_is_not_a_function(self):
+    def test_should_throw_error_if_verify_access_token_is_not_a_function(
+        self, auth_info: ContextVar[AuthInfo | None]
+    ):
         with pytest.raises(
             TypeError, match=r"`verify_access_token` must be a function"
         ):
             create_bearer_auth(
                 "not a function",  # type: ignore
                 BearerAuthConfig(issuer="https://example.com"),
-                ContextVar("auth_info", default=None),
+                auth_info,
             )
 
-    def test_should_throw_error_if_issuer_is_not_a_valid_url(self):
+    def test_should_throw_error_if_issuer_is_not_a_valid_url(
+        self, auth_info: ContextVar[AuthInfo | None]
+    ):
         with pytest.raises(TypeError, match=r"`issuer` must be a valid URL."):
             create_bearer_auth(
                 lambda _: None,  # type: ignore
                 BearerAuthConfig(issuer="not a valid url"),
-                ContextVar("auth_info", default=None),
+                auth_info,
             )
 
 
 @pytest.mark.asyncio
 class TestHandleBearerAuthMiddleware:
     @pytest.fixture
-    def auth_info_context(self):
+    def auth_info(self):
         return ContextVar("auth_info", default=None)
 
     @pytest.fixture
-    def auth_config(self, auth_info_context: ContextVar[AuthInfo | None]):
+    def auth_config(self, auth_info: ContextVar[AuthInfo | None]):
         issuer = "https://example.com"
         required_scopes = ["read", "write"]
         audience = "test-audience"
@@ -83,7 +93,7 @@ def verify_access_token(token: str) -> AuthInfo:
                 required_scopes=required_scopes,
                 audience=audience,
             ),
-            auth_info_context,
+            auth_info,
         )
 
     @pytest.fixture

tests/utils/create_verify_jwt_test.py

@@ -1,3 +1,4 @@
+from unittest.mock import MagicMock
 import pytest
 import time
 import jwt
@@ -122,6 +123,25 @@ def test_should_throw_error_if_jwt_payload_missing_sub(self):
                 == MCPAuthTokenVerificationExceptionCode.INVALID_TOKEN
             )
 
+    def test_should_throw_error_if_unknown_exception_occurs(self):
+        # Mock get_signing_key_from_jwt to raise an unexpected exception
+        mock_jwk_client = MagicMock()
+        mock_jwk_client.get_signing_key_from_jwt.side_effect = Exception(
+            "Unexpected error"
+        )
+        verify_jwt = create_verify_jwt(mock_jwk_client, algorithms=[_algorithm])
+        jwt_token = create_jwt(
+            {"iss": "https://logto.io/", "client_id": "client12345", "sub": "user12345"}
+        )
+
+        # Verify that the correct exception is raised
+        with pytest.raises(MCPAuthTokenVerificationException) as exc_info:
+            verify_jwt(jwt_token)
+        assert (
+            exc_info.value.code
+            == MCPAuthTokenVerificationExceptionCode.TOKEN_VERIFICATION_FAILED
+        )
+
 
 class TestCreateVerifyJwtNormalBehavior:
     def test_should_return_verified_jwt_payload_with_string_scope(self):