Merge branch 'tui_oauth' of github.com:Edison-Watch/open-edison into tui_oauth

Author: Drummersbrother

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "open-edison"
-version = "0.1.47"
+version = "0.1.48"
 description = "Open-source MCP security, aggregation, and monitoring. Single-user, self-hosted MCP proxy."
 readme = "README.md"
 authors = [

src/mcp_importer/api.py

@@ -26,6 +26,7 @@
 )
 from src.mcp_importer.merge import MergePolicy, merge_servers
 from src.oauth_manager import OAuthStatus, get_oauth_manager
+from src.oauth_override import OpenEdisonOAuth
 
 
 class CLIENT(str, Enum):
@@ -304,7 +305,7 @@ async def _authorize_async() -> bool:
                 f"client_name={server.oauth_client_name or 'Open Edison Setup'}",
             )
 
-            oauth = OAuth(
+            oauth = OpenEdisonOAuth(
                 mcp_url=remote_url,
                 scopes=server.oauth_scopes,
                 client_name=server.oauth_client_name or "Open Edison Setup",

src/oauth_manager.py

@@ -19,6 +19,8 @@
 )
 from loguru import logger as log
 
+from src.oauth_override import OpenEdisonOAuth
+
 
 class OAuthStatus(Enum):
     """OAuth authentication status for MCP servers."""
@@ -209,7 +211,7 @@ def get_oauth_auth(
             return None
 
         try:
-            oauth = OAuth(
+            oauth = OpenEdisonOAuth(
                 mcp_url=mcp_url,
                 scopes=scopes or info.scopes,
                 client_name=client_name or info.client_name,

src/oauth_override.py

@@ -0,0 +1,10 @@
+import webbrowser
+
+from fastmcp.client.auth.oauth import OAuth as _FastMCPOAuth
+
+
+class OpenEdisonOAuth(_FastMCPOAuth):
+    async def redirect_handler(self, authorization_url: str) -> None:  # noqa: ARG002
+        # Print a clean, single-line URL and still open the browser.
+        print(f"OAuth authorization URL: {authorization_url}", flush=True)
+        webbrowser.open(authorization_url)

src/server.py

@@ -38,6 +38,7 @@
     create_db_session,
 )
 from src.oauth_manager import OAuthStatus, get_oauth_manager
+from src.oauth_override import OpenEdisonOAuth
 from src.single_user_mcp import SingleUserMCP
 from src.telemetry import initialize_telemetry, set_servers_installed
 
@@ -955,7 +956,7 @@ async def oauth_test_connection(
             log.info(f"🔗 Testing connection to {server_name} at {remote_url}")
 
             # Create OAuth auth object
-            oauth = OAuth(
+            oauth = OpenEdisonOAuth(
                 mcp_url=remote_url,
                 scopes=scopes,
                 client_name=client_name or "OpenEdison MCP Gateway",

src/vulture_whitelist.py

@@ -0,0 +1,3 @@
+from src.oauth_override import OpenEdisonOAuth
+
+OpenEdisonOAuth.redirect_handler  # noqa: B018 unused method (src/oauth_override.py:7)