mirror of
https://github.com/dani-garcia/vaultwarden.wiki.git
synced 2026-10-26 01:46: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
@@ -269,7 +269,7 @@ async fn leave_organization(org_id: OrganizationId, headers: OrgMemberHeaders, c
|
||||
}
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationUserLeft as i32,
|
||||
EventType::OrganizationUserLeft,
|
||||
&membership.uuid,
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -327,7 +327,7 @@ async fn post_organization(
|
||||
org.save(&conn).await?;
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationUpdated as i32,
|
||||
EventType::OrganizationUpdated,
|
||||
org_id.as_ref(),
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -514,7 +514,7 @@ async fn post_organization_collections(
|
||||
collection.save(&conn).await?;
|
||||
|
||||
log_event(
|
||||
EventType::CollectionCreated as i32,
|
||||
EventType::CollectionCreated,
|
||||
&collection.uuid,
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -597,7 +597,7 @@ async fn post_bulk_access_collections(
|
||||
collection.save(&conn).await?;
|
||||
|
||||
log_event(
|
||||
EventType::CollectionUpdated as i32,
|
||||
EventType::CollectionUpdated,
|
||||
&collection.uuid,
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -674,7 +674,7 @@ async fn post_organization_collection_update(
|
||||
collection.save(&conn).await?;
|
||||
|
||||
log_event(
|
||||
EventType::CollectionUpdated as i32,
|
||||
EventType::CollectionUpdated,
|
||||
&collection.uuid,
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -723,7 +723,7 @@ async fn delete_organization_collection_impl(
|
||||
err!("Collection not found", "Collection does not exist or does not belong to this organization")
|
||||
};
|
||||
log_event(
|
||||
EventType::CollectionDeleted as i32,
|
||||
EventType::CollectionDeleted,
|
||||
&collection.uuid,
|
||||
org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -1148,7 +1148,7 @@ async fn send_invite(
|
||||
}
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationUserInvited as i32,
|
||||
EventType::OrganizationUserInvited,
|
||||
&new_member.uuid,
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -1447,7 +1447,7 @@ async fn confirm_invite_impl(
|
||||
OrgPolicy::check_user_allowed(&member_to_confirm, "confirm", conn).await?;
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationUserConfirmed as i32,
|
||||
EventType::OrganizationUserConfirmed,
|
||||
&member_to_confirm.uuid,
|
||||
org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -1637,7 +1637,7 @@ async fn edit_member(
|
||||
}
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationUserUpdated as i32,
|
||||
EventType::OrganizationUserUpdated,
|
||||
&member_to_edit.uuid,
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -1724,7 +1724,7 @@ async fn delete_member_impl(
|
||||
}
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationUserRemoved as i32,
|
||||
EventType::OrganizationUserRemoved,
|
||||
&member_to_delete.uuid,
|
||||
org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -2144,7 +2144,7 @@ async fn put_policy(
|
||||
}
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationUserRemoved as i32,
|
||||
EventType::OrganizationUserRemoved,
|
||||
&member.uuid,
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -2170,7 +2170,7 @@ async fn put_policy(
|
||||
policy.save(&conn).await?;
|
||||
|
||||
log_event(
|
||||
EventType::PolicyUpdated as i32,
|
||||
EventType::PolicyUpdated,
|
||||
policy.uuid.as_ref(),
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -2339,7 +2339,7 @@ async fn revoke_member_impl(
|
||||
member.save(conn).await?;
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationUserRevoked as i32,
|
||||
EventType::OrganizationUserRevoked,
|
||||
&member.uuid,
|
||||
org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -2437,7 +2437,7 @@ async fn restore_member_impl(
|
||||
member.save(conn).await?;
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationUserRestored as i32,
|
||||
EventType::OrganizationUserRestored,
|
||||
&member.uuid,
|
||||
org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -2605,7 +2605,7 @@ async fn post_groups(
|
||||
let group = group_request.to_group(&org_id);
|
||||
|
||||
log_event(
|
||||
EventType::GroupCreated as i32,
|
||||
EventType::GroupCreated,
|
||||
&group.uuid,
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -2646,7 +2646,7 @@ async fn put_group(
|
||||
GroupUser::delete_all_by_group(&group_id, &org_id, &conn).await?;
|
||||
|
||||
log_event(
|
||||
EventType::GroupUpdated as i32,
|
||||
EventType::GroupUpdated,
|
||||
&updated_group.uuid,
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -2679,7 +2679,7 @@ async fn add_update_group(
|
||||
user_entry.save(conn).await?;
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationUserUpdatedGroups as i32,
|
||||
EventType::OrganizationUserUpdatedGroups,
|
||||
&assigned_member,
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -2754,7 +2754,7 @@ async fn delete_group_impl(
|
||||
};
|
||||
|
||||
log_event(
|
||||
EventType::GroupDeleted as i32,
|
||||
EventType::GroupDeleted,
|
||||
&group.uuid,
|
||||
org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -2865,7 +2865,7 @@ async fn put_group_members(
|
||||
user_entry.save(&conn).await?;
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationUserUpdatedGroups as i32,
|
||||
EventType::OrganizationUserUpdatedGroups,
|
||||
&assigned_member,
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -2903,7 +2903,7 @@ async fn post_delete_group_member(
|
||||
}
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationUserUpdatedGroups as i32,
|
||||
EventType::OrganizationUserUpdatedGroups,
|
||||
&member_id,
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -3039,7 +3039,7 @@ async fn recover_account(
|
||||
nt.send_logout(&user, None, &conn).await;
|
||||
|
||||
log_event(
|
||||
EventType::OrganizationUserAdminResetPassword as i32,
|
||||
EventType::OrganizationUserAdminResetPassword,
|
||||
&member_id,
|
||||
&org_id,
|
||||
&headers.user.uuid,
|
||||
@@ -3166,9 +3166,9 @@ async fn put_reset_password_enrollment(
|
||||
membership.save(&conn).await?;
|
||||
|
||||
let event_type = if membership.reset_password_key.is_some() {
|
||||
EventType::OrganizationUserResetPasswordEnroll as i32
|
||||
EventType::OrganizationUserResetPasswordEnroll
|
||||
} else {
|
||||
EventType::OrganizationUserResetPasswordWithdraw as i32
|
||||
EventType::OrganizationUserResetPasswordWithdraw
|
||||
};
|
||||
|
||||
log_event(event_type, &membership.uuid, &org_id, &headers.user.uuid, headers.device.atype, &headers.ip.ip, &conn)
|
||||
|
||||
Reference in new issue
Block a user