MikeFaith/authforge
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(gui): firstrun modal shows Skip button on daemon-unreachable

Browse Source
This commit is contained in:
michael
2026-04-27 11:27:31 -07:00
parent 9021ff0b3c
commit 611174859c
1 changed files with 21 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
gui/src/firstrun/mod.rs
View File

@@ -56,9 +56,7 @@ pub(crate) fn run(ctx: AppContext) {
let daemon = match Daemon::connect().await {
Ok(d) => d,
Err(e) => {
status_for_async.set_description(Some(&user_message(&e)));
// Stay open so the user sees the error; watchdog will
// logout in 60s if they don't take action.
render_unavailable(&win_for_async, &status_for_async, &user_message(&e));
return;
}
};
@@ -66,7 +64,7 @@ pub(crate) fn run(ctx: AppContext) {
let s = match daemon.get_pending_status(&user).await {
Ok(s) => s,
Err(e) => {
status_for_async.set_description(Some(&user_message(&e)));
render_unavailable(&win_for_async, &status_for_async, &user_message(&e));
return;
}
};
@@ -130,6 +128,25 @@ fn render_get_started(
status.set_child(Some(&go));
}
fn render_unavailable(win: &adw::ApplicationWindow, status: &adw::StatusPage, message: &str) {
// Daemon-connect or GetPendingStatus failure: surface the error and give
// the user a Skip button so they aren't stuck waiting 60s for the
// watchdog to log them out.
status.set_title("Setup unavailable");
status.set_description(Some(message));
let skip = gtk::Button::builder()
.label("Skip")
.css_classes(["pill"])
.halign(gtk::Align::Center)
.build();
let win_skip = win.clone();
skip.connect_clicked(move |_| {
win_skip.close();
std::process::exit(0);
});
status.set_child(Some(&skip));
}
fn install_activity_pokes(win: &adw::ApplicationWindow, watchdog: Rc<RefCell<WatchdogState>>) {
// Any keypress or click counts as activity.
let key = gtk::EventControllerKey::new();