mirror of
https://github.com/dani-garcia/vaultwarden.wiki.git
synced 2026-10-27 20:06:47 +02:00
log_event take enum parameter not i32 (#7656)
Co-authored-by: Timshel <timshel@users.noreply.github.com>
This commit is contained in:
1 parent
2073c03092
commit
fdc156b247
5 files changed
+42
-58
No files matched your search
+10
-18
@@ -553,16 +553,8 @@ pub async fn update_cipher_from_data(
|
||||
(_, _) => EventType::CipherUpdated,
|
||||
};
|
||||
|
||||
log_event(
|
||||
event_type as i32,
|
||||
&cipher.uuid,
|
||||
org_id,
|
||||
&headers.user.uuid,
|
||||
headers.device.atype,
|
||||
&headers.ip.ip,
|
||||
conn,
|
||||
)
|
||||
.await;
|
||||
log_event(event_type, &cipher.uuid, org_id, &headers.user.uuid, headers.device.atype, &headers.ip.ip, conn)
|
||||
.await;
|
||||
}
|
||||
nt.send_cipher_update(
|
||||
ut,
|
||||
@@ -850,7 +842,7 @@ async fn post_collections_update(
|
||||
.await;
|
||||
|
||||
log_event(
|
||||
EventType::CipherUpdatedCollections as i32,
|
||||
EventType::CipherUpdatedCollections,
|
||||
&cipher.uuid,
|
||||
org_uuid,
|
||||
&headers.user.uuid,
|
||||
@@ -930,7 +922,7 @@ async fn post_collections_admin(
|
||||
.await;
|
||||
|
||||
log_event(
|
||||
EventType::CipherUpdatedCollections as i32,
|
||||
EventType::CipherUpdatedCollections,
|
||||
&cipher.uuid,
|
||||
org_uuid,
|
||||
&headers.user.uuid,
|
||||
@@ -1335,7 +1327,7 @@ async fn save_attachment(
|
||||
|
||||
if let Some(org_id) = &cipher.organization_uuid {
|
||||
log_event(
|
||||
EventType::CipherAttachmentCreated as i32,
|
||||
EventType::CipherAttachmentCreated,
|
||||
&cipher.uuid,
|
||||
org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -1696,7 +1688,7 @@ async fn purge_org_vault(
|
||||
nt.send_user_update(UpdateType::SyncVault, &user, headers.device.push_uuid.as_ref(), &conn).await;
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationPurgedVault as i32,
|
||||
EventType::OrganizationPurgedVault,
|
||||
&organization.org_id,
|
||||
&organization.org_id,
|
||||
&user.uuid,
|
||||
@@ -1824,9 +1816,9 @@ async fn delete_cipher_by_uuid(
|
||||
let event_type = if *delete_options == CipherDeleteOptions::SoftSingle
|
||||
|| *delete_options == CipherDeleteOptions::SoftMulti
|
||||
{
|
||||
EventType::CipherSoftDeleted as i32
|
||||
EventType::CipherSoftDeleted
|
||||
} else {
|
||||
EventType::CipherDeleted as i32
|
||||
EventType::CipherDeleted
|
||||
};
|
||||
|
||||
log_event(event_type, &cipher.uuid, &org_id, &headers.user.uuid, headers.device.atype, &headers.ip.ip, conn)
|
||||
@@ -1895,7 +1887,7 @@ async fn restore_cipher_by_uuid(
|
||||
|
||||
if let Some(org_id) = &cipher.organization_uuid {
|
||||
log_event(
|
||||
EventType::CipherRestored as i32,
|
||||
EventType::CipherRestored,
|
||||
&cipher.uuid.clone(),
|
||||
org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -1972,7 +1964,7 @@ async fn delete_cipher_attachment_by_id(
|
||||
|
||||
if let Some(ref org_id) = cipher.organization_uuid {
|
||||
log_event(
|
||||
EventType::CipherAttachmentDeleted as i32,
|
||||
EventType::CipherAttachmentDeleted,
|
||||
&cipher.uuid,
|
||||
org_id,
|
||||
&headers.user.uuid,
|
||||
|
||||
Reference in new issue
Block a user