Change error handling

bitwarden · Jul 17, 2023 · ff67d65 · ff67d65
1 parent ec2d645
commit ff67d65
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 10 deletions.
diff --git a/crates/bitwarden/src/auth/api/request/mod.rs b/crates/bitwarden/src/auth/api/request/mod.rs
@@ -43,13 +43,13 @@ async fn send_identity_connect_request(
         request = request.header("Auth-Email", BASE64_ENGINE.encode(email.as_bytes()));
     }
 
-    let raw_response = request
+    let response = request
         .body(serde_qs::to_string(&body).unwrap())
         .send()
-        .await?
-        .error_for_status()?
-        .text()
         .await?;
 
-    parse_identity_response(&raw_response)
+    let status = response.status();
+    let text = response.text().await?;
+
+    parse_identity_response(status, &text)
 }
diff --git a/crates/bitwarden/src/auth/api/response/identity_token_response.rs b/crates/bitwarden/src/auth/api/response/identity_token_response.rs
@@ -1,3 +1,4 @@
+use reqwest::StatusCode;
 use serde::{Deserialize, Serialize};
 
 use crate::{
@@ -17,7 +18,10 @@ pub enum IdentityTokenResponse {
     CaptchaRequired(IdentityCaptchaResponse),
 }
 
-pub fn parse_identity_response(response: &str) -> Result<IdentityTokenResponse> {
+pub fn parse_identity_response(
+    status: StatusCode,
+    response: &str,
+) -> Result<IdentityTokenResponse> {
     if let Ok(r) = serde_json::from_str::<IdentityTokenSuccessResponse>(response) {
         Ok(IdentityTokenResponse::Authenticated(r))
     } else if let Ok(r) = serde_json::from_str::<IdentityTokenPayloadResponse>(response) {
@@ -31,7 +35,10 @@ pub fn parse_identity_response(response: &str) -> Result<IdentityTokenResponse>
     } else if let Ok(r) = serde_json::from_str::<IdentityTokenFailResponse>(response) {
         Err(Error::IdentityFail(r))
     } else {
-        Err(Error::Internal("Failed to parse IdentityTokenResponse"))
+        Err(Error::ResponseContent {
+            status: status,
+            message: response.to_owned(),
+        })
     }
 }
 
@@ -44,7 +51,7 @@ mod test {
         let expected = IdentityTokenSuccessResponse::default();
         let success = serde_json::to_string(&expected).unwrap();
         let expected = IdentityTokenResponse::Authenticated(expected);
-        let actual = parse_identity_response(&success).unwrap();
+        let actual = parse_identity_response(StatusCode::OK, &success).unwrap();
         assert_eq!(expected, actual);
     }
 
@@ -53,7 +60,7 @@ mod test {
         let expected = IdentityTwoFactorResponse::default();
         let two_factor = serde_json::to_string(&expected).unwrap();
         let expected = IdentityTokenResponse::TwoFactorRequired(expected);
-        let actual = parse_identity_response(&two_factor).unwrap();
+        let actual = parse_identity_response(StatusCode::BAD_REQUEST, &two_factor).unwrap();
         assert_eq!(expected, actual);
     }
 
@@ -62,7 +69,7 @@ mod test {
         let expected = IdentityCaptchaResponse::default();
         let captcha = serde_json::to_string(&expected).unwrap();
         let expected = IdentityTokenResponse::CaptchaRequired(expected);
-        let actual = parse_identity_response(&captcha).unwrap();
+        let actual = parse_identity_response(StatusCode::BAD_REQUEST, &captcha).unwrap();
         assert_eq!(expected, actual);
     }
 }