fix: improve error handling and display in desktop client enrollment flow
Add formatInvokeError helper function to handle various error types from Tauri invoke calls with fallback messages. Update enroll_device to include response body in error message when enrollment fails with non-success status. Add windows_subsystem attribute to main.rs to suppress console window in release builds on Windows.
This commit is contained in:
@@ -153,7 +153,12 @@ async fn enroll_device(
|
|||||||
.map_err(|err| format!("Enrollment failed: {}", err))?;
|
.map_err(|err| format!("Enrollment failed: {}", err))?;
|
||||||
|
|
||||||
if !enroll_response.status().is_success() {
|
if !enroll_response.status().is_success() {
|
||||||
return Err(format!("Enrollment failed with status {}", enroll_response.status()));
|
let status = enroll_response.status();
|
||||||
|
let body = enroll_response
|
||||||
|
.text()
|
||||||
|
.await
|
||||||
|
.unwrap_or_else(|_| "<unable to read response body>".into());
|
||||||
|
return Err(format!("Enrollment failed with status {}: {}", status, body));
|
||||||
}
|
}
|
||||||
|
|
||||||
let enroll = enroll_response
|
let enroll = enroll_response
|
||||||
|
|||||||
@@ -1,3 +1,5 @@
|
|||||||
|
#![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
|
||||||
|
|
||||||
fn main() {
|
fn main() {
|
||||||
nexavpn_desktop::run();
|
nexavpn_desktop::run();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -11,6 +11,18 @@ type EnrollmentState = {
|
|||||||
tunnelStrategy: string;
|
tunnelStrategy: string;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
function formatInvokeError(err: unknown, fallback: string) {
|
||||||
|
if (typeof err === "string" && err.trim().length > 0) {
|
||||||
|
return err;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (err instanceof Error && err.message.trim().length > 0) {
|
||||||
|
return err.message;
|
||||||
|
}
|
||||||
|
|
||||||
|
return fallback;
|
||||||
|
}
|
||||||
|
|
||||||
export function App() {
|
export function App() {
|
||||||
const [serverUrl, setServerUrl] = useState("http://localhost");
|
const [serverUrl, setServerUrl] = useState("http://localhost");
|
||||||
const [username, setUsername] = useState("");
|
const [username, setUsername] = useState("");
|
||||||
@@ -41,7 +53,7 @@ export function App() {
|
|||||||
});
|
});
|
||||||
setState(result);
|
setState(result);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
setError(err instanceof Error ? err.message : "Enrollment failed");
|
setError(formatInvokeError(err, "Enrollment failed"));
|
||||||
} finally {
|
} finally {
|
||||||
setLoading(false);
|
setLoading(false);
|
||||||
}
|
}
|
||||||
@@ -54,7 +66,7 @@ export function App() {
|
|||||||
setConnected((value) => !value);
|
setConnected((value) => !value);
|
||||||
setError(null);
|
setError(null);
|
||||||
} catch (err) {
|
} catch (err) {
|
||||||
setError(err instanceof Error ? err.message : "Tunnel action failed");
|
setError(formatInvokeError(err, "Tunnel action failed"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user