extern/atuin
1
0
Fork 0
mirror of https://github.com/atuinsh/atuin.git synced 2024-11-24 17:23:50 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix(client): better error reporting on login/registration (#2076)

Browse Source
This commit is contained in:
Xavier Vello 2024-06-03 11:57:31 +02:00 committed by GitHub
parent 96163c5591
commit b05761bb37
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
crates/atuin-client/src/api_client.rs
View File

@ -61,16 +61,12 @@ pub async fn register(
.json(&map)
.send()
.await?;
let resp = handle_resp_error(resp).await?;
if !ensure_version(&resp)? {
bail!("could not register user due to version mismatch");
}
if !resp.status().is_success() {
let error = resp.json::<ErrorResponse>().await?;
bail!("failed to register user: {}", error.reason);
}
let session = resp.json::<RegisterResponse>().await?;
Ok(session)
}
@ -85,18 +81,10 @@ pub async fn login(address: &str, req: LoginRequest) -> Result<LoginResponse> {
.json(&req)
.send()
.await?;
if resp.status() == StatusCode::TOO_MANY_REQUESTS {
bail!("Rate limited. Too many login attempts.");
}
let resp = handle_resp_error(resp).await?;
if !ensure_version(&resp)? {
bail!("could not login due to version mismatch");
}
if resp.status() != reqwest::StatusCode::OK {
let error = resp.json::<ErrorResponse>().await?;
bail!("invalid login details: {}", error.reason);
bail!("Could not login due to version mismatch");
}
let session = resp.json::<LoginResponse>().await?;
@ -115,11 +103,7 @@ pub async fn latest_version() -> Result<Version> {
.header(USER_AGENT, APP_USER_AGENT)
.send()
.await?;
if resp.status() != reqwest::StatusCode::OK {
let error = resp.json::<ErrorResponse>().await?;
bail!("failed to check latest version: {}", error.reason);
}
let resp = handle_resp_error(resp).await?;
let index = resp.json::<IndexResponse>().await?;
let version = Version::parse(index.version.as_str())?;
@ -136,8 +120,7 @@ pub fn ensure_version(response: &Response) -> Result<bool> {
Err(e) => bail!("failed to parse server version: {:?}", e),
}
} else {
// if there is no version header, then the newest this server can possibly be is 17.1.0
Version::parse("17.1.0")
bail!("Server not reporting its version: it is either too old or unhealthy");
}?;
// If the client is newer than the server
@ -170,7 +153,7 @@ async fn handle_resp_error(resp: Response) -> Result<Response> {
let reason = error.reason;
if status.is_client_error() {
bail!("Could not fetch history, client error {status}: {reason}.")
bail!("Invalid request to the service: {status} - {reason}.")
}
bail!("There was an error with the atuin sync service, server error {status}: {reason}.\nIf the problem persists, contact the host")