saltyming/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-06-15 07:10:07 +00:00
Code Activity

Fixed delete user when 2FA is enabled, implemented delete user for admin panel, and the front-end part for invite user. Secured admin panel behind a configurable token.

Browse source
This commit is contained in:
Daniel García 2018-12-18 18:52:58 +01:00
parent 5fecf09631
commit 1b5134dfe2
No known key found for this signature in database
GPG key ID: FC8A7D14C3CD543A
6 changed files with 154 additions and 71 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/db/models/two_factor.rs
View file

@ -107,4 +107,12 @@ impl TwoFactor {
.filter(twofactor::type_.eq(type_))
.first::<Self>(&**conn).ok()
}
}
pub fn delete_all_by_user(user_uuid: &str, conn: &DbConn) -> QueryResult<usize> {
diesel::delete(
twofactor::table.filter(
twofactor::user_uuid.eq(user_uuid)
)
).execute(&**conn)
}
}

3
src/db/models/user.rs
View file

@ -113,7 +113,7 @@ use diesel;
use diesel::prelude::*;
use crate::db::DbConn;
use crate::db::schema::{users, invitations};
use super::{Cipher, Folder, Device, UserOrganization, UserOrgType};
use super::{Cipher, Folder, Device, UserOrganization, UserOrgType, TwoFactor};
/// Database methods
impl User {
@ -168,6 +168,7 @@ impl User {
Cipher::delete_all_by_user(&self.uuid, &*conn)?;
Folder::delete_all_by_user(&self.uuid, &*conn)?;
Device::delete_all_by_user(&self.uuid, &*conn)?;
TwoFactor::delete_all_by_user(&self.uuid, &*conn)?;
Invitation::take(&self.email, &*conn); // Delete invitation if any
diesel::delete(users::table.filter(