dahjah/vaultwarden
1
0
Fork 0
mirror of https://github.com/dani-garcia/vaultwarden.git synced 2026-04-09 11:01:39 -06:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

removed get_sso_user

Browse Source
This commit is contained in:
Kyattsukuro 2026-02-04 22:46:25 +01:00
parent 5ba2860551
commit 245d263d69
2 changed files with 5 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/api/admin.rs
View File

@ -304,10 +304,6 @@ async fn get_user_or_404(user_id: &UserId, conn: &DbConn) -> ApiResult<User> {
}
}
async fn get_sso_user(user_id: &UserId, conn: &DbConn) -> Option<SsoUser> {
SsoUser::find_by_uuid(user_id, conn).await.and_then(|user_and_sso| user_and_sso.1)
}
#[post("/invite", format = "application/json", data = "<data>")]
async fn invite_user(data: Json<InviteData>, _token: AdminToken, conn: DbConn) -> JsonResult {
let data: InviteData = data.into_inner();
@ -400,7 +396,7 @@ async fn get_user_by_mail_json(mail: &str, _token: AdminToken, conn: DbConn) ->
#[get("/users/<user_id>")]
async fn get_user_json(user_id: UserId, _token: AdminToken, conn: DbConn) -> JsonResult {
let user = get_user_or_404(&user_id, &conn).await?;
let sso_user = get_sso_user(&user_id, &conn).await;
let sso_user = SsoUser::find_by_uuid(&user_id, &conn).await;
let user_json = get_users_property(vec![(user, sso_user)], &conn).await[0].clone();
Ok(Json(user_json))

10
src/db/models/user.rs
View File

@ -527,13 +527,11 @@ impl SsoUser {
}}
}
pub async fn find_by_uuid(uuid: &UserId, conn: &DbConn) -> Option<(User, Option<Self>)> {
pub async fn find_by_uuid(uuid: &UserId, conn: &DbConn) -> Option<Self> {
db_run! { conn: {
users::table
.left_join(sso_users::table)
.select(<(User, Option<Self>)>::as_select())
.filter(users::uuid.eq(uuid))
.first::<(User, Option<Self>)>(conn)
sso_users::table
.filter(sso_users::user_uuid.eq(uuid))
.first::<Self>(conn)
.ok()
}}
}