Backup_Repos/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2025-12-08 01:12:25 +01:00
Code Issues Projects Releases Wiki Activity

pass formatting checks

Browse source
This commit is contained in:
Kyattsukuro 2025-11-29 19:40:36 +01:00
parent 3fa90cc10d
commit 745f7db5f4
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/api/admin.rs
View file

@ -23,7 +23,7 @@ use crate::{
backup_sqlite, get_sql_server_version, backup_sqlite, get_sql_server_version,
models::{ models::{
Attachment, Cipher, Collection, Device, Event, EventType, Group, Invitation, Membership, MembershipId, Attachment, Cipher, Collection, Device, Event, EventType, Group, Invitation, Membership, MembershipId,
MembershipType, OrgPolicy, Organization, OrganizationId, SsoUser, TwoFactor, User, UserId MembershipType, OrgPolicy, Organization, OrganizationId, SsoUser, TwoFactor, User, UserId,
}, },
DbConn, DbConnType, ACTIVE_DB_TYPE, DbConn, DbConnType, ACTIVE_DB_TYPE,
}, },
@ -365,7 +365,7 @@ async fn get_users_property(users: Vec<(User, Option<SsoUser>)>, conn: &DbConn)
users_json.push(usr); users_json.push(usr);
} }
return users_json users_json
} }
#[get("/users")] #[get("/users")]
@ -375,7 +375,6 @@ async fn get_users_json(_token: AdminToken, conn: DbConn) -> Json<Value> {
Json(Value::Array(users_json)) Json(Value::Array(users_json))
} }
#[get("/users/overview")] #[get("/users/overview")]
async fn users_overview(_token: AdminToken, conn: DbConn) -> ApiResult<Html<String>> { async fn users_overview(_token: AdminToken, conn: DbConn) -> ApiResult<Html<String>> {
let users = User::get_all(&conn).await; let users = User::get_all(&conn).await;
@ -387,7 +386,7 @@ async fn users_overview(_token: AdminToken, conn: DbConn) -> ApiResult<Html<Stri
#[get("/users/by-mail/<mail>")] #[get("/users/by-mail/<mail>")]
async fn get_user_by_mail_json(mail: &str, _token: AdminToken, conn: DbConn) -> JsonResult { async fn get_user_by_mail_json(mail: &str, _token: AdminToken, conn: DbConn) -> JsonResult {
if let Some((u, sso)) = SsoUser::find_by_mail(mail, &conn).await { if let Some((u, sso)) = SsoUser::find_by_mail(mail, &conn).await {
let user_json = get_users_property(vec!((u, sso)), &conn).await[0].clone(); let user_json = get_users_property(vec![(u, sso)], &conn).await[0].clone();
Ok(Json(user_json)) Ok(Json(user_json))
} else { } else {
err_code!("User doesn't exist", Status::NotFound.code); err_code!("User doesn't exist", Status::NotFound.code);
@ -397,7 +396,7 @@ async fn get_user_by_mail_json(mail: &str, _token: AdminToken, conn: DbConn) ->
#[get("/users/<user_id>")] #[get("/users/<user_id>")]
async fn get_user_json(user_id: UserId, _token: AdminToken, conn: DbConn) -> JsonResult { async fn get_user_json(user_id: UserId, _token: AdminToken, conn: DbConn) -> JsonResult {
let u_sso = get_user_or_404(&user_id, &conn).await?; let u_sso = get_user_or_404(&user_id, &conn).await?;
let user_json = get_users_property(vec!(u_sso), &conn).await[0].clone(); let user_json = get_users_property(vec![u_sso], &conn).await[0].clone();
Ok(Json(user_json)) Ok(Json(user_json))
} }