dearwolf/aider
1
0
Fork 0
mirror of https://github.com/Aider-AI/aider.git synced 2025-06-01 10:14:59 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

feat: Handle user interruption during OpenRouter OAuth flow

Browse source
This commit is contained in:
Paul Gauthier (aider) 2025-03-28 17:27:54 -10:00
parent e98ffb5ae0
commit 47d3802ffe
1 changed files with 15 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

17
aider/onboarding.py
View file

@ -273,20 +273,33 @@ def start_openrouter_oauth_flow(io, analytics):
io.tool_output("Please manually open the URL above.") io.tool_output("Please manually open the URL above.")
# Wait for the callback to set the auth_code or for timeout/error # Wait for the callback to set the auth_code or for timeout/error
shutdown_server.wait(timeout=120) # 2 minute timeout interrupted = False
try:
shutdown_server.wait(timeout=120) # 2 minute timeout
except KeyboardInterrupt:
io.tool_warning("\nOAuth flow interrupted by user.")
analytics.event("oauth_flow_failed", provider="openrouter", reason="user_interrupt")
interrupted = True
# Ensure the server thread is signaled to shut down
shutdown_server.set()
# Join the server thread to ensure it's cleaned up # Join the server thread to ensure it's cleaned up
server_thread.join(timeout=1) server_thread.join(timeout=1)
if interrupted:
return None # Return None if interrupted by user
if server_error: if server_error:
io.tool_error(f"Authentication failed: {server_error}") io.tool_error(f"Authentication failed: {server_error}")
analytics.event("oauth_flow_failed", provider="openrouter", reason=server_error) analytics.event("oauth_flow_failed", provider="openrouter", reason=server_error)
return None return None
if not auth_code: if not auth_code and not interrupted: # Only show timeout if not interrupted
io.tool_error("Authentication timed out. No code received from OpenRouter.") io.tool_error("Authentication timed out. No code received from OpenRouter.")
analytics.event("oauth_flow_failed", provider="openrouter", reason="timeout") analytics.event("oauth_flow_failed", provider="openrouter", reason="timeout")
return None return None
elif not auth_code: # If interrupted, we already printed a message and returned
return None
io.tool_output("Authentication code received. Exchanging for API key...") io.tool_output("Authentication code received. Exchanging for API key...")
analytics.event("oauth_flow_code_received", provider="openrouter") analytics.event("oauth_flow_code_received", provider="openrouter")