diff --git a/crates/bitwarden-core/src/auth/api/request/access_token_request.rs b/crates/bitwarden-core/src/auth/api/request/access_token_request.rs index 1a40f5d85..ba9fac2df 100644 --- a/crates/bitwarden-core/src/auth/api/request/access_token_request.rs +++ b/crates/bitwarden-core/src/auth/api/request/access_token_request.rs @@ -31,6 +31,6 @@ impl AccessTokenRequest { &self, configurations: &ApiConfigurations, ) -> Result { - super::send_identity_connect_request(configurations, None, &self).await + super::send_identity_connect_request(configurations, &self).await } } diff --git a/crates/bitwarden-core/src/auth/api/request/api_token_request.rs b/crates/bitwarden-core/src/auth/api/request/api_token_request.rs index e2c1e0696..f9a04f150 100644 --- a/crates/bitwarden-core/src/auth/api/request/api_token_request.rs +++ b/crates/bitwarden-core/src/auth/api/request/api_token_request.rs @@ -39,6 +39,6 @@ impl ApiTokenRequest { &self, configurations: &ApiConfigurations, ) -> Result { - super::send_identity_connect_request(configurations, None, &self).await + super::send_identity_connect_request(configurations, &self).await } } diff --git a/crates/bitwarden-core/src/auth/api/request/auth_request_token_request.rs b/crates/bitwarden-core/src/auth/api/request/auth_request_token_request.rs index 03a6220e1..cb547ecb7 100644 --- a/crates/bitwarden-core/src/auth/api/request/auth_request_token_request.rs +++ b/crates/bitwarden-core/src/auth/api/request/auth_request_token_request.rs @@ -55,6 +55,6 @@ impl AuthRequestTokenRequest { &self, configurations: &ApiConfigurations, ) -> Result { - super::send_identity_connect_request(configurations, Some(&self.email), &self).await + super::send_identity_connect_request(configurations, &self).await } } diff --git a/crates/bitwarden-core/src/auth/api/request/mod.rs b/crates/bitwarden-core/src/auth/api/request/mod.rs index 19f91e524..1974bf044 100644 --- a/crates/bitwarden-core/src/auth/api/request/mod.rs +++ b/crates/bitwarden-core/src/auth/api/request/mod.rs @@ -12,7 +12,6 @@ mod password_token_request; pub(crate) use password_token_request::*; mod renew_token_request; -use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine}; pub(crate) use renew_token_request::*; mod auth_request_token_request; @@ -30,7 +29,6 @@ use crate::{ async fn send_identity_connect_request( configurations: &ApiConfigurations, - email: Option<&str>, body: impl serde::Serialize, ) -> Result { let mut request = configurations @@ -51,10 +49,6 @@ async fn send_identity_connect_request( request = request.header(reqwest::header::USER_AGENT, user_agent.clone()); } - if let Some(email) = email { - request = request.header("Auth-Email", URL_SAFE_NO_PAD.encode(email.as_bytes())); - } - let response = request .body(serde_qs::to_string(&body).expect("Serialize should be infallible")) .send() diff --git a/crates/bitwarden-core/src/auth/api/request/password_token_request.rs b/crates/bitwarden-core/src/auth/api/request/password_token_request.rs index 2252859cd..c0c2a3d7c 100644 --- a/crates/bitwarden-core/src/auth/api/request/password_token_request.rs +++ b/crates/bitwarden-core/src/auth/api/request/password_token_request.rs @@ -64,6 +64,6 @@ impl PasswordTokenRequest { &self, configurations: &ApiConfigurations, ) -> Result { - super::send_identity_connect_request(configurations, Some(&self.email), &self).await + super::send_identity_connect_request(configurations, &self).await } } diff --git a/crates/bitwarden-core/src/auth/api/request/renew_token_request.rs b/crates/bitwarden-core/src/auth/api/request/renew_token_request.rs index e2808ee4f..8de6f3cc9 100644 --- a/crates/bitwarden-core/src/auth/api/request/renew_token_request.rs +++ b/crates/bitwarden-core/src/auth/api/request/renew_token_request.rs @@ -25,6 +25,6 @@ impl RenewTokenRequest { &self, configurations: &ApiConfigurations, ) -> Result { - super::send_identity_connect_request(configurations, None, &self).await + super::send_identity_connect_request(configurations, &self).await } } diff --git a/crates/bitwarden-uniffi/kotlin/app/src/main/java/com/bitwarden/myapplication/MainActivity.kt b/crates/bitwarden-uniffi/kotlin/app/src/main/java/com/bitwarden/myapplication/MainActivity.kt index 6e61cc7ef..51d162f2e 100644 --- a/crates/bitwarden-uniffi/kotlin/app/src/main/java/com/bitwarden/myapplication/MainActivity.kt +++ b/crates/bitwarden-uniffi/kotlin/app/src/main/java/com/bitwarden/myapplication/MainActivity.kt @@ -234,7 +234,6 @@ class MainActivity : FragmentActivity() { val loginBody = http.post(IDENTITY_URL + "connect/token") { contentType(ContentType.Application.Json) - header("Auth-Email", Base64.getEncoder().encodeToString(EMAIL.toByteArray())) setBody(FormDataContent(Parameters.build { append("scope", "api offline_access") append("client_id", "web") diff --git a/crates/bitwarden-uniffi/swift/iOS/App/ContentView.swift b/crates/bitwarden-uniffi/swift/iOS/App/ContentView.swift index 9ddaf6847..e75058aa5 100644 --- a/crates/bitwarden-uniffi/swift/iOS/App/ContentView.swift +++ b/crates/bitwarden-uniffi/swift/iOS/App/ContentView.swift @@ -160,13 +160,9 @@ struct ContentView: View { let (loginDataJson, _) = try await http.data( for: request( method: "POST", url: IDENTITY_URL + "connect/token", - fn: { r in - r.setValue( - EMAIL.data(using: .utf8)?.base64EncodedString(), - forHTTPHeaderField: "Auth-Email") + fn: { r in r.setValue( "application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type") - var comp = URLComponents() comp.queryItems = [ URLQueryItem(name: "scope", value: "api offline_access"),