diff --git a/src/api/identity.rs b/src/api/identity.rs index 69ffc28f..71eafbe8 100644 --- a/src/api/identity.rs +++ b/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; 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)) => { // Save to update `device.updated_at` to track usage device.save(conn).await?; diff --git a/src/auth.rs b/src/auth.rs index 31c534c7..b459a7c4 100644 --- a/src/auth.rs +++ b/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 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, }; @@ -1092,7 +1092,7 @@ pub async fn refresh_tokens(refresh_token: &str, conn: &mut DbConn) -> ApiResult let auth_tokens = match 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)) diff --git a/src/error.rs b/src/error.rs index b2872775..665e1bd2 100644 --- a/src/error.rs +++ b/src/error.rs @@ -147,6 +147,10 @@ impl Error { pub fn get_event(&self) -> &Option { &self.event } + + pub fn message(&self) -> &str { + &self.message + } } pub trait MapResult {