merge with recent branch

Author: SoldierSacha

src/mcp/server/auth/handlers/token.py

@@ -248,7 +248,7 @@ async def handle(self, request: Request):
             case RefreshTokenRequest():
                 refresh_token = await self.provider.load_refresh_token(client_info, token_request.refresh_token)
                 if refresh_token is None or refresh_token.client_id != token_request.client_id:
-                    # if token belongs to different client, pretend it doesn't exist
+                    # if token belongs to a different client, pretend it doesn't exist
                     return self.response(
                         TokenErrorResponse(
                             error="invalid_grant",

tests/server/fastmcp/auth/test_auth_integration.py

@@ -974,13 +974,10 @@ async def test_client_registration_invalid_grant_type(self, test_client: httpx.A
         error_data = response.json()
         assert "error" in error_data
         assert error_data["error"] == "invalid_client_metadata"
-        assert (
-            error_data["error_description"]
-            == (
-                "grant_types must be authorization_code and refresh_token "
-                "or client_credentials or token exchange or "
-                "client_credentials and token_exchange"
-            )
+        assert error_data["error_description"] == (
+            "grant_types must be authorization_code and refresh_token "
+            "or client_credentials or token exchange or "
+            "client_credentials and token_exchange"
         )
 
     @pytest.mark.anyio