simono41/steamguard-cli
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

trade: if confirmation failure response contains a message, keep it so the user can see it (#329)

Browse source
This commit is contained in:
Carson McManus 2023-10-08 11:12:34 -04:00 committed by GitHub
parent 94a3210f09
commit 7eb62cfa7b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 23 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
steamguard/src/confirmation.rs
View file

@ -109,7 +109,11 @@ where
return Err(ConfirmerError::InvalidTokens); return Err(ConfirmerError::InvalidTokens);
} }
if !body.success { if !body.success {
return Err(ConfirmerError::RemoteFailure); if let Some(msg) = body.message {
return Err(ConfirmerError::RemoteFailureWithMessage(msg));
} else {
return Err(ConfirmerError::RemoteFailure);
}
} }
Ok(body.conf) Ok(body.conf)
} }
@ -162,7 +166,11 @@ where
return Err(ConfirmerError::InvalidTokens); return Err(ConfirmerError::InvalidTokens);
} }
if !body.success { if !body.success {
return Err(ConfirmerError::RemoteFailure); if let Some(msg) = body.message {
return Err(ConfirmerError::RemoteFailureWithMessage(msg));
} else {
return Err(ConfirmerError::RemoteFailure);
}
} }
Ok(()) Ok(())
@ -237,7 +245,11 @@ where
return Err(ConfirmerError::InvalidTokens); return Err(ConfirmerError::InvalidTokens);
} }
if !body.success { if !body.success {
return Err(ConfirmerError::RemoteFailure); if let Some(msg) = body.message {
return Err(ConfirmerError::RemoteFailureWithMessage(msg));
} else {
return Err(ConfirmerError::RemoteFailure);
}
} }
Ok(()) Ok(())
@ -316,8 +328,10 @@ pub enum ConfirmerError {
NetworkFailure(#[from] reqwest::Error), NetworkFailure(#[from] reqwest::Error),
#[error("Failed to deserialize response: {0}")] #[error("Failed to deserialize response: {0}")]
DeserializeError(#[from] serde_path_to_error::Error<serde_json::Error>), DeserializeError(#[from] serde_path_to_error::Error<serde_json::Error>),
#[error("Remote failure: Valve's server responded with a failure. This is likely not a steamguard-cli bug, Steam's confirmation API is just unreliable. Wait a bit and try again.")] #[error("Remote failure: Valve's server responded with a failure and did not elaborate any further. This is likely not a steamguard-cli bug, Steam's confirmation API is just unreliable. Wait a bit and try again.")]
RemoteFailure, RemoteFailure,
#[error("Remote failure: Valve's server responded with a failure and said: {0}")]
RemoteFailureWithMessage(String),
#[error("Unknown error: {0}")] #[error("Unknown error: {0}")]
Unknown(#[from] anyhow::Error), Unknown(#[from] anyhow::Error),
} }
@ -388,13 +402,17 @@ pub struct ConfirmationListResponse {
pub needauth: Option<bool>, pub needauth: Option<bool>,
#[serde(default)] #[serde(default)]
pub conf: Vec<Confirmation>, pub conf: Vec<Confirmation>,
#[serde(default)]
pub message: Option<String>,
} }
#[derive(Debug, Clone, Copy, Deserialize)] #[derive(Debug, Clone, Deserialize)]
pub struct SendConfirmationResponse { pub struct SendConfirmationResponse {
pub success: bool, pub success: bool,
#[serde(default)] #[serde(default)]
pub needsauth: Option<bool>, pub needsauth: Option<bool>,
#[serde(default)]
pub message: Option<String>,
} }
fn build_time_bytes(time: u64) -> [u8; 8] { fn build_time_bytes(time: u64) -> [u8; 8] {