fix pre-commit issues

Signed-off-by: Jesse Sanford <108698+jessesanford@users.noreply.github.com>

Author: jessesanford

examples/servers/proxy-auth/README.md

@@ -20,7 +20,8 @@ The servers can be configured using either:
 2. **Environment variables** (loaded from `.env` file when present)
 
 Example `.env` file:
-```
+
+```env
 # Auth Server Configuration
 AUTH_SERVER_HOST=localhost
 AUTH_SERVER_PORT=9000
@@ -58,6 +59,7 @@ uv run mcp-proxy-auth-as
 ```
 
 **What it provides:**
+
 - OAuth 2.0 flows (authorization, token exchange)
 - Token introspection endpoint for Resource Servers (`/introspect`)
 - Client registration endpoint (`/register`)
@@ -87,9 +89,13 @@ uv run mcp-proxy-auth-combo
 ## How It Works
 
 The proxy OAuth server acts as a transparent proxy between:
+
 1. Client applications requesting OAuth tokens
 2. Upstream OAuth providers (like GitHub, Google, etc.)
 
 This allows MCP servers to leverage existing OAuth providers without implementing their own authentication systems.
 
-The server code is organized in the `proxy_auth` package for better modularity.
+The server code is organized in the `proxy_auth` package for better modularity.
+
+```text
+```

examples/servers/proxy-auth/proxy_auth/__init__.py

@@ -3,7 +3,6 @@
 __version__ = "0.1.0"
 
 # Import key components for easier access
-<<<<<<< HEAD
 from .auth_server import auth_server as auth_server
 from .auth_server import main as auth_server_main
 from .combo_server import combo_server as combo_server
@@ -16,20 +15,6 @@
     "auth_server",
     "resource_server",
     "combo_server",
-=======
-from .auth_server import main as auth_server_main
-from .auth_server import run_server as run_auth_server
-from .combo_server import main as combo_server_main
-from .combo_server import mcp as proxy_server
-from .resource_server import main as resource_server_main
-from .resource_server import mcp as resource_server
-from .token_verifier import IntrospectionTokenVerifier
-
-__all__ = [
-    "run_auth_server",
-    "resource_server",
-    "proxy_server",
->>>>>>> 37d81fe (renamed to proxy-oauth)
     "IntrospectionTokenVerifier",
     "auth_server_main",
     "resource_server_main",

examples/servers/proxy-auth/tests/test_proxy_oauth_endpoints.py

@@ -26,29 +26,29 @@
 @pytest.fixture
 def proxy_server(monkeypatch):
     """Import the proxy OAuth demo server with safe environment + stubs."""
+
     import os
 
     # Avoid real outbound calls by pretending the upstream endpoints were
     # supplied explicitly via env vars – this makes `fetch_upstream_metadata`
     # construct metadata locally instead of performing an HTTP GET.
-    os.environ.setdefault("UPSTREAM_AUTHORIZATION_ENDPOINT", "https://upstream.example.com/authorize")
-    os.environ.setdefault("UPSTREAM_TOKEN_ENDPOINT", "https://upstream.example.com/token")
+    os.environ.setdefault(
+        "UPSTREAM_AUTHORIZATION_ENDPOINT", "https://upstream.example.com/authorize"
+    )
+    os.environ.setdefault(
+        "UPSTREAM_TOKEN_ENDPOINT", "https://upstream.example.com/token"
+    )
     os.environ.setdefault("UPSTREAM_JWKS_URI", "https://upstream.example.com/jwks")
     os.environ.setdefault("UPSTREAM_CLIENT_ID", "client123")
     os.environ.setdefault("UPSTREAM_CLIENT_SECRET", "secret123")
 
     # Deferred import so the env vars above are in effect.
-    from proxy_auth import combo_server as proxy_server_module
-
     # Stub library-level fetch_upstream_metadata to avoid network I/O.
     from mcp.server.auth.proxy import routes as proxy_routes
 
-<<<<<<< HEAD
-=======
     # Import the module and the combo_server instance
     from proxy_auth import combo_server
 
->>>>>>> fbb3cb4 (fix imports)
     async def _fake_metadata() -> dict[str, Any]:  # noqa: D401
         # Access module-level constants directly
         return {
@@ -59,17 +59,12 @@ async def _fake_metadata() -> dict[str, Any]:  # noqa: D401
             "jwks_uri": "",
         }
 
-<<<<<<< HEAD
-    monkeypatch.setattr(proxy_routes, "fetch_upstream_metadata", _fake_metadata, raising=True)
-    return proxy_server_module
-=======
     monkeypatch.setattr(
         proxy_routes, "fetch_upstream_metadata", _fake_metadata, raising=True
     )
 
     # Return the combo_server instance
     return combo_server
->>>>>>> fbb3cb4 (fix imports)
 
 
 @pytest.fixture
@@ -81,7 +76,9 @@ def app(proxy_server):
 @pytest.fixture
 async def client(app) -> AsyncGenerator[httpx.AsyncClient, None]:
     """Async HTTP client bound to the in-memory ASGI application."""
-    async with httpx.AsyncClient(transport=httpx.ASGITransport(app=app), base_url="http://testserver") as c:
+    async with httpx.AsyncClient(
+        transport=httpx.ASGITransport(app=app), base_url="http://testserver"
+    ) as c:
         yield c
 
 
@@ -129,11 +126,7 @@ async def test_authorize_redirect(client):
     location = r.headers["location"]
     parsed = urllib.parse.urlparse(location)
     assert parsed.scheme.startswith("http")
-<<<<<<< HEAD
-    assert parsed.netloc == urllib.parse.urlparse(proxy_server.UPSTREAM_AUTHORIZE).netloc
-=======
     assert parsed.netloc == urllib.parse.urlparse(UPSTREAM_AUTHORIZE).netloc
->>>>>>> fbb3cb4 (fix imports)
 
     qs = urllib.parse.parse_qs(parsed.query)
     # Proxy should inject client_id & default scope
@@ -150,7 +143,8 @@ async def test_revoke_proxy(client, monkeypatch):
     async def _mock_post(self, url, data=None, timeout=10, **kwargs):  # noqa: D401
         if url.endswith("/revoke"):
             return httpx.Response(200, json={"revoked": True})
-        # For the test client's own request to /revoke, delegate to original implementation
+        # For the test client's own request to /revoke,
+        # delegate to original implementation
         return await original_post(self, url, data=data, timeout=timeout, **kwargs)
 
     monkeypatch.setattr(httpx.AsyncClient, "post", _mock_post, raising=True)
@@ -231,9 +225,13 @@ async def test_user_info_tool(monkeypatch, proxy_server):
     from mcp.server.auth.provider import AccessToken  # local import to avoid cycles
 
     def _fake_get_access_token():  # noqa: D401
-        return AccessToken(token=dummy_token, client_id="client123", scopes=["openid"], expires_at=None)
+        return AccessToken(
+            token=dummy_token, client_id="client123", scopes=["openid"], expires_at=None
+        )
 
-    monkeypatch.setattr(auth_context, "get_access_token", _fake_get_access_token, raising=True)
+    monkeypatch.setattr(
+        auth_context, "get_access_token", _fake_get_access_token, raising=True
+    )
 
     result = await proxy_server.call_tool("user_info", {})
 
@@ -244,5 +242,7 @@ def _fake_get_access_token():  # noqa: D401
         raw = result  # fallback
 
     assert raw["authenticated"] is True
-    assert ("userid" in raw and raw["userid"] == "test-user") or ("user_id" in raw and raw["user_id"] == "test-user")
-    assert raw["username"] == "tester" 
+    assert ("userid" in raw and raw["userid"] == "test-user") or (
+        "user_id" in raw and raw["user_id"] == "test-user"
+    )
+    assert raw["username"] == "tester"