From 70e23c7e20b5c99e63d36a518079401cb1e800aa Mon Sep 17 00:00:00 2001
From: Joseph Montanaro <jfmonty2@gmail.com>
Date: Tue, 23 Jan 2024 10:58:39 -0800
Subject: [PATCH] add version to BaseCredentials

---
 doc/todo.md                  |  1 +
 package.json                 |  2 +-
 src-tauri/Cargo.lock         |  2 +-
 src-tauri/Cargo.toml         |  2 +-
 src-tauri/src/credentials.rs | 11 ++++++++---
 src-tauri/tauri.conf.json    |  2 +-
 src/views/Settings.svelte    |  2 +-
 7 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/doc/todo.md b/doc/todo.md
index bae1f99..7bd06b0 100644
--- a/doc/todo.md
+++ b/doc/todo.md
@@ -9,6 +9,7 @@
 * Icon
 * Auto-updates
 * SSH key handling
+* Encrypted sync server
 
 ## Maybe
 
diff --git a/package.json b/package.json
index 423d3af..641a204 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "creddy",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "scripts": {
     "dev": "vite",
     "build": "vite build",
diff --git a/src-tauri/Cargo.lock b/src-tauri/Cargo.lock
index 9f66c7b..a7dbf6d 100644
--- a/src-tauri/Cargo.lock
+++ b/src-tauri/Cargo.lock
@@ -1035,7 +1035,7 @@ dependencies = [
 
 [[package]]
 name = "creddy"
-version = "0.4.4"
+version = "0.4.5"
 dependencies = [
  "argon2",
  "auto-launch",
diff --git a/src-tauri/Cargo.toml b/src-tauri/Cargo.toml
index 27bf7c7..a56b2a9 100644
--- a/src-tauri/Cargo.toml
+++ b/src-tauri/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "creddy"
-version = "0.4.4"
+version = "0.4.5"
 description = "A friendly AWS credentials manager"
 authors = ["Joseph Montanaro"]
 license = ""
diff --git a/src-tauri/src/credentials.rs b/src-tauri/src/credentials.rs
index c54c516..bb34596 100644
--- a/src-tauri/src/credentials.rs
+++ b/src-tauri/src/credentials.rs
@@ -126,10 +126,10 @@ impl LockedCredentials {
         let secret_access_key = String::from_utf8(decrypted)
             .map_err(|_| UnlockError::InvalidUtf8)?;
 
-        let creds = BaseCredentials {
-            access_key_id: self.access_key_id.clone(),
+        let creds = BaseCredentials::new(
+            self.access_key_id.clone(),
             secret_access_key,
-        };
+        );
         Ok(creds)
     }
 }
@@ -138,11 +138,16 @@ impl LockedCredentials {
 #[derive(Clone, Debug, Serialize, Deserialize)]
 #[serde(rename_all = "PascalCase")]
 pub struct BaseCredentials {
+    pub version: usize,
     pub access_key_id: String,
     pub secret_access_key: String,
 }
 
 impl BaseCredentials {
+    pub fn new(access_key_id: String, secret_access_key: String) -> Self {
+        Self {version: 1, access_key_id, secret_access_key}
+    }
+
     pub fn encrypt(&self, passphrase: &str) -> Result<LockedCredentials, CryptoError> {
         let salt = Crypto::salt();
         let crypto = Crypto::new(passphrase, &salt)?;
diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json
index 0de6641..3b080db 100644
--- a/src-tauri/tauri.conf.json
+++ b/src-tauri/tauri.conf.json
@@ -8,7 +8,7 @@
   },
   "package": {
     "productName": "creddy",
-    "version": "0.4.4"
+    "version": "0.4.5"
   },
   "tauri": {
     "allowlist": {
diff --git a/src/views/Settings.svelte b/src/views/Settings.svelte
index b12f243..56ad94a 100644
--- a/src/views/Settings.svelte
+++ b/src/views/Settings.svelte
@@ -112,7 +112,7 @@
 
             <div>
                 <!-- <button class="btn btn-sm btn-ghost">Cancel</button> -->
-                <buton class="btn btn-sm btn-primary" on:click={save}>Save</buton>
+                <button class="btn btn-sm btn-primary" on:click={save}>Save</button>
             </div>
         </div>
     </div>