return to Approve screen after cancelling unlock during request approval

doc/todo.md

@@ -21,3 +21,4 @@
 * Make hotkey configuration a little more tolerant of slight mistiming
 * Distinguish between request that was denied and request that was canceled (e.g. due to error)
 * Use atomic types for primitive state values instead of RwLock'd types
+* Rework approval flow to be a fullscreen overlay instead of mixing with normal navigation (as more views are added the pain of the current situation will only increase)

package.json

@@ -1,6 +1,6 @@
 {
   "name": "creddy",
-  "version": "0.4.6",
+  "version": "0.4.7",
   "scripts": {
     "dev": "vite",
     "build": "vite build",

src-tauri/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "creddy"
-version = "0.4.6"
+version = "0.4.7"
 description = "A friendly AWS credentials manager"
 authors = ["Joseph Montanaro"]
 license = ""

src-tauri/src/errors.rs

@@ -223,7 +223,7 @@ pub enum GetSessionError {
     EmptyResponse, // SDK returned successfully but credentials are None
     #[error("Error response from AWS SDK: {0}")]
     SdkError(#[from] AwsSdkError<GetSessionTokenError>),
-    #[error("Could not construt session: credentials are locked")]
+    #[error("Could not construct session: credentials are locked")]
     CredentialsLocked,
     #[error("Could not construct session: no credentials are known")]
     CredentialsEmpty,

src-tauri/tauri.conf.json

@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "creddy",
-    "version": "0.4.6"
+    "version": "0.4.7"
   },
   "tauri": {
     "allowlist": {

src/App.svelte

@@ -22,7 +22,7 @@ listen('credentials-request', (tauriEvent) => {
 listen('request-cancelled', (tauriEvent) => {
     const id = tauriEvent.payload;
     if (id === $appState.currentRequest?.id) {
-        cleanupRequest()
+        cleanupRequest();
     }
     else {
         const found = $appState.pendingRequests.find_remove(r => r.id === id);

src/views/Approve.svelte

@@ -43,13 +43,6 @@
         }
     }
 
-    function approve_base() {
-        approve(true);
-    }
-    function approve_session() {
-        approve(false);
-    }
-
     // Denial has only one
     async function deny() {
         $appState.currentRequest.response = {approval: 'Denied', base: false};

src/views/Unlock.svelte

@@ -55,8 +55,15 @@
 
     function cancel() {
         emit('credentials-event', 'unlock-canceled');
+        if ($appState.currentRequest !== null) {
+            // dirty hack to prevent spurious error when returning to approve screen
+            delete $appState.currentRequest.response;
+            navigate('Approve');
+        }
+        else {
             navigate('Home');
         }
+    }
 
     onMount(() => {
         loadTime = Date.now();