From 5216e4e14ac7a45db72cf50ea426a674ecc471c8 Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Tue, 20 Feb 2024 21:13:53 +0100 Subject: [PATCH] add folders_read to whoami endpoint --- backend/windmill-api/src/users.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/backend/windmill-api/src/users.rs b/backend/windmill-api/src/users.rs index 21c7be3c65..23f3b6ab9b 100644 --- a/backend/windmill-api/src/users.rs +++ b/backend/windmill-api/src/users.rs @@ -564,7 +564,7 @@ pub struct GlobalUserInfo { company: Option, } -#[derive(Serialize)] +#[derive(Serialize, Debug)] pub struct UserInfo { pub workspace_id: String, pub email: String, @@ -576,6 +576,7 @@ pub struct UserInfo { pub operator: bool, pub disabled: bool, pub role: Option, + pub folders_read: Vec, pub folders: Vec, pub folders_owners: Vec, } @@ -899,6 +900,7 @@ async fn whoami( ApiAuthed { username, email, is_admin, groups, folders, .. }: ApiAuthed, ) -> JsonResult { let user = get_user(&w_id, &username, &db).await?; + tracing::info!("whoami: {email} {user:?}"); if let Some(user) = user { Ok(Json(user)) } else { @@ -913,6 +915,7 @@ async fn whoami( operator: false, disabled: false, role: Some("superadmin".to_string()), + folders_read: folders.clone().into_iter().map(|x| x.0).collect(), folders: folders .clone() .into_iter() @@ -1029,6 +1032,7 @@ async fn get_user(w_id: &str, username: &str, db: &DB) -> Result