Browse Source

Improve error message

pull/4371/head
Timshel 8 months ago
parent
commit
2467e9178a
  1. 4
      src/api/identity.rs
  2. 4
      src/auth.rs
  3. 4
      src/error.rs

4
src/api/identity.rs

@ -110,7 +110,9 @@ async fn _refresh_login(data: ConnectData, conn: &mut DbConn) -> JsonResult {
// --- // ---
// let orgs = UserOrganization::find_confirmed_by_user(&user.uuid, conn).await; // let orgs = UserOrganization::find_confirmed_by_user(&user.uuid, conn).await;
match auth::refresh_tokens(&refresh_token, conn).await { match auth::refresh_tokens(&refresh_token, conn).await {
Err(err) => err_code!(err.to_string(), Status::Unauthorized.code), Err(err) => {
err_code!(format!("Unable to refresh login credentials: {}", err.message()), Status::Unauthorized.code)
}
Ok((mut device, user, auth_tokens)) => { Ok((mut device, user, auth_tokens)) => {
// Save to update `device.updated_at` to track usage // Save to update `device.updated_at` to track usage
device.save(conn).await?; device.save(conn).await?;

4
src/auth.rs

@ -1068,7 +1068,7 @@ pub async fn refresh_tokens(refresh_token: &str, conn: &mut DbConn) -> ApiResult
let time_now = Utc::now(); let time_now = Utc::now();
let refresh_claims = match decode_refresh(refresh_token) { let refresh_claims = match decode_refresh(refresh_token) {
Err(err) => err!(format!("Impossible to read refresh_token: {err}")), Err(err) => err_silent!(format!("Impossible to read refresh_token: {}", err.message())),
Ok(claims) => claims, Ok(claims) => claims,
}; };
@ -1092,7 +1092,7 @@ pub async fn refresh_tokens(refresh_token: &str, conn: &mut DbConn) -> ApiResult
let auth_tokens = match refresh_claims.sub { let auth_tokens = match refresh_claims.sub {
AuthMethod::Password => AuthTokens::new(&device, &user, refresh_claims.sub), AuthMethod::Password => AuthTokens::new(&device, &user, refresh_claims.sub),
_ => err!("Invalid auth method cannot refresh token"), _ => err!("Invalid auth method, cannot refresh token"),
}; };
Ok((device, user, auth_tokens)) Ok((device, user, auth_tokens))

4
src/error.rs

@ -147,6 +147,10 @@ impl Error {
pub fn get_event(&self) -> &Option<ErrorEvent> { pub fn get_event(&self) -> &Option<ErrorEvent> {
&self.event &self.event
} }
pub fn message(&self) -> &str {
&self.message
}
} }
pub trait MapResult<S> { pub trait MapResult<S> {

Loading…
Cancel
Save