mart-w/kanidm
1
0
Fork 0
mirror of https://github.com/kanidm/kanidm.git synced 2025-02-23 20:47:01 +01:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: add json output modes for person list and system oauth2 list (#2017)

Browse source
This commit is contained in:
oddlama 2023-08-22 00:17:34 +02:00 committed by GitHub
parent ed563d2416
commit 544689ddac
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
tools/cli/src/cli/oauth2.rs
View file

@ -34,7 +34,16 @@ impl Oauth2Opt {
Oauth2Opt::List(copt) => { Oauth2Opt::List(copt) => {
let client = copt.to_client(OpType::Read).await; let client = copt.to_client(OpType::Read).await;
match client.idm_oauth2_rs_list().await { match client.idm_oauth2_rs_list().await {
Ok(r) => r.iter().for_each(|ent| println!("{}", ent)), Ok(r) => match copt.output_mode {
OutputMode::Json => {
let r_attrs: Vec<_> = r.iter().map(|entry| &entry.attrs).collect();
println!(
"{}",
serde_json::to_string(&r_attrs).expect("Failed to serialise json")
);
}
OutputMode::Text => r.iter().for_each(|ent| println!("{}", ent)),
},
Err(e) => error!("Error -> {:?}", e), Err(e) => error!("Error -> {:?}", e),
} }
} }

23
tools/cli/src/cli/person.rs
View file

@ -21,7 +21,7 @@ use uuid::Uuid;
use crate::webauthn::get_authenticator; use crate::webauthn::get_authenticator;
use crate::{ use crate::{
password_prompt, AccountCredential, AccountRadius, AccountSsh, AccountUserAuthToken, password_prompt, AccountCredential, AccountRadius, AccountSsh, AccountUserAuthToken,
AccountValidity, PersonOpt, PersonPosix, AccountValidity, OutputMode, PersonOpt, PersonPosix,
}; };
impl PersonOpt { impl PersonOpt {
@ -256,7 +256,16 @@ impl PersonOpt {
PersonOpt::List(copt) => { PersonOpt::List(copt) => {
let client = copt.to_client(OpType::Read).await; let client = copt.to_client(OpType::Read).await;
match client.idm_person_account_list().await { match client.idm_person_account_list().await {
Ok(r) => r.iter().for_each(|ent| println!("{}", ent)), Ok(r) => match copt.output_mode {
OutputMode::Json => {
let r_attrs: Vec<_> = r.iter().map(|entry| &entry.attrs).collect();
println!(
"{}",
serde_json::to_string(&r_attrs).expect("Failed to serialise json")
);
}
OutputMode::Text => r.iter().for_each(|ent| println!("{}", ent)),
},
Err(e) => error!("Error -> {:?}", e), Err(e) => error!("Error -> {:?}", e),
} }
} }
@ -282,7 +291,15 @@ impl PersonOpt {
.idm_person_account_get(aopt.aopts.account_id.as_str()) .idm_person_account_get(aopt.aopts.account_id.as_str())
.await .await
{ {
Ok(Some(e)) => println!("{}", e), Ok(Some(e)) => match aopt.copt.output_mode {
OutputMode::Json => {
println!(
"{}",
serde_json::to_string(&e).expect("Failed to serialise json")
);
}
OutputMode::Text => println!("{}", e),
},
Ok(None) => println!("No matching entries"), Ok(None) => println!("No matching entries"),
Err(e) => error!("Error -> {:?}", e), Err(e) => error!("Error -> {:?}", e),
} }