mirror of
https://github.com/dani-garcia/vaultwarden.wiki.git
synced 2026-10-26 07:36:49 +02:00
Support admin reset 2fa (#7435)
* Support admin reset 2fa * Fix recovery email --------- Co-authored-by: Timshel <timshel@users.noreply.github.com>
This commit is contained in:
1 parent
277e1536eb
commit
57fbed1bed
9 files changed
+112
-47
No files matched your search
+9
-3
@@ -23,14 +23,14 @@ use rocket::{
|
||||
|
||||
use crate::{
|
||||
CONFIG,
|
||||
api::ApiResult,
|
||||
api::{ApiResult, core::log_event},
|
||||
config::PathType,
|
||||
db::{
|
||||
DbConn,
|
||||
models::{
|
||||
AttachmentId, CipherId, Collection, CollectionId, Device, DeviceId, DeviceType, EmergencyAccessId,
|
||||
Membership, MembershipId, MembershipStatus, MembershipType, OrgApiKeyId, OrganizationId, SendFileId,
|
||||
SendId, User, UserId, UserStampException,
|
||||
EventType, Membership, MembershipId, MembershipStatus, MembershipType, OrgApiKeyId, OrganizationId,
|
||||
SendFileId, SendId, User, UserId, UserStampException,
|
||||
},
|
||||
},
|
||||
error::Error,
|
||||
@@ -822,6 +822,12 @@ pub struct AdminHeaders {
|
||||
pub org_id: OrganizationId,
|
||||
}
|
||||
|
||||
impl AdminHeaders {
|
||||
pub async fn log_event(&self, event_type: EventType, source_uuid: &str, org_id: &OrganizationId, conn: &DbConn) {
|
||||
log_event(event_type, source_uuid, org_id, &self.user.uuid, self.device.atype, &self.ip.ip, conn).await;
|
||||
}
|
||||
}
|
||||
|
||||
#[rocket::async_trait]
|
||||
impl<'r> FromRequest<'r> for AdminHeaders {
|
||||
type Error = &'static str;
|
||||
|
||||
Reference in new issue
Block a user