From dd93a89cd22f312a2910b6664cc6f4205e3f9ec4 Mon Sep 17 00:00:00 2001 From: Michael Fan Date: Wed, 25 Mar 2026 15:16:19 -0400 Subject: [PATCH] codex: clean up callback server on auth URL errors Co-authored-by: Codex --- codex-rs/login/src/oauth_callback_server.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/codex-rs/login/src/oauth_callback_server.rs b/codex-rs/login/src/oauth_callback_server.rs index 637ca82946..559330086a 100644 --- a/codex-rs/login/src/oauth_callback_server.rs +++ b/codex-rs/login/src/oauth_callback_server.rs @@ -97,7 +97,13 @@ where let (server, actual_port, rx) = bind_server_with_request_channel(port)?; let redirect_uri = format!("http://localhost:{actual_port}{callback_path}"); - let auth_url = auth_url_builder(&redirect_uri, &pkce, &state)?; + let auth_url = match auth_url_builder(&redirect_uri, &pkce, &state) { + Ok(auth_url) => auth_url, + Err(err) => { + server.unblock(); + return Err(err); + } + }; let (server_handle, shutdown_handle) = spawn_callback_server_loop( server, rx,