starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-18 06:49:50 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Adjust keychain config for dev

Browse Source
This commit is contained in:
Gregory Schier
2025-04-15 07:28:01 -07:00
parent 2e55a1bd6d
commit 6566857d54
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src-tauri/yaak-crypto/src/manager.rs
View File

@@ -12,7 +12,7 @@ use yaak_models::models::{EncryptedKey, Workspace, WorkspaceMeta};
use yaak_models::query_manager::{QueryManager, QueryManagerExt};
use yaak_models::util::{generate_id_of_length, UpdateSource};
const KEY_USER: &str = "yaak-encryption-key";
const KEY_USER: &str = "encryption-key";
pub trait EncryptionManagerExt<'a, R> {
fn crypto(&'a self) -> State<'a, EncryptionManager>;
@@ -29,6 +29,7 @@ pub struct EncryptionManager {
cached_master_key: Arc<Mutex<Option<MasterKey>>>,
cached_workspace_keys: Arc<Mutex<HashMap<String, WorkspaceKey>>>,
query_manager: QueryManager,
app_id: String,
}
impl EncryptionManager {
@@ -37,6 +38,7 @@ impl EncryptionManager {
cached_master_key: Default::default(),
cached_workspace_keys: Default::default(),
query_manager: app_handle.db_manager().inner().clone(),
app_id: app_handle.config().identifier.to_string(),
}
}
@@ -163,7 +165,7 @@ impl EncryptionManager {
}
}
let mkey = MasterKey::get_or_create(KEY_USER)?;
let mkey = MasterKey::get_or_create(&self.app_id, KEY_USER)?;
let mut master_secret = self.cached_master_key.lock().unwrap();
*master_secret = Some(mkey.clone());
Ok(mkey)