Merge pull request #3215 from stefan0xC/fix-post-emergency-access

don't nullify key when editing emergency access
dani-garcia · Feb 12, 2023 · 53fa8da · 53fa8da
2 parents 8c1117f + c58aac5
commit 53fa8da
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/api/core/emergency_access.rs b/src/api/core/emergency_access.rs
@@ -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()))