fix: improve context injection for prompts and resources

- Enhanced context injection utilities to better handle prompts and resources
- Fixed parameter handling and context propagation

Github-Issue: #1129

Author: dsp-ant

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

@@ -99,7 +99,7 @@ async def error_response(
             if client is None and attempt_load_client:
                 # make last-ditch attempt to load the client
                 client_id = best_effort_extract_string("client_id", params)
-                client = client_id and await self.provider.get_client(client_id)
+                client = await self.provider.get_client(client_id) if client_id else None
             if redirect_uri is None and client:
                 # make last-ditch effort to load the redirect uri
                 try:

src/mcp/server/fastmcp/utilities/context_injection.py

@@ -3,8 +3,9 @@
 from __future__ import annotations
 
 import inspect
+import typing
 from collections.abc import Callable
-from typing import Any, get_origin
+from typing import Any
 
 
 def find_context_parameter(fn: Callable[..., Any]) -> str | None:
@@ -21,21 +22,26 @@ def find_context_parameter(fn: Callable[..., Any]) -> str | None:
     """
     from mcp.server.fastmcp.server import Context
 
-    sig = inspect.signature(fn)
-    for param_name, param in sig.parameters.items():
-        # Skip generic types
-        if get_origin(param.annotation) is not None:
-            continue
-
-        # Check if parameter has annotation
-        if param.annotation is not inspect.Parameter.empty:
-            try:
-                # Check if it's a Context subclass
-                if issubclass(param.annotation, Context):
+    # Get type hints to properly resolve string annotations
+    try:
+        hints = typing.get_type_hints(fn)
+    except Exception:
+        # If we can't resolve type hints, we can't find the context parameter
+        return None
+
+    # Check each parameter's type hint
+    for param_name, annotation in hints.items():
+        # Handle direct Context type
+        if inspect.isclass(annotation) and issubclass(annotation, Context):
+            return param_name
+
+        # Handle generic types like Optional[Context]
+        origin = typing.get_origin(annotation)
+        if origin is not None:
+            args = typing.get_args(annotation)
+            for arg in args:
+                if inspect.isclass(arg) and issubclass(arg, Context):
                     return param_name
-            except TypeError:
-                # issubclass raises TypeError for non-class types
-                pass
 
     return None