Open desktop app page (#254)

Author: moubctez

Cargo.lock

@@ -29,7 +29,7 @@ log = { version = "0.4", features = ["serde"] }
 # data de/serialization
 serde = { version = "1.0", features = ["derive"] }
 serde_json = { version = "1.0" }
-toml = { version = "0.9", default-features = false, features = [
+toml = { version = "1.0", default-features = false, features = [
     "parse",
     "serde",
 ] }
@@ -58,7 +58,7 @@ bytes = { version = "1.11" }
 
 [build-dependencies]
 tonic-prost-build = "0.14"
-vergen-git2 = { version = "1.0", features = ["build"] }
+vergen-git2 = { version = "9.1", features = ["build"] }
 
 [profile.release]
 lto = "thin"

Cargo.toml

@@ -250,21 +250,18 @@ impl proxy_server::Proxy for ProxyServer {
                             debug!("Received message from Defguard Core ID={}", response.id);
                             connected.store(true, Ordering::Relaxed);
                             if let Some(payload) = response.payload {
-                                match payload {
-                                    core_response::Payload::InitialInfo(payload) => {
-                                        info!("Received private cookies key");
-                                        let key = Key::from(&payload.private_cookies_key);
-                                        *cookie_key.write().unwrap() = Some(key);
-                                    },
-                                    _ => {
-                                        let maybe_rx = results.write().expect("Failed to acquire lock on results hashmap when processing response").remove(&response.id);
-                                        if let Some(rx) = maybe_rx {
-                                            if let Err(err) = rx.send(payload) {
-                                                error!("Failed to send message to rx {:?}", err.type_id());
-                                            }
-                                        } else {
-                                            error!("Missing receiver for response #{}", response.id);
+                                if let core_response::Payload::InitialInfo(payload) = payload {
+                                    info!("Received private cookies key");
+                                    let key = Key::from(&payload.private_cookies_key);
+                                    *cookie_key.write().unwrap() = Some(key);
+                                } else {
+                                    let maybe_rx = results.write().expect("Failed to acquire lock on results hashmap when processing response").remove(&response.id);
+                                    if let Some(rx) = maybe_rx {
+                                        if let Err(err) = rx.send(payload) {
+                                            error!("Failed to send message to rx {:?}", err.type_id());
                                         }
+                                    } else {
+                                        error!("Missing receiver for response #{}", response.id);
                                     }
                                 }
                             }
@@ -281,7 +278,8 @@ impl proxy_server::Proxy for ProxyServer {
                 }
                 info!("Defguard core client disconnected: {address}");
                 connected.store(false, Ordering::Relaxed);
-                clients.write().expect("Failed to acquire lock on clients hashmap when removing disconnected client").remove(&address);
+                clients.write().expect("Failed to acquire lock on clients hashmap when removing \
+                    disconnected client").remove(&address);
             }
             .instrument(tracing::Span::current()),
         );

src/grpc.rs

@@ -118,7 +118,7 @@ async fn handle_remote_auth_socket(
             Err(err) => {
                 error!("Failed to receive preshared key from receiver: {err:?}");
             }
-        };
+        }
 
         // Close the websocket once we're done.
         let _ = ws_tx.close().await;

src/handlers/desktop_client_mfa.rs

@@ -241,7 +241,7 @@ pub async fn run_server(
     debug!("Using config: {env_config:?}");
 
     let mut tasks = JoinSet::new();
-    let cookie_key = Default::default();
+    let cookie_key = Arc::default();
     let (reset_tx, mut reset_rx) = tokio::sync::broadcast::channel(1);
 
     // connect to upstream gRPC server

src/http.rs

@@ -105,5 +105,8 @@
   "openid_mfa_redirect_error_message": "No token provided in the URL. Please ensure you have a valid token to proceed with OpenID authentication.",
   "openid_mfa_redirect_error_missing_args": "Missing code or state in the callback's URL. The provider might not be configured correctly.",
   "openid_mfa_complete_title": "Authentication Completed",
-  "openid_mfa_complete_subtitle": "You have been successfully authenticated. Please close this window and get back to the Defguard VPN Client"
+  "openid_mfa_complete_subtitle": "You have been successfully authenticated. Please close this window and get back to the Defguard VPN Client",
+  "open_desktop_title": "Open the desktop app to continue",
+  "open_desktop_description": "We tried to open the desktop app automatically, but it didn't respond. This can happen if the browser blocks the request or the app didn't start in time.",
+  "open_desktop_button": "Open desktop app"
 }

web/messages/en.json

@@ -14,23 +14,23 @@
   },
   "dependencies": {
     "@axa-ch/react-polymorphic-types": "^1.4.1",
-    "@floating-ui/react": "^0.27.17",
-    "@inlang/paraglide-js": "^2.10.0",
-    "@tanstack/react-devtools": "^0.9.5",
-    "@tanstack/react-form": "^1.28.0",
-    "@tanstack/react-query": "^5.90.20",
+    "@floating-ui/react": "^0.27.18",
+    "@inlang/paraglide-js": "^2.12.0",
+    "@tanstack/react-devtools": "^0.9.6",
+    "@tanstack/react-form": "^1.28.3",
+    "@tanstack/react-query": "^5.90.21",
     "@tanstack/react-query-devtools": "^5.91.3",
-    "@tanstack/react-router": "^1.159.4",
-    "@tanstack/react-router-devtools": "^1.159.4",
+    "@tanstack/react-router": "^1.162.8",
+    "@tanstack/react-router-devtools": "^1.162.8",
     "@uidotdev/usehooks": "^2.4.1",
     "axios": "^1.13.5",
     "change-case": "^5.4.4",
     "clsx": "^2.1.1",
     "dayjs": "^1.11.19",
     "lodash-es": "^4.17.23",
-    "motion": "^12.33.0",
+    "motion": "^12.34.3",
     "qrcode.react": "^4.2.0",
-    "qs": "^6.14.1",
+    "qs": "^6.15.0",
     "react": "^19.2.4",
     "react-dom": "^19.2.4",
     "react-markdown": "^10.1.0",
@@ -42,22 +42,22 @@
     "@biomejs/biome": "2.3.14",
     "@inlang/paraglide-js": "2.10.0",
     "@tanstack/devtools-vite": "^0.5.1",
-    "@tanstack/router-plugin": "^1.159.4",
+    "@tanstack/router-plugin": "^1.162.8",
     "@types/lodash-es": "^4.17.12",
-    "@types/node": "^25.2.2",
+    "@types/node": "^25.3.0",
     "@types/qs": "^6.14.0",
-    "@types/react": "^19.2.13",
+    "@types/react": "^19.2.14",
     "@types/react-dom": "^19.2.3",
     "@vitejs/plugin-react-swc": "^4.2.3",
     "globals": "^17.3.0",
     "prettier": "^3.8.1",
     "sass": "^1.97.3",
     "sharp": "^0.34.5",
-    "stylelint": "^17.1.1",
+    "stylelint": "^17.3.0",
     "stylelint-config-standard-scss": "^17.0.0",
     "stylelint-scss": "^7.0.0",
     "typescript": "~5.9.3",
-    "typescript-eslint": "^8.54.0",
+    "typescript-eslint": "^8.56.1",
     "vite": "^7.3.1",
     "vite-plugin-image-optimizer": "^2.0.3"
   },