Lightweight coding agent that runs in your terminal
Rust
Fix ChatGPT browser sign-in for local app servers (#48502)
Eric Traut0fbf0bedc25d
diff --git a/codex-rs/tui/src/lib.rs b/codex-rs/tui/src/lib.rsindex 7b6a6bfa75..a6a91b0b9f 100644--- a/codex-rs/tui/src/lib.rs+++ b/codex-rs/tui/src/lib.rs@@ -1313,6 +1313,7 @@ async fn run_ratatui_app(show_trust_screen: should_show_trust_screen_flag,remote_project_trust: None,login_status,+ app_server_target: app_server_target.clone(),app_server_request_handle: app_server.as_ref().map(AppServerSession::request_handle),diff --git a/codex-rs/tui/src/onboarding/auth.rs b/codex-rs/tui/src/onboarding/auth.rsindex 9ad829140a..7905f48451 100644--- a/codex-rs/tui/src/onboarding/auth.rs+++ b/codex-rs/tui/src/onboarding/auth.rs@@ -256,6 +256,7 @@ pub(crate) struct AuthModeWidget {pub error: Arc<RwLock<Option<String>>>,pub sign_in_state: Arc<RwLock<SignInState>>,pub login_status: LoginStatus,+ pub app_server_target: crate::AppServerTarget,pub app_server_request_handle: AppServerRequestHandle,pub auth_config: AuthConfig,pub bedrock_setup_enabled: bool,@@ -933,6 +934,7 @@ impl AuthModeWidget {}self.set_error(/*message*/ None);+ let app_server_target = self.app_server_target.clone();let request_handle = self.app_server_request_handle.clone();let sign_in_state = self.sign_in_state.clone();let error = self.error.clone();@@ -950,13 +952,14 @@ impl AuthModeWidget {.await{Ok(LoginAccountResponse::Chatgpt { login_id, auth_url }) => {- maybe_open_auth_url_in_browser(&request_handle, &auth_url);*error.write().unwrap() = None;- *sign_in_state.write().unwrap() =- SignInState::ChatGptContinueInBrowser(ContinueInBrowserState {- login_id,- auth_url,- });+ show_chatgpt_login_in_browser(+ &app_server_target,+ &sign_in_state,+ &request_frame,+ ContinueInBrowserState { login_id, auth_url },+ webbrowser::open,+ );}Ok(other) => {*sign_in_state.write().unwrap() = SignInState::PickMode;@@ -1085,12 +1088,23 @@ impl WidgetRef for AuthModeWidget {}}-pub(super) fn maybe_open_auth_url_in_browser(request_handle: &AppServerRequestHandle, url: &str) {- if !matches!(request_handle, AppServerRequestHandle::InProcess(_)) {+fn show_chatgpt_login_in_browser(+ target: &crate::AppServerTarget,+ sign_in_state: &RwLock<SignInState>,+ request_frame: &FrameRequester,+ login: ContinueInBrowserState,+ open: impl FnOnce(&str) -> std::io::Result<()>,+) {+ let url = login.auth_url.clone();+ *sign_in_state.write().unwrap() = SignInState::ChatGptContinueInBrowser(login);+ request_frame.schedule_frame();++ // Local daemons use a remote request handle, but their callback is local.+ if target.uses_remote_workspace() {return;}- if let Err(err) = webbrowser::open(url) {+ if let Err(err) = open(&url) {tracing::warn!("failed to open browser for login URL: {err}");}}@@ -1103,8 +1117,10 @@ mod tests {use codex_app_server_client::DEFAULT_IN_PROCESS_CHANNEL_CAPACITY;use codex_app_server_client::InProcessAppServerClient;use codex_app_server_client::InProcessClientStartArgs;+ use codex_app_server_client::RemoteAppServerEndpoint;use codex_arg0::Arg0DispatchPaths;use codex_cloud_config::cloud_config_bundle_loader_for_storage;+ use codex_utils_absolute_path::AbsolutePathBuf;use pretty_assertions::assert_eq;use std::sync::Arc;use tempfile::TempDir;@@ -1124,6 +1140,78 @@ mod tests {"originator=codex_cli_rs");+ #[test]+ fn opens_login_browser_for_local_app_servers() -> color_eyre::Result<()> {+ let endpoint = RemoteAppServerEndpoint::UnixSocket {+ socket_path: AbsolutePathBuf::relative_to_current_dir("codex.sock")?,+ };+ let url = "https://example.test/authorize";+ for (target, expected) in [+ (crate::AppServerTarget::Embedded, true),+ (+ crate::AppServerTarget::LocalDaemon {+ endpoint: endpoint.clone(),+ allow_embedded_fallback: true,+ },+ true,+ ),+ (+ crate::AppServerTarget::LocalDaemon {+ endpoint: endpoint.clone(),+ allow_embedded_fallback: false,+ },+ true,+ ),+ (crate::AppServerTarget::Remote { endpoint }, false),+ ] {+ let mut opened_url = None;+ show_chatgpt_login_in_browser(+ &target,+ &RwLock::new(SignInState::PickMode),+ &FrameRequester::test_dummy(),+ ContinueInBrowserState {+ login_id: "login-1".to_string(),+ auth_url: url.to_string(),+ },+ |url| {+ opened_url = Some(url.to_owned());+ Ok(())+ },+ );+ assert_eq!(opened_url.as_deref(), expected.then_some(url));+ }+ Ok(())+ }++ #[tokio::test]+ async fn login_can_complete_while_browser_is_opening() {+ let (mut widget, _tmp) = widget_forced_chatgpt().await;+ let sign_in_state = widget.sign_in_state.clone();+ let request_frame = widget.request_frame.clone();+ show_chatgpt_login_in_browser(+ &crate::AppServerTarget::Embedded,+ &sign_in_state,+ &request_frame,+ ContinueInBrowserState {+ login_id: "login-1".to_string(),+ auth_url: "https://example.test/authorize".to_string(),+ },+ |_| {+ widget.on_account_login_completed(AccountLoginCompletedNotification {+ login_id: Some("login-1".to_string()),+ success: true,+ error: None,+ onboarding_entrypoint: None,+ });+ Ok(())+ },+ );+ assert!(matches!(+ &*sign_in_state.read().unwrap(),+ SignInState::ChatGptSuccessMessage+ ));+ }+async fn widget_forced_chatgpt() -> (AuthModeWidget, TempDir) {let codex_home = TempDir::new().unwrap();let codex_home_path = codex_home.path().to_path_buf();@@ -1172,6 +1260,7 @@ mod tests {error: Arc::new(RwLock::new(None)),sign_in_state: Arc::new(RwLock::new(SignInState::PickMode)),login_status: LoginStatus::NotAuthenticated,+ app_server_target: crate::AppServerTarget::Embedded,app_server_request_handle: AppServerRequestHandle::InProcess(client.request_handle()),auth_config,bedrock_setup_enabled: false,diff --git a/codex-rs/tui/src/onboarding/onboarding_screen.rs b/codex-rs/tui/src/onboarding/onboarding_screen.rsindex 7db5443681..6ebdc8f07e 100644--- a/codex-rs/tui/src/onboarding/onboarding_screen.rs+++ b/codex-rs/tui/src/onboarding/onboarding_screen.rs@@ -97,6 +97,7 @@ pub(crate) struct OnboardingScreenArgs {pub show_login_screen: bool,pub bedrock_setup_enabled: bool,pub login_status: LoginStatus,+ pub app_server_target: crate::AppServerTarget,pub app_server_request_handle: Option<AppServerRequestHandle>,pub config: Config,}@@ -123,6 +124,7 @@ impl OnboardingScreen {show_login_screen,bedrock_setup_enabled,login_status,+ app_server_target,app_server_request_handle,config,} = args;@@ -168,6 +170,7 @@ impl OnboardingScreen {error: Arc::new(RwLock::new(None)),sign_in_state: Arc::new(RwLock::new(SignInState::PickMode)),login_status,+ app_server_target,app_server_request_handle,auth_config,bedrock_setup_enabled,