mirror/matrix-rust-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-rust-sdk.git synced 2026-05-15 11:36:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

refactor(sdk): Merge impl blocks

Browse Source
This commit is contained in:
Jonas Platte
2022-11-03 15:35:59 +01:00
committed by Jonas Platte
parent c8dd5c42e9
commit cf779822fe
1 changed files with 36 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

76
crates/matrix-sdk/src/error.rs
View File

@@ -135,6 +135,24 @@ impl HttpError {
pub fn as_client_api_error(&self) -> Option<&ruma::api::client::Error> {
self.as_ruma_api_error().and_then(RumaApiError::as_client_api_error)
}
/// Try to destructure the error into an universal interactive auth info.
///
/// Some requests require universal interactive auth, doing such a request
/// will always fail the first time with a 401 status code, the response
/// body will contain info how the client can authenticate.
///
/// The request will need to be retried, this time containing additional
/// authentication data.
///
/// This method is an convenience method to get to the info the server
/// returned on the first, failed request.
pub fn uiaa_response(&self) -> Option<&UiaaInfo> {
match self.as_ruma_api_error() {
Some(RumaApiError::Uiaa(UiaaResponse::AuthResponse(i))) => Some(i),
_ => None,
}
}
}
/// Internal representation of errors.
@@ -246,6 +264,24 @@ impl Error {
pub fn as_client_api_error(&self) -> Option<&ruma::api::client::Error> {
self.as_ruma_api_error().and_then(RumaApiError::as_client_api_error)
}
/// Try to destructure the error into an universal interactive auth info.
///
/// Some requests require universal interactive auth, doing such a request
/// will always fail the first time with a 401 status code, the response
/// body will contain info how the client can authenticate.
///
/// The request will need to be retried, this time containing additional
/// authentication data.
///
/// This method is an convenience method to get to the info the server
/// returned on the first, failed request.
pub fn uiaa_response(&self) -> Option<&UiaaInfo> {
match self.as_ruma_api_error() {
Some(RumaApiError::Uiaa(UiaaResponse::AuthResponse(i))) => Some(i),
_ => None,
}
}
}
/// Error for the room key importing functionality.
@@ -276,46 +312,6 @@ pub enum RoomKeyImportError {
Export(#[from] KeyExportError),
}
impl HttpError {
/// Try to destructure the error into an universal interactive auth info.
///
/// Some requests require universal interactive auth, doing such a request
/// will always fail the first time with a 401 status code, the response
/// body will contain info how the client can authenticate.
///
/// The request will need to be retried, this time containing additional
/// authentication data.
///
/// This method is an convenience method to get to the info the server
/// returned on the first, failed request.
pub fn uiaa_response(&self) -> Option<&UiaaInfo> {
match self.as_ruma_api_error() {
Some(RumaApiError::Uiaa(UiaaResponse::AuthResponse(i))) => Some(i),
_ => None,
}
}
}
impl Error {
/// Try to destructure the error into an universal interactive auth info.
///
/// Some requests require universal interactive auth, doing such a request
/// will always fail the first time with a 401 status code, the response
/// body will contain info how the client can authenticate.
///
/// The request will need to be retried, this time containing additional
/// authentication data.
///
/// This method is an convenience method to get to the info the server
/// returned on the first, failed request.
pub fn uiaa_response(&self) -> Option<&UiaaInfo> {
match self.as_ruma_api_error() {
Some(RumaApiError::Uiaa(UiaaResponse::AuthResponse(i))) => Some(i),
_ => None,
}
}
}
impl From<FromHttpResponseError<ruma::api::client::Error>> for HttpError {
fn from(err: FromHttpResponseError<ruma::api::client::Error>) -> Self {
Self::Api(err.map(|e| e.map(RumaApiError::ClientApi)))