From 5f35e0dde62c3578167ef676a53b61eb854c3f78 Mon Sep 17 00:00:00 2001
From: jakub-tldr <78603704+jakub-tldr@users.noreply.github.com>
Date: Fri, 21 Nov 2025 10:52:31 +0100
Subject: [PATCH 1/4] Cleaner error message

---
 src-tauri/cli/src/bin/dg.rs | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src-tauri/cli/src/bin/dg.rs b/src-tauri/cli/src/bin/dg.rs
index 6e026c94..d3223fe7 100644
--- a/src-tauri/cli/src/bin/dg.rs
+++ b/src-tauri/cli/src/bin/dg.rs
@@ -621,9 +621,13 @@ async fn main() {
             .get_one::<Url>("url")
             .expect("No enrollment URL was provided or it's invalid");
         debug!("Successfully parsed enrollment token and URL");
-        let config = enroll(url, token)
-            .await
-            .expect("The enrollment process has failed");
+        let config = match enroll(url, token).await {
+            Ok(cfg) => cfg,
+            Err(err) => {
+                error!("{}",err);
+                return;
+            }
+        };
         debug!("Successfully enrolled the device, saving the configuration.");
         if let Err(err) = config.save(&config_path) {
             error!("{err}");

From debfaff2516e17ca4da27eb5355718c5e7ebc71e Mon Sep 17 00:00:00 2001
From: jakub-tldr <78603704+jakub-tldr@users.noreply.github.com>
Date: Fri, 21 Nov 2025 10:59:29 +0100
Subject: [PATCH 2/4] cargo fmt

---
 src-tauri/cli/src/bin/dg.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-tauri/cli/src/bin/dg.rs b/src-tauri/cli/src/bin/dg.rs
index d3223fe7..f3c4e3ae 100644
--- a/src-tauri/cli/src/bin/dg.rs
+++ b/src-tauri/cli/src/bin/dg.rs
@@ -624,7 +624,7 @@ async fn main() {
         let config = match enroll(url, token).await {
             Ok(cfg) => cfg,
             Err(err) => {
-                error!("{}",err);
+                error!("{}", err);
                 return;
             }
         };

From fca2feddd122a3f7cb315fa268c1ea04e9cf1b2d Mon Sep 17 00:00:00 2001
From: jakub-tldr <78603704+jakub-tldr@users.noreply.github.com>
Date: Fri, 21 Nov 2025 11:08:00 +0100
Subject: [PATCH 3/4] Update src-tauri/cli/src/bin/dg.rs

Co-authored-by: Adam <adam@defguard.net>
---
 src-tauri/cli/src/bin/dg.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-tauri/cli/src/bin/dg.rs b/src-tauri/cli/src/bin/dg.rs
index f3c4e3ae..b0ed513a 100644
--- a/src-tauri/cli/src/bin/dg.rs
+++ b/src-tauri/cli/src/bin/dg.rs
@@ -624,7 +624,7 @@ async fn main() {
         let config = match enroll(url, token).await {
             Ok(cfg) => cfg,
             Err(err) => {
-                error!("{}", err);
+                error!("{err}");
                 return;
             }
         };

From b031813df7fdbb878f0a95882468760934c3494e Mon Sep 17 00:00:00 2001
From: jakub-tldr <78603704+jakub-tldr@users.noreply.github.com>
Date: Fri, 21 Nov 2025 11:11:41 +0100
Subject: [PATCH 4/4] Error message

---
 src-tauri/cli/src/bin/dg.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src-tauri/cli/src/bin/dg.rs b/src-tauri/cli/src/bin/dg.rs
index b0ed513a..d1ea1d80 100644
--- a/src-tauri/cli/src/bin/dg.rs
+++ b/src-tauri/cli/src/bin/dg.rs
@@ -624,7 +624,7 @@ async fn main() {
         let config = match enroll(url, token).await {
             Ok(cfg) => cfg,
             Err(err) => {
-                error!("{err}");
+                error!("Enrollment process failed with error: {err}");
                 return;
             }
         };