Skip to content

Commit

Permalink
fix(core): do not serialize strings in http api form, closes #3910 (#…
Browse files Browse the repository at this point in the history
  • Loading branch information
lucasfernog authored Apr 20, 2022
1 parent 395a259 commit cc35608
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 5 deletions.
5 changes: 5 additions & 0 deletions .changes/fix-form-serialization.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri": patch
---

Fixes the HTTP API form text fields.
5 changes: 5 additions & 0 deletions .changes/remove-form-part-file.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
---
"tauri": patch
---

**Breaking change:** Removed `tauri::api::http::FormPart::File`.
6 changes: 1 addition & 5 deletions core/tauri/src/api/http.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ use serde_json::Value;
use serde_repr::{Deserialize_repr, Serialize_repr};
use url::Url;

use std::{collections::HashMap, path::PathBuf, time::Duration};
use std::{collections::HashMap, time::Duration};

/// The builder of [`Client`].
#[derive(Debug, Clone, Default, Deserialize)]
Expand Down Expand Up @@ -129,7 +129,6 @@ impl Client {
for (name, part) in form_body.0 {
match part {
FormPart::Bytes(bytes) => form.push((name, serde_json::to_string(&bytes)?)),
FormPart::File(file_path) => form.push((name, serde_json::to_string(&file_path)?)),
FormPart::Text(text) => form.push((name, text)),
}
}
Expand Down Expand Up @@ -176,7 +175,6 @@ impl Client {
for (name, part) in form_body.0 {
match part {
FormPart::Bytes(bytes) => form.push((name, serde_json::to_string(&bytes)?)),
FormPart::File(file_path) => form.push((name, serde_json::to_string(&file_path)?)),
FormPart::Text(text) => form.push((name, text)),
}
}
Expand Down Expand Up @@ -222,8 +220,6 @@ pub enum ResponseType {
#[serde(untagged)]
#[non_exhaustive]
pub enum FormPart {
/// A file path value.
File(PathBuf),
/// A string value.
Text(String),
/// A byte array value.
Expand Down

0 comments on commit cc35608

Please sign in to comment.