Skip to content

YC (S26) | Open Computer History | Continuously record your company computer work, map your workflows, help you find work worth automating, and power your agents' context

fix(windows): reset reused login webview (#5696)

Ezra Ellette4c5e489eb864
diff --git a/TESTING.md b/TESTING.md
index 3e157d523..b6b41b7fe 100644
--- a/TESTING.md
+++ b/TESTING.md
@@ -491,6 +491,7 @@ commits: `eea0c865`, `fe9060db`, `c99c3967`, `aeaa446b`, `5a219688`, `caae1ebc`,
- [ ] **Windows Defender** — app not blocked by default security.
- [ ] **Windows default mode** — On Windows, the app should default to window mode on first launch.
- [ ] **Windows taskbar icon** — The app should display a taskbar icon on Windows.
+- [ ] **Windows login window resets stale OAuth navigation** — Click login, choose GitHub or Google, leave the provider flow open, then click login in Screenpipe again. The existing "sign in to screenpipe" window must return to the Screenpipe login page instead of showing the stale provider page or a blank document.
- [ ] **Windows audio transcription accuracy** — On Windows, verify improved audio transcription accuracy due to native Silero VAD frame size and lower speech threshold.
- [ ] **Windows multi-line pipe prompts** — Multi-line pipe prompts should be preserved on Windows.
- [ ] **Windows ARM64 support** — On a Windows ARM64 device, verify the app installs and runs correctly. (`d62360bc4`)
diff --git a/apps/screenpipe-app-tauri/src-tauri/src/commands.rs b/apps/screenpipe-app-tauri/src-tauri/src/commands.rs
index 98f0c8580..16f223394 100644
--- a/apps/screenpipe-app-tauri/src-tauri/src/commands.rs
+++ b/apps/screenpipe-app-tauri/src-tauri/src/commands.rs
@@ -1853,6 +1853,22 @@ fn is_login_callback_scheme(scheme: &str) -> bool {
scheme == deep_link_scheme() || scheme == "screenpipe"
}
+#[cfg(not(target_os = "macos"))]
+fn reset_existing_login_window<R: tauri::Runtime>(
+ window: &tauri::WebviewWindow<R>,
+ login_url: tauri::Url,
+) -> Result<(), String> {
+ // A provider flow can leave this reusable webview on GitHub, Google, or
+ // even a failed/blank document. A later login click means "start over",
+ // so never surface whatever navigation state the previous attempt left.
+ window
+ .navigate(login_url)
+ .map_err(|e| format!("failed to reset login window: {e}"))?;
+ let _ = window.show();
+ let _ = window.set_focus();
+ Ok(())
+}
+
/// Open the screenpipe.com login page.
/// macOS: ASWebAuthenticationSession (system-managed sheet, forwards callback).
/// Windows/Linux: in-app WebView that intercepts the screenpipe:// redirect.
@@ -1910,24 +1926,28 @@ pub async fn open_login_window(
"login-browser".to_string()
};
+ let login_url = format!("{}?return_scheme={}", login_url(), deep_link_scheme());
+ let parsed_login_url = login_url
+ .parse()
+ .map_err(|e| format!("invalid login URL: {e}"))?;
+
if fresh_session {
if let Some(w) = app_handle.get_webview_window("login-browser") {
let _ = w.close();
}
} else if let Some(w) = app_handle.get_webview_window(&label) {
- let _ = w.show();
- let _ = w.set_focus();
+ info!("resetting existing login window");
+ reset_existing_login_window(&w, parsed_login_url)?;
return Ok(());
}
let app_for_nav = app_handle.clone();
let label_for_nav = label.clone();
- let login_url = format!("{}?return_scheme={}", login_url(), deep_link_scheme());
let mut builder = WebviewWindowBuilder::new(
&app_handle,
label.clone(),
- WebviewUrl::External(login_url.parse().unwrap()),
+ WebviewUrl::External(parsed_login_url),
)
.title("sign in to screenpipe")
.inner_size(460.0, 700.0)
@@ -1962,6 +1982,31 @@ pub async fn open_login_window(
}
}
+#[cfg(all(test, not(target_os = "macos")))]
+mod login_window_tests {
+ use super::reset_existing_login_window;
+ use tauri::{WebviewUrl, WebviewWindowBuilder};
+
+ #[test]
+ fn reused_login_window_returns_to_login_page() {
+ let app = tauri::test::mock_builder()
+ .build(tauri::test::mock_context(tauri::test::noop_assets()))
+ .expect("mock app");
+ let stale_url: tauri::Url = "https://github.com/settings/profile".parse().unwrap();
+ let login_url: tauri::Url = "https://screenpipe.com/login?return_scheme=screenpipe"
+ .parse()
+ .unwrap();
+ let window =
+ WebviewWindowBuilder::new(&app, "login-browser", WebviewUrl::External(stale_url))
+ .build()
+ .expect("login webview");
+
+ reset_existing_login_window(&window, login_url.clone()).unwrap();
+
+ assert_eq!(window.url().unwrap(), login_url);
+ }
+}
+
/// Open Google Calendar OAuth inside an in-app WebView.
/// Same pattern as `open_login_window` — intercepts the screenpipe:// deep-link
/// redirect so we don't rely on Safari custom-scheme support.