golf-mcp 0.2.5__py3-none-any.whl → 0.2.6__py3-none-any.whl

golf/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.2.5"
+__version__ = "0.2.6"
 
 # Import endpoints with fallback for dev mode
 try:

golf/auth/__init__.py

@@ -35,6 +35,7 @@ from .helpers import (
     debug_api_key_context,
     extract_token_from_header,
     get_api_key,
+    get_auth_token,
     get_provider_token,
     set_api_key,
 )
@@ -72,6 +73,7 @@ __all__ = [
     "debug_api_key_context",
     "extract_token_from_header",
     "get_api_key",
+    "get_auth_token",
     "get_provider_token",
     "set_api_key",
 ]
@@ -195,14 +197,14 @@ def configure_dev_auth(
 
 
 def configure_oauth_proxy(
-    upstream_authorization_endpoint: str,
-    upstream_token_endpoint: str,
-    upstream_client_id: str,
-    upstream_client_secret: str,
+    authorization_endpoint: str,
+    token_endpoint: str,
+    client_id: str,
+    client_secret: str,
     base_url: str,
     token_verifier_config: JWTAuthConfig | StaticTokenConfig,
     scopes_supported: list[str] | None = None,
-    upstream_revocation_endpoint: str | None = None,
+    revocation_endpoint: str | None = None,
     redirect_path: str = "/oauth/callback",
 ) -> None:
     """Configure OAuth proxy authentication for non-DCR providers.
@@ -212,25 +214,25 @@ def configure_oauth_proxy(
     fixed client credentials.
 
     Args:
-        upstream_authorization_endpoint: Provider's authorization URL
-        upstream_token_endpoint: Provider's token endpoint URL
-        upstream_client_id: Your client ID registered with the provider
-        upstream_client_secret: Your client secret from the provider
+        authorization_endpoint: Provider's authorization URL
+        token_endpoint: Provider's token endpoint URL
+        client_id: Your client ID registered with the provider
+        client_secret: Your client secret from the provider
         base_url: This proxy server's public URL
         token_verifier_config: JWT or static token config for token verification
         scopes_supported: Scopes to advertise to MCP clients
-        upstream_revocation_endpoint: Optional token revocation endpoint
+        revocation_endpoint: Optional token revocation endpoint
         redirect_path: OAuth callback path (default: /oauth/callback)
 
     Note:
         Requires golf-mcp-enterprise package for implementation.
     """
     config = OAuthProxyConfig(
-        upstream_authorization_endpoint=upstream_authorization_endpoint,
-        upstream_token_endpoint=upstream_token_endpoint,
-        upstream_client_id=upstream_client_id,
-        upstream_client_secret=upstream_client_secret,
-        upstream_revocation_endpoint=upstream_revocation_endpoint,
+        authorization_endpoint=authorization_endpoint,
+        token_endpoint=token_endpoint,
+        client_id=client_id,
+        client_secret=client_secret,
+        revocation_endpoint=revocation_endpoint,
         base_url=base_url,
         redirect_path=redirect_path,
         scopes_supported=scopes_supported or [],

golf/auth/helpers.py

@@ -142,6 +142,72 @@ def get_api_key_from_request(request: Request) -> str | None:
     return _current_api_key.get()
 
 
+def get_auth_token() -> str | None:
+    """Get the authorization token from the current request context.
+
+    This function should be used in tools to retrieve the authorization token
+    (typically a JWT or OAuth token) that was sent in the request headers.
+
+    Unlike get_api_key(), this function extracts the raw token from the Authorization
+    header without stripping any prefix, making it suitable for passing through
+    to upstream APIs that expect the full Authorization header value.
+
+    Returns:
+        The authorization token if available, None otherwise
+
+    Example:
+        # In a tool file
+        from golf.auth import get_auth_token
+
+        async def call_upstream_api():
+            auth_token = get_auth_token()
+            if not auth_token:
+                return {"error": "No authorization token provided"}
+
+            # Use the full token in upstream request
+            headers = {"Authorization": f"Bearer {auth_token}"}
+            async with httpx.AsyncClient() as client:
+                response = await client.get("https://api.example.com/data", headers=headers)
+            ...
+    """
+    # Try to get directly from HTTP request if available (FastMCP pattern)
+    try:
+        # This follows the FastMCP pattern for accessing HTTP requests
+        from fastmcp.server.dependencies import get_http_request
+
+        request = get_http_request()
+
+        if request and hasattr(request, "state") and hasattr(request.state, "auth_token"):
+            return request.state.auth_token
+
+        if request:
+            # Extract authorization token from Authorization header
+            auth_header = None
+            for k, v in request.headers.items():
+                if k.lower() == "authorization":
+                    auth_header = v
+                    break
+
+            if auth_header:
+                # Extract the token part (everything after "Bearer ")
+                token = extract_token_from_header(auth_header)
+                if token:
+                    return token
+
+                # If not Bearer format, return the whole header value minus "Bearer " prefix if present
+                if auth_header.lower().startswith("bearer "):
+                    return auth_header[7:]  # Remove "Bearer " prefix
+                return auth_header
+
+    except (ImportError, RuntimeError):
+        # FastMCP not available or not in HTTP context
+        pass
+    except Exception:
+        pass
+
+    return None
+
+
 def debug_api_key_context() -> dict[str, Any]:
     """Debug function to inspect API key context.
 

golf/auth/providers.py

@@ -458,12 +458,12 @@ class OAuthProxyConfig(BaseModel):
 
     provider_type: Literal["oauth_proxy"] = "oauth_proxy"
 
-    # Upstream OAuth provider configuration
-    upstream_authorization_endpoint: str = Field(..., description="Upstream provider's authorization endpoint URL")
-    upstream_token_endpoint: str = Field(..., description="Upstream provider's token endpoint URL")
-    upstream_client_id: str = Field(..., description="Your registered client ID with the upstream provider")
-    upstream_client_secret: str = Field(..., description="Your registered client secret with the upstream provider")
-    upstream_revocation_endpoint: str | None = Field(None, description="Optional upstream token revocation endpoint")
+    # OAuth provider configuration
+    authorization_endpoint: str = Field(..., description="OAuth provider's authorization endpoint URL")
+    token_endpoint: str = Field(..., description="OAuth provider's token endpoint URL")
+    client_id: str = Field(..., description="Your registered client ID with the OAuth provider")
+    client_secret: str = Field(..., description="Your registered client secret with the OAuth provider")
+    revocation_endpoint: str | None = Field(None, description="Optional token revocation endpoint")
 
     # This proxy server configuration
     base_url: str = Field(..., description="Public URL of this OAuth proxy server")
@@ -476,22 +476,18 @@ class OAuthProxyConfig(BaseModel):
     )
 
     # Environment variable names for runtime configuration
-    upstream_authorization_endpoint_env_var: str | None = Field(
-        None, description="Environment variable name for upstream authorization endpoint"
+    authorization_endpoint_env_var: str | None = Field(
+        None, description="Environment variable name for authorization endpoint"
     )
-    upstream_token_endpoint_env_var: str | None = Field(
-        None, description="Environment variable name for upstream token endpoint"
-    )
-    upstream_client_id_env_var: str | None = Field(None, description="Environment variable name for upstream client ID")
-    upstream_client_secret_env_var: str | None = Field(
-        None, description="Environment variable name for upstream client secret"
-    )
-    upstream_revocation_endpoint_env_var: str | None = Field(
-        None, description="Environment variable name for upstream revocation endpoint"
+    token_endpoint_env_var: str | None = Field(None, description="Environment variable name for token endpoint")
+    client_id_env_var: str | None = Field(None, description="Environment variable name for client ID")
+    client_secret_env_var: str | None = Field(None, description="Environment variable name for client secret")
+    revocation_endpoint_env_var: str | None = Field(
+        None, description="Environment variable name for revocation endpoint"
     )
     base_url_env_var: str | None = Field(None, description="Environment variable name for base URL")
 
-    @field_validator("upstream_authorization_endpoint", "upstream_token_endpoint", "base_url")
+    @field_validator("authorization_endpoint", "token_endpoint", "base_url")
     @classmethod
     def validate_required_urls(cls, v: str) -> str:
         """Validate required URLs are properly formatted."""
@@ -514,7 +510,7 @@ class OAuthProxyConfig(BaseModel):
 
         return url
 
-    @field_validator("upstream_revocation_endpoint")
+    @field_validator("revocation_endpoint")
     @classmethod
     def validate_optional_url(cls, v: str | None) -> str | None:
         """Validate optional URLs are properly formatted."""
@@ -588,12 +584,12 @@ class OAuthProxyConfig(BaseModel):
 
             urls_to_check = [
                 ("base_url", self.base_url),
-                ("upstream_authorization_endpoint", self.upstream_authorization_endpoint),
-                ("upstream_token_endpoint", self.upstream_token_endpoint),
+                ("authorization_endpoint", self.authorization_endpoint),
+                ("token_endpoint", self.token_endpoint),
             ]
 
-            if self.upstream_revocation_endpoint:
-                urls_to_check.append(("upstream_revocation_endpoint", self.upstream_revocation_endpoint))
+            if self.revocation_endpoint:
+                urls_to_check.append(("revocation_endpoint", self.revocation_endpoint))
 
             for field_name, url in urls_to_check:
                 parsed = urlparse(url)

golf/examples/basic/resources/weather/client.py

@@ -45,4 +45,4 @@ class WeatherApiClient:
 weather_client = WeatherApiClient()
 
 # This could also define shared models or other utilities
-# that would be common across weather-related resources
+# that would be common across weather-related resources

{golf_mcp-0.2.5.dist-info → golf_mcp-0.2.6.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: golf-mcp
-Version: 0.2.5
+Version: 0.2.6
 Summary: Framework for building MCP servers
 Author-email: Antoni Gmitruk <antoni@golf.dev>
 License-Expression: Apache-2.0

{golf_mcp-0.2.5.dist-info → golf_mcp-0.2.6.dist-info}/RECORD

@@ -1,12 +1,12 @@
-golf/__init__.py,sha256=pjc5BpzhL3Rn_QfzuqOyLUq-KgJ0p4QvvBcMgLuFU8I,306
+golf/__init__.py,sha256=qWIRfT1s1Et0Jru9N8JfQhbMc-CsZpqWQV9S0Ay5YPk,306
 golf/_endpoints.py,sha256=-mvAmjx3YtqfAdajO13Kv7LKVBMdqsKqX0_3aCmCK4I,317
 golf/_endpoints.py.in,sha256=MeqcSF6xinnPknpBGF26xA9FYmSYKSWqCFXOSDlXiOA,216
 golf/_endpoints_fallback.py,sha256=CD6m45Ams1A9HVKowY8dCFUDMiFmJ8ZWSwHCENvU5u4,386
-golf/auth/__init__.py,sha256=EGCGcxHjTaEClYqXWa5os1hxv0p6IkqYmwJ7LyNm6LY,8165
+golf/auth/__init__.py,sha256=u-6_EFTvfs91B2Jko39swp3tCpHkj3r9wDQzQBmfxn0,8027
 golf/auth/api_key.py,sha256=OonqTlG6USJxqK8TlPviJTv7sgYmTVfCxG_JsEjnEM4,2320
 golf/auth/factory.py,sha256=3-il1GbjjZlQfvWUZs-09r61Y_-b5cYEegWF7sY_cUs,13128
-golf/auth/helpers.py,sha256=ElyX5iyDLfjFIFzE2psavWA3I1_QG1lcuNWsQ2G9bw0,5672
-golf/auth/providers.py,sha256=N3klWpAwCjZQw0ecCiCantjrd9FxQv29iQVgeZOwEGA,26233
+golf/auth/helpers.py,sha256=WoYyjUAQwgDnLvJDvyhuEOmm8w0fQ-ZDqaYxs_lC8nw,8127
+golf/auth/providers.py,sha256=qgybeHtrb0MojUsXZm813gzT4zBCNxCiSCWvxKG2iis,25950
 golf/auth/registry.py,sha256=Rjj7LnWvzEsI1GCnFbFcxpRllrVanD9bumWPaJ1giFQ,7960
 golf/cli/__init__.py,sha256=R8Y8KdD2C8gDo24fXGq-fdWWNeaq3MYjrbaSB8Hb-Hg,45
 golf/cli/branding.py,sha256=ndpy2kVxBzqr4fwsAlh_fbhxqgRPoF6kM3ufP9hg5QI,6896
@@ -34,7 +34,7 @@ golf/examples/basic/prompts/welcome.py,sha256=xyW4pwvpcPQi0_H9tP7OX53Kv62R1aCYcV
 golf/examples/basic/resources/current_time.py,sha256=bJMrRZQ0WPgnQxMl_4-4ynZyq7ki-wGMbMFpaYOH7PY,859
 golf/examples/basic/resources/info.py,sha256=LxHzg_TmwonSu1vSkuNcpUq5JrBu-9yzoGaARE1f2KU,727
 golf/examples/basic/resources/weather/city.py,sha256=pRgceEP4ZRDVFEJA4kQf54n0pb37TMdFLgqFL1cHZZs,1278
-golf/examples/basic/resources/weather/client.py,sha256=Qyj72OeRFaPtb0tLUerPgIhNuENeqb_u36wSzqP3Nuc,1678
+golf/examples/basic/resources/weather/client.py,sha256=E6250OfgjSLcRSK14B0LFth8siKNRhN8yRwjy0LuO9A,1679
 golf/examples/basic/resources/weather/current.py,sha256=muT77pUxnHQJSnrX5x4itzrjTSzK_hPbbkjVh3LGlh4,933
 golf/examples/basic/resources/weather/forecast.py,sha256=xhSpK71gWsCIpyzYyqY7KhoUHn38xpR6srZ-2Vqww8Q,990
 golf/examples/basic/tools/calculator.py,sha256=QTDvE7ItMol2eIR1mgc6moRhhl3p-q63bgieWr5yF5c,3070
@@ -48,9 +48,9 @@ golf/utilities/__init__.py,sha256=X9iY9yi3agz1GVcn8-qWeOCt8CSSsruHxqPNtiF63TY,53
 golf/utilities/context.py,sha256=DGGvhVe---QMhy0wtdWhNp-_WVk1NvAcOFn0uBKBpYo,1579
 golf/utilities/elicitation.py,sha256=MParZZZsY45s70-KXduHa6IvpWXnLW2FCPfrGijMaHs,5223
 golf/utilities/sampling.py,sha256=88nDv-trBE4gZQbcnMjXl3LW6TiIhv5zR_cuEIGjaIM,7233
-golf_mcp-0.2.5.dist-info/licenses/LICENSE,sha256=5_j2f6fTJmvfmUewzElhkpAaXg2grVoxKouOA8ihV6E,11348
-golf_mcp-0.2.5.dist-info/METADATA,sha256=LBA45kjycZuDRt4HHmhH770mcj9yqugCv_FsEaomoGU,9558
-golf_mcp-0.2.5.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-golf_mcp-0.2.5.dist-info/entry_points.txt,sha256=5y7rHYM8jGpU-nfwdknCm5XsApLulqsnA37MO6BUTYg,43
-golf_mcp-0.2.5.dist-info/top_level.txt,sha256=BQToHcBUufdyhp9ONGMIvPE40jMEtmI20lYaKb4hxOg,5
-golf_mcp-0.2.5.dist-info/RECORD,,
+golf_mcp-0.2.6.dist-info/licenses/LICENSE,sha256=5_j2f6fTJmvfmUewzElhkpAaXg2grVoxKouOA8ihV6E,11348
+golf_mcp-0.2.6.dist-info/METADATA,sha256=yE954KDxWowq6DfMIUQne6Ypl4LsWEqSTeqeHFXomaE,9558
+golf_mcp-0.2.6.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+golf_mcp-0.2.6.dist-info/entry_points.txt,sha256=5y7rHYM8jGpU-nfwdknCm5XsApLulqsnA37MO6BUTYg,43
+golf_mcp-0.2.6.dist-info/top_level.txt,sha256=BQToHcBUufdyhp9ONGMIvPE40jMEtmI20lYaKb4hxOg,5
+golf_mcp-0.2.6.dist-info/RECORD,,