saret/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-09-10 18:55:57 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into feature/kdf-options

Browse Source
This commit is contained in:
Daniel García
2023-02-12 19:23:14 +01:00
committed by GitHub
parent 68bcc7a4b8 0c295d5e6e
commit 5bcee24f88
55 changed files with 831 additions and 463 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/api/core/emergency_access.rs
View File

@@ -123,7 +123,9 @@ async fn post_emergency_access(
emergency_access.atype = new_type;
emergency_access.wait_time_days = data.WaitTimeDays;
emergency_access.key_encrypted = data.KeyEncrypted;
if data.KeyEncrypted.is_some() {
emergency_access.key_encrypted = data.KeyEncrypted;
}
emergency_access.save(&mut conn).await?;
Ok(Json(emergency_access.to_json()))