Skip to content

Commit cca3b95

Browse files
sneakernutsHinton
andauthored
SRE-2330 cleanup references to auth-email (#286)
## 🎟️ Tracking https://bitwarden.atlassian.net/browse/SRE-2330 ## 📔 Objective Part of overall effort to deprecate auth-email header Server side changes: bitwarden/server#5709 ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## 🦮 Reviewer guidelines <!-- Suggested interactions but feel free to use (or not) as you desire! --> - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹ️ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠️ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or ♻️ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --------- Co-authored-by: Oscar Hinton <[email protected]>
1 parent 20e3dfa commit cca3b95

File tree

8 files changed

+6
-17
lines changed

8 files changed

+6
-17
lines changed

crates/bitwarden-core/src/auth/api/request/access_token_request.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ impl AccessTokenRequest {
3131
&self,
3232
configurations: &ApiConfigurations,
3333
) -> Result<IdentityTokenResponse, LoginError> {
34-
super::send_identity_connect_request(configurations, None, &self).await
34+
super::send_identity_connect_request(configurations, &self).await
3535
}
3636
}

crates/bitwarden-core/src/auth/api/request/api_token_request.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,6 @@ impl ApiTokenRequest {
3939
&self,
4040
configurations: &ApiConfigurations,
4141
) -> Result<IdentityTokenResponse, LoginError> {
42-
super::send_identity_connect_request(configurations, None, &self).await
42+
super::send_identity_connect_request(configurations, &self).await
4343
}
4444
}

crates/bitwarden-core/src/auth/api/request/auth_request_token_request.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,6 @@ impl AuthRequestTokenRequest {
5555
&self,
5656
configurations: &ApiConfigurations,
5757
) -> Result<IdentityTokenResponse, LoginError> {
58-
super::send_identity_connect_request(configurations, Some(&self.email), &self).await
58+
super::send_identity_connect_request(configurations, &self).await
5959
}
6060
}

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

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ mod password_token_request;
1212
pub(crate) use password_token_request::*;
1313

1414
mod renew_token_request;
15-
use base64::{engine::general_purpose::URL_SAFE_NO_PAD, Engine};
1615
pub(crate) use renew_token_request::*;
1716

1817
mod auth_request_token_request;
@@ -30,7 +29,6 @@ use crate::{
3029

3130
async fn send_identity_connect_request(
3231
configurations: &ApiConfigurations,
33-
email: Option<&str>,
3432
body: impl serde::Serialize,
3533
) -> Result<IdentityTokenResponse, LoginError> {
3634
let mut request = configurations
@@ -51,10 +49,6 @@ async fn send_identity_connect_request(
5149
request = request.header(reqwest::header::USER_AGENT, user_agent.clone());
5250
}
5351

54-
if let Some(email) = email {
55-
request = request.header("Auth-Email", URL_SAFE_NO_PAD.encode(email.as_bytes()));
56-
}
57-
5852
let response = request
5953
.body(serde_qs::to_string(&body).expect("Serialize should be infallible"))
6054
.send()

crates/bitwarden-core/src/auth/api/request/password_token_request.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ impl PasswordTokenRequest {
6464
&self,
6565
configurations: &ApiConfigurations,
6666
) -> Result<IdentityTokenResponse, LoginError> {
67-
super::send_identity_connect_request(configurations, Some(&self.email), &self).await
67+
super::send_identity_connect_request(configurations, &self).await
6868
}
6969
}

crates/bitwarden-core/src/auth/api/request/renew_token_request.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ impl RenewTokenRequest {
2525
&self,
2626
configurations: &ApiConfigurations,
2727
) -> Result<IdentityTokenResponse, LoginError> {
28-
super::send_identity_connect_request(configurations, None, &self).await
28+
super::send_identity_connect_request(configurations, &self).await
2929
}
3030
}

crates/bitwarden-uniffi/kotlin/app/src/main/java/com/bitwarden/myapplication/MainActivity.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -234,7 +234,6 @@ class MainActivity : FragmentActivity() {
234234

235235
val loginBody = http.post(IDENTITY_URL + "connect/token") {
236236
contentType(ContentType.Application.Json)
237-
header("Auth-Email", Base64.getEncoder().encodeToString(EMAIL.toByteArray()))
238237
setBody(FormDataContent(Parameters.build {
239238
append("scope", "api offline_access")
240239
append("client_id", "web")

crates/bitwarden-uniffi/swift/iOS/App/ContentView.swift

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,9 @@ struct ContentView: View {
160160
let (loginDataJson, _) = try await http.data(
161161
for: request(
162162
method: "POST", url: IDENTITY_URL + "connect/token",
163-
fn: { r in
164-
r.setValue(
165-
EMAIL.data(using: .utf8)?.base64EncodedString(),
166-
forHTTPHeaderField: "Auth-Email")
163+
fn: { r in
167164
r.setValue(
168165
"application/x-www-form-urlencoded", forHTTPHeaderField: "Content-Type")
169-
170166
var comp = URLComponents()
171167
comp.queryItems = [
172168
URLQueryItem(name: "scope", value: "api offline_access"),

0 commit comments

Comments
 (0)