Merge branch 'main' into ps/use-proper-error-uniffi

Author: dani-garcia

Cargo.lock

@@ -34,6 +34,7 @@ bitwarden-exporters = { path = "crates/bitwarden-exporters", version = "=1.0.0"
 bitwarden-fido = { path = "crates/bitwarden-fido", version = "=1.0.0" }
 bitwarden-generators = { path = "crates/bitwarden-generators", version = "=1.0.0" }
 bitwarden-ipc = { path = "crates/bitwarden-ipc", version = "=1.0.0" }
+bitwarden-pm = { path = "crates/bitwarden-pm", version = "=1.0.0" }
 bitwarden-send = { path = "crates/bitwarden-send", version = "=1.0.0" }
 bitwarden-sm = { path = "bitwarden_license/bitwarden-sm", version = "=1.0.0" }
 bitwarden-ssh = { path = "crates/bitwarden-ssh", version = "=1.0.0" }

Cargo.toml

@@ -23,7 +23,7 @@ pub struct CipherDetailsResponseModel {
     #[serde(rename = "type", skip_serializing_if = "Option::is_none")]
     pub r#type: Option<models::CipherType>,
     #[serde(rename = "data", skip_serializing_if = "Option::is_none")]
-    pub data: Option<serde_json::Value>,
+    pub data: Option<String>,
     #[serde(rename = "name", skip_serializing_if = "Option::is_none")]
     pub name: Option<String>,
     #[serde(rename = "notes", skip_serializing_if = "Option::is_none")]

crates/bitwarden-api-api/src/models/cipher_details_response_model.rs

@@ -23,7 +23,7 @@ pub struct CipherMiniDetailsResponseModel {
     #[serde(rename = "type", skip_serializing_if = "Option::is_none")]
     pub r#type: Option<models::CipherType>,
     #[serde(rename = "data", skip_serializing_if = "Option::is_none")]
-    pub data: Option<serde_json::Value>,
+    pub data: Option<String>,
     #[serde(rename = "name", skip_serializing_if = "Option::is_none")]
     pub name: Option<String>,
     #[serde(rename = "notes", skip_serializing_if = "Option::is_none")]

crates/bitwarden-api-api/src/models/cipher_mini_details_response_model.rs

@@ -23,7 +23,7 @@ pub struct CipherMiniResponseModel {
     #[serde(rename = "type", skip_serializing_if = "Option::is_none")]
     pub r#type: Option<models::CipherType>,
     #[serde(rename = "data", skip_serializing_if = "Option::is_none")]
-    pub data: Option<serde_json::Value>,
+    pub data: Option<String>,
     #[serde(rename = "name", skip_serializing_if = "Option::is_none")]
     pub name: Option<String>,
     #[serde(rename = "notes", skip_serializing_if = "Option::is_none")]

crates/bitwarden-api-api/src/models/cipher_mini_response_model.rs

@@ -51,6 +51,9 @@ pub struct CipherRequestModel {
     pub secure_note: Option<Box<models::CipherSecureNoteModel>>,
     #[serde(rename = "sshKey", skip_serializing_if = "Option::is_none")]
     pub ssh_key: Option<Box<models::CipherSshKeyModel>>,
+    /// JSON string containing cipher-specific data
+    #[serde(rename = "data", skip_serializing_if = "Option::is_none")]
+    pub data: Option<String>,
     #[serde(
         rename = "lastKnownRevisionDate",
         skip_serializing_if = "Option::is_none"
@@ -81,6 +84,7 @@ impl CipherRequestModel {
             identity: None,
             secure_note: None,
             ssh_key: None,
+            data: None,
             last_known_revision_date: None,
             archived_date: None,
         }

crates/bitwarden-api-api/src/models/cipher_request_model.rs

@@ -23,7 +23,7 @@ pub struct CipherResponseModel {
     #[serde(rename = "type", skip_serializing_if = "Option::is_none")]
     pub r#type: Option<models::CipherType>,
     #[serde(rename = "data", skip_serializing_if = "Option::is_none")]
-    pub data: Option<serde_json::Value>,
+    pub data: Option<String>,
     #[serde(rename = "name", skip_serializing_if = "Option::is_none")]
     pub name: Option<String>,
     #[serde(rename = "notes", skip_serializing_if = "Option::is_none")]

crates/bitwarden-api-api/src/models/cipher_response_model.rs

@@ -51,6 +51,9 @@ pub struct CipherWithIdRequestModel {
     pub secure_note: Option<Box<models::CipherSecureNoteModel>>,
     #[serde(rename = "sshKey", skip_serializing_if = "Option::is_none")]
     pub ssh_key: Option<Box<models::CipherSshKeyModel>>,
+    /// JSON string containing cipher-specific data
+    #[serde(rename = "data", skip_serializing_if = "Option::is_none")]
+    pub data: Option<String>,
     #[serde(
         rename = "lastKnownRevisionDate",
         skip_serializing_if = "Option::is_none"
@@ -83,6 +86,7 @@ impl CipherWithIdRequestModel {
             identity: None,
             secure_note: None,
             ssh_key: None,
+            data: None,
             last_known_revision_date: None,
             archived_date: None,
             id,

crates/bitwarden-api-api/src/models/cipher_with_id_request_model.rs

@@ -22,23 +22,21 @@ wasm = [
     "dep:wasm-bindgen-futures"
 ] # WASM support
 
-# Note: dependencies must be alphabetized to pass the cargo sort check in the CI pipeline..
+# Note: dependencies must be alphabetized to pass the cargo sort check in the CI pipeline.
 [dependencies]
 bitwarden-core = { workspace = true, features = ["internal"] }
 bitwarden-error = { workspace = true }
 chrono = { workspace = true }
 reqwest = { workspace = true }
 serde = { workspace = true }
-serde_json = { workspace = true }
-serde_qs = { workspace = true }
-serde_urlencoded = ">=0.7.1, <0.8"
 thiserror = { workspace = true }
 tsify = { workspace = true, optional = true }
 wasm-bindgen = { workspace = true, optional = true }
 wasm-bindgen-futures = { workspace = true, optional = true }
 
 [dev-dependencies]
 bitwarden-test = { workspace = true }
+serde_json = { workspace = true }
 tokio = { workspace = true, features = ["rt"] }
 wiremock = "0.6.0"
 

crates/bitwarden-auth/Cargo.toml

@@ -49,16 +49,9 @@ impl SendAccessClient {
             .identity
             .client
             .post(&url)
-            .header(
-                reqwest::header::CONTENT_TYPE,
-                "application/x-www-form-urlencoded; charset=utf-8",
-            )
             .header(reqwest::header::ACCEPT, "application/json")
             .header(reqwest::header::CACHE_CONTROL, "no-store")
-            // We can use `serde_urlencoded` to serialize the payload into a URL-encoded string
-            // because we don't have complex nested structures in the payload.
-            // If we had nested structures, we have to use serde_qs::to_string instead.
-            .body(serde_urlencoded::to_string(&payload).expect("Serialize should be infallible"));
+            .form(&payload);
 
         // Because of the ? operator, any errors from sending the request are automatically
         // wrapped in SendAccessTokenError::Unexpected as an UnexpectedIdentityError::Reqwest
@@ -164,7 +157,7 @@ mod tests {
                 // expect the headers we set in the client
                 .and(matchers::header(
                     reqwest::header::CONTENT_TYPE.as_str(),
-                    "application/x-www-form-urlencoded; charset=utf-8",
+                    "application/x-www-form-urlencoded",
                 ))
                 .and(matchers::header(
                     reqwest::header::ACCEPT.as_str(),
@@ -234,7 +227,7 @@ mod tests {
                 // expect the headers we set in the client
                 .and(matchers::header(
                     reqwest::header::CONTENT_TYPE.as_str(),
-                    "application/x-www-form-urlencoded; charset=utf-8",
+                    "application/x-www-form-urlencoded",
                 ))
                 .and(matchers::header(
                     reqwest::header::ACCEPT.as_str(),
@@ -298,8 +291,6 @@ mod tests {
                 otp: otp.into(),
             };
 
-            let email_param = serde_urlencoded::to_string([("email", email)]).unwrap(); // "email=valid%40email.com"
-
             let req = SendAccessTokenRequest {
                 send_id: "valid-send-id".into(),
                 send_access_credentials: Some(SendAccessCredentials::EmailOtp(
@@ -312,7 +303,7 @@ mod tests {
                 // expect the headers we set in the client
                 .and(matchers::header(
                     reqwest::header::CONTENT_TYPE.as_str(),
-                    "application/x-www-form-urlencoded; charset=utf-8",
+                    "application/x-www-form-urlencoded",
                 ))
                 .and(matchers::header(
                     reqwest::header::ACCEPT.as_str(),
@@ -330,7 +321,7 @@ mod tests {
                 )))
                 .and(body_string_contains(format!("scope={}", scope_str)))
                 .and(body_string_contains(format!("send_id={}", req.send_id)))
-                .and(body_string_contains(email_param))
+                .and(body_string_contains("email=valid%40email.com"))
                 .and(body_string_contains(format!("otp={}", otp)))
                 // respond with the mock success response
                 .respond_with(ResponseTemplate::new(200).set_body_json(raw_success));