rust side

Author: filipslezaklab

src-tauri/src/bin/defguard-client.rs

@@ -25,6 +25,7 @@ use defguard_client::{
         DB_POOL,
     },
     enterprise::provisioning::handle_client_initialization,
+    events::handle_deep_link,
     periodic::run_periodic_tasks,
     service,
     tray::{configure_tray_icon, setup_tray, show_main_window},
@@ -34,6 +35,7 @@ use defguard_client::{
 };
 use log::{Level, LevelFilter};
 use tauri::{AppHandle, Builder, Manager, RunEvent, WindowEvent};
+use tauri_plugin_deep_link::DeepLinkExt;
 use tauri_plugin_log::{Target, TargetKind};
 
 #[macro_use]
@@ -272,6 +274,14 @@ fn main() {
 
             let app_handle = app.app_handle();
 
+            // Single Rust-side entry point for all deep link events (runtime).
+            {
+                let handle = app_handle.clone();
+                app.deep_link().on_open_url(move |event| {
+                    handle_deep_link(&handle, &event.urls());
+                });
+            }
+
             // Prepare `AppConfig`.
             let config = AppConfig::new(app_handle);
 
@@ -360,21 +370,34 @@ fn main() {
                 warn!("Failed to pre-build full window: {e}");
             }
 
+            // If the app was cold-launched by a deep link the full view must open, not the tray.
+            let launched_by_deep_link = app_handle
+                .deep_link()
+                .get_current()
+                .ok()
+                .flatten()
+                .is_some();
+
             // Decide which window to show based on platform and available locations.
             #[cfg(target_os = "linux")]
             {
                 let _ = WindowManager::open_full_view(app_handle);
             }
             #[cfg(not(target_os = "linux"))]
             {
-                let has_locations = tauri::async_runtime::block_on(
-                    defguard_client::window_manager::has_non_service_locations()
-                );
-                if has_locations {
-                    WindowManager::open_tray(app_handle)?;
-                } else {
-                    info!("No locations found, showing full view on startup.");
+                if launched_by_deep_link {
+                    info!("App launched via deep link, opening full view directly.");
                     let _ = WindowManager::open_full_view(app_handle);
+                } else {
+                    let has_locations = tauri::async_runtime::block_on(
+                        defguard_client::window_manager::has_non_service_locations()
+                    );
+                    if has_locations {
+                        WindowManager::open_tray(app_handle)?;
+                    } else {
+                        info!("No locations found, showing full view on startup.");
+                        let _ = WindowManager::open_full_view(app_handle);
+                    }
                 }
             }
 
@@ -417,6 +440,11 @@ fn main() {
             );
             tauri::async_runtime::block_on(startup(app_handle));
 
+            // Handle a deep link that launched the app (startup case).
+            if let Ok(Some(urls)) = app_handle.deep_link().get_current() {
+                handle_deep_link(app_handle, &urls);
+            }
+
             // Handle Ctrl-C.
             debug!("Setting up Ctrl-C handler.");
             let app_handle_clone = app_handle.clone();

src-tauri/src/events.rs

@@ -1,8 +1,11 @@
 use serde::Serialize;
-use tauri::{AppHandle, Emitter, Url};
+use tauri::{AppHandle, Emitter, Manager, Url};
 use tauri_plugin_notification::NotificationExt;
 
-use crate::{tray::show_main_window, ConnectionType};
+use crate::{
+    window_manager::{WindowManager, NEW_UI_WINDOW_ID},
+    ConnectionType,
+};
 
 // Match src/pages/client/types.ts.
 #[non_exhaustive]
@@ -115,7 +118,16 @@ pub fn handle_deep_link(app_handle: &AppHandle, urls: &[Url]) {
                 }
             }
             if let (Some(token), Some(url)) = (token, url) {
-                show_main_window(app_handle);
+                info!("Deep link received: token={token}, url={url}");
+                // If the compact tray window is visible, hide it before opening main view.
+                if let Some(tray_win) = app_handle.get_webview_window(NEW_UI_WINDOW_ID) {
+                    if tray_win.is_visible().unwrap_or(false) {
+                        let _ = tray_win.hide();
+                    }
+                }
+                if let Err(e) = WindowManager::open_full_view(app_handle) {
+                    warn!("Deep link: failed to open main window: {e}");
+                }
                 let _ = app_handle.emit(
                     EventKey::AddInstance.into(),
                     AddInstancePayload {