Skip to content

fix stray login url characters persisting in login #3639

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
easong-openai merged 3 commits into from
Sep 15, 2025
Merged

fix stray login url characters persisting in login #3639

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
2260ac7
fix stray login url characters persisting in login
easong-openai Sep 15, 2025
08a3595
Merge branch 'main' into easong/fix-onboarding-characters
easong-openai Sep 15, 2025
45c1751
asked Codex to fix the clippy issue
bolinfest Sep 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
31 changes: 31 additions & 0 deletions codex-rs/tui/src/onboarding/onboarding_screen.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,8 @@ pub(crate) async fn run_onboarding_app(
use tokio_stream::StreamExt;

let mut onboarding_screen = OnboardingScreen::new(tui, args);
// One-time guard to fully clear the screen after ChatGPT login success message is shown
let mut did_full_clear_after_success = false;

tui.draw(u16::MAX, |frame| {
frame.render_widget_ref(&onboarding_screen, frame.area());
Expand All @@ -337,6 +339,35 @@ pub(crate) async fn run_onboarding_app(
onboarding_screen.handle_paste(text);
}
TuiEvent::Draw => {
if !did_full_clear_after_success
&& onboarding_screen.steps.iter().any(|step| {
if let Step::Auth(w) = step {
let g = w.sign_in_state.read().unwrap();
Copy link
Collaborator

@bolinfest bolinfest Sep 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This use of unwrap() is the source of the clippy failure?

Though strangely it seems like other uses of unwrap() in this file are accepted?

matches!(&*g, super::auth::SignInState::ChatGptSuccessMessage)
} else {
false
}
})
{
// Reset any lingering SGR (underline/color) before clearing
let _ = ratatui::crossterm::execute!(
std::io::stdout(),
ratatui::crossterm::style::SetAttribute(
ratatui::crossterm::style::Attribute::Reset
),
ratatui::crossterm::style::SetAttribute(
ratatui::crossterm::style::Attribute::NoUnderline
),
ratatui::crossterm::style::SetForegroundColor(
ratatui::crossterm::style::Color::Reset
),
ratatui::crossterm::style::SetBackgroundColor(
ratatui::crossterm::style::Color::Reset
)
);
let _ = tui.terminal.clear();
did_full_clear_after_success = true;
}
let _ = tui.draw(u16::MAX, |frame| {
frame.render_widget_ref(&onboarding_screen, frame.area());
});
Expand Down
Loading