diff --git a/src/api/mod.rs b/src/api/mod.rs index 314b684..0d3a65d 100644 --- a/src/api/mod.rs +++ b/src/api/mod.rs @@ -10,14 +10,14 @@ struct AuthResponse { #[derive(Debug, Deserialize)] struct UserIdResponse { - name: String, + username: String, id: i64, } #[derive(Debug, Deserialize)] struct UserInfoResponse { id: i64, - name: String, + username: String, joined: i64, is_admin: bool, } @@ -54,7 +54,12 @@ impl Api { StatusCode::FAILED_DEPENDENCY => { return Ok(Err(Error::msg("Account not verified!"))) } - _ => return Ok(Err(Error::msg("Unknown error"))), + _ => { + return Ok(Err(Error::msg(format!( + "Unknown error: {}", + response.status().to_string() + )))) + } } let response_body: AuthResponse = response.json().await?; @@ -69,7 +74,7 @@ impl Api { let request = format!("{base_url}/account/id"); let response = Client::new() - .post(request) + .get(request) .bearer_auth(&token) .send() .await?; @@ -81,7 +86,12 @@ impl Api { StatusCode::FORBIDDEN => { return Ok(Err(Error::msg("Blocked for security reasons!"))) } - _ => return Ok(Err(Error::msg("Unknown error"))), + _ => { + return Ok(Err(Error::msg(format!( + "Unknown error: {}", + response.status().to_string() + )))) + } } let response_body: UserIdResponse = response.json().await?; @@ -104,7 +114,12 @@ impl Api { return Ok(Err(Error::msg("Blocked for security reasons!"))) } StatusCode::NOT_FOUND => return Ok(Err(Error::msg("User not found"))), - _ => return Ok(Err(Error::msg("Unknown error"))), + _ => { + return Ok(Err(Error::msg(format!( + "Unknown error: {}", + response.status().to_string() + )))) + } } let response_body: UserInfoResponse = response.json().await?; diff --git a/src/main.rs b/src/main.rs index 6230a45..dfb439f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -25,8 +25,13 @@ async fn main() -> Result<()> { let stdout = ui::prepare()?; let base_url = args.base_url.unwrap(); - let mut login = ui::login::UI::new(stdout, base_url)?; - let api = login.run().await?; + let api = { + let mut login = ui::login::UI::new(stdout, base_url)?; + let api = login.run().await?; + api + }; + + println!("{:#?}", api); Ok(()) }