jfmonty2/creddy
2
1
Fork 0
Code Issues Pull Requests Packages Projects Releases 12 Wiki Activity

improve display of GetSessionError

Browse Source
This commit is contained in:
Joseph Montanaro 2023-07-11 14:34:54 -07:00
parent 52c949e396
commit 486001b584
3 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src-tauri/src/errors.rs
View File

@ -57,8 +57,12 @@ where
E: Error, E: Error,
M: serde::ser::SerializeMap, M: serde::ser::SerializeMap,
{ {
let src = err.source().map(|s| format!("{s}")); let msg = err.source().map(|s| format!("{s}"));
map.serialize_entry("source", &src) map.serialize_entry("msg", &msg)?;
map.serialize_entry("code", &None::<&str>)?;
map.serialize_entry("source", &None::<&str>)?;
Ok(())
} }

6
src/views/EnterCredentials.svelte
View File

@ -39,14 +39,16 @@
} }
} }
catch (e) { catch (e) {
if (e.code === "GetSession") { window.error = e;
let root = getRootCause(e); const root = getRootCause(e);
if (e.code === 'GetSession' && root.code) {
errorMsg = `Error response from AWS (${root.code}): ${root.msg}`; errorMsg = `Error response from AWS (${root.code}): ${root.msg}`;
} }
else { else {
errorMsg = e.msg; errorMsg = e.msg;
} }
// if the alert already existed, shake it
if (alert) { if (alert) {
alert.shake(); alert.shake();
} }

4
src/views/Unlock.svelte
View File

@ -34,8 +34,8 @@
} }
} }
catch (e) { catch (e) {
if (e.code === 'GetSession') { const root = getRootCause(e);
let root = getRootCause(e); if (e.code === 'GetSession' && root.code) {
errorMsg = `Error response from AWS (${root.code}): ${root.msg}`; errorMsg = `Error response from AWS (${root.code}): ${root.msg}`;
} }
else { else {