Remove support for captchas (#367)

We no longer use captchas.

Author: Hinton

crates/bitwarden-core/src/auth/api/response/identity_captcha_response.rs

@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
 use crate::{
     auth::{
         api::response::{
-            IdentityCaptchaResponse, IdentityTokenFailResponse, IdentityTokenPayloadResponse,
-            IdentityTokenRefreshResponse, IdentityTokenSuccessResponse, IdentityTwoFactorResponse,
+            IdentityTokenFailResponse, IdentityTokenPayloadResponse, IdentityTokenRefreshResponse,
+            IdentityTokenSuccessResponse, IdentityTwoFactorResponse,
         },
         login::LoginError,
     },
@@ -18,7 +18,6 @@ pub enum IdentityTokenResponse {
     Payload(IdentityTokenPayloadResponse),
     Refreshed(IdentityTokenRefreshResponse),
     TwoFactorRequired(Box<IdentityTwoFactorResponse>),
-    CaptchaRequired(IdentityCaptchaResponse),
 }
 
 pub fn parse_identity_response(
@@ -33,8 +32,6 @@ pub fn parse_identity_response(
         Ok(IdentityTokenResponse::Refreshed(r))
     } else if let Ok(r) = serde_json::from_str::<IdentityTwoFactorResponse>(&response) {
         Ok(IdentityTokenResponse::TwoFactorRequired(Box::new(r)))
-    } else if let Ok(r) = serde_json::from_str::<IdentityCaptchaResponse>(&response) {
-        Ok(IdentityTokenResponse::CaptchaRequired(r))
     } else if let Ok(r) = serde_json::from_str::<IdentityTokenFailResponse>(&response) {
         Err(LoginError::IdentityFail(r))
     } else {
@@ -67,13 +64,4 @@ mod test {
         let actual = parse_identity_response(StatusCode::BAD_REQUEST, two_factor).unwrap();
         assert_eq!(expected, actual);
     }
-
-    #[test]
-    fn captcha() {
-        let expected = IdentityCaptchaResponse::default();
-        let captcha = serde_json::to_string(&expected).unwrap();
-        let expected = IdentityTokenResponse::CaptchaRequired(expected);
-        let actual = parse_identity_response(StatusCode::BAD_REQUEST, captcha).unwrap();
-        assert_eq!(expected, actual);
-    }
 }

crates/bitwarden-core/src/auth/api/response/identity_token_response.rs

@@ -1,4 +1,3 @@
-mod identity_captcha_response;
 mod identity_payload_response;
 mod identity_refresh_response;
 mod identity_success_response;
@@ -8,7 +7,6 @@ mod identity_two_factor_response;
 pub(crate) mod two_factor_provider_data;
 mod two_factor_providers;
 
-pub(crate) use identity_captcha_response::*;
 pub(crate) use identity_payload_response::*;
 pub(crate) use identity_refresh_response::*;
 pub(crate) use identity_success_response::*;

crates/bitwarden-core/src/auth/api/response/mod.rs

@@ -6,8 +6,7 @@ use schemars::JsonSchema;
 use serde::{Deserialize, Serialize};
 
 use crate::auth::{
-    api::response::IdentityTokenResponse,
-    login::response::{captcha_response::CaptchaResponse, two_factor::TwoFactorProviders},
+    api::response::IdentityTokenResponse, login::response::two_factor::TwoFactorProviders,
 };
 #[cfg(feature = "internal")]
 use crate::{
@@ -114,9 +113,6 @@ pub struct PasswordLoginResponse {
     /// The available two factor authentication options. Present only when authentication fails due
     /// to requiring a second authentication factor.
     pub two_factor: Option<TwoFactorProviders>,
-    /// The information required to present the user with a captcha challenge. Only present when
-    /// authentication fails due to requiring validation of a captcha challenge.
-    pub captcha: Option<CaptchaResponse>,
 }
 
 impl PasswordLoginResponse {
@@ -127,28 +123,18 @@ impl PasswordLoginResponse {
                 reset_master_password: success.reset_master_password,
                 force_password_reset: success.force_password_reset,
                 two_factor: None,
-                captcha: None,
             },
             IdentityTokenResponse::Payload(_) => PasswordLoginResponse {
                 authenticated: true,
                 reset_master_password: false,
                 force_password_reset: false,
                 two_factor: None,
-                captcha: None,
             },
             IdentityTokenResponse::TwoFactorRequired(two_factor) => PasswordLoginResponse {
                 authenticated: false,
                 reset_master_password: false,
                 force_password_reset: false,
                 two_factor: Some(two_factor.two_factor_providers.into()),
-                captcha: two_factor.captcha_token.map(Into::into),
-            },
-            IdentityTokenResponse::CaptchaRequired(captcha) => PasswordLoginResponse {
-                authenticated: false,
-                reset_master_password: false,
-                force_password_reset: false,
-                two_factor: None,
-                captcha: Some(captcha.site_key.into()),
             },
             IdentityTokenResponse::Refreshed(_) => {
                 unreachable!("Got a `refresh_token` answer to a login request")

crates/bitwarden-core/src/auth/login/password.rs

@@ -1,4 +1,2 @@
 #[allow(missing_docs)]
-pub mod captcha_response;
-#[allow(missing_docs)]
 pub mod two_factor;

crates/bitwarden-core/src/auth/login/response/captcha_response.rs

@@ -28,10 +28,7 @@ pub(crate) async fn login_password(client: Client, email: Option<String>) -> Res
         })
         .await?;
 
-    if result.captcha.is_some() {
-        // TODO: We should build a web captcha solution
-        error!("Captcha required");
-    } else if let Some(two_factor) = result.two_factor {
+    if let Some(two_factor) = result.two_factor {
         error!("{two_factor:?}");
 
         let two_factor = if let Some(tf) = two_factor.authenticator {