Fix multipart data getting json serialized when it shouldn't be

Author: C0D3-M4513R

src/apis/files_api.rs

@@ -1248,8 +1248,15 @@ pub async fn upload_image(
     if let Some(param_value) = p_form_mask_tag {
         multipart_form = multipart_form.text("maskTag", serde_json::to_string(&param_value)?);
     }
-    multipart_form = multipart_form.text("tag", serde_json::to_string(&p_form_tag)?);
-    //Replaced:    multipart_form = multipart_form.text("tag", p_form_tag.to_string());
+    macro_rules! serialize {
+        ($form:ident, data, $data:ident) => {
+            $form = $form.text("data", serde_json::to_string(&$data)?);
+        };
+        ($form:ident, $tag:ident, $data:ident) => {
+            $form = $form.text(stringify!($tag), $data.to_string());
+        };
+    }
+    serialize!(multipart_form, tag, p_form_tag);
     req_builder = req_builder.multipart(multipart_form);
 
     let req = req_builder.build()?;

src/apis/invite_api.rs

@@ -346,8 +346,15 @@ pub async fn invite_user_with_photo(
         req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
     let mut multipart_form = reqwest::multipart::Form::new();
-    multipart_form = multipart_form.text("data", serde_json::to_string(&p_form_data)?);
-    //Replaced:    multipart_form = multipart_form.text("data", p_form_data.to_string());
+    macro_rules! serialize {
+        ($form:ident, data, $data:ident) => {
+            $form = $form.text("data", serde_json::to_string(&$data)?);
+        };
+        ($form:ident, $tag:ident, $data:ident) => {
+            $form = $form.text(stringify!($tag), $data.to_string());
+        };
+    }
+    serialize!(multipart_form, data, p_form_data);
     let file = TokioFile::open(&p_form_image).await?;
     let stream = FramedRead::new(file, BytesCodec::new());
     let file_name = p_form_image
@@ -466,8 +473,15 @@ pub async fn request_invite_with_photo(
         req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
     let mut multipart_form = reqwest::multipart::Form::new();
-    multipart_form = multipart_form.text("data", serde_json::to_string(&p_form_data)?);
-    //Replaced:    multipart_form = multipart_form.text("data", p_form_data.to_string());
+    macro_rules! serialize {
+        ($form:ident, data, $data:ident) => {
+            $form = $form.text("data", serde_json::to_string(&$data)?);
+        };
+        ($form:ident, $tag:ident, $data:ident) => {
+            $form = $form.text(stringify!($tag), $data.to_string());
+        };
+    }
+    serialize!(multipart_form, data, p_form_data);
     let file = TokioFile::open(&p_form_image).await?;
     let stream = FramedRead::new(file, BytesCodec::new());
     let file_name = p_form_image
@@ -642,8 +656,15 @@ pub async fn respond_invite_with_photo(
         req_builder = req_builder.header(reqwest::header::USER_AGENT, user_agent.clone());
     }
     let mut multipart_form = reqwest::multipart::Form::new();
-    multipart_form = multipart_form.text("data", serde_json::to_string(&p_form_data)?);
-    //Replaced:    multipart_form = multipart_form.text("data", p_form_data.to_string());
+    macro_rules! serialize {
+        ($form:ident, data, $data:ident) => {
+            $form = $form.text("data", serde_json::to_string(&$data)?);
+        };
+        ($form:ident, $tag:ident, $data:ident) => {
+            $form = $form.text(stringify!($tag), $data.to_string());
+        };
+    }
+    serialize!(multipart_form, data, p_form_data);
     let file = TokioFile::open(&p_form_image).await?;
     let stream = FramedRead::new(file, BytesCodec::new());
     let file_name = p_form_image

src/apis/prints_api.rs

@@ -294,8 +294,15 @@ pub async fn upload_print(
     if let Some(param_value) = p_form_note {
         multipart_form = multipart_form.text("note", param_value.to_string());
     }
-    multipart_form = multipart_form.text("timestamp", serde_json::to_string(&p_form_timestamp)?);
-    //Replaced:    multipart_form = multipart_form.text("timestamp", p_form_timestamp.to_string());
+    macro_rules! serialize {
+        ($form:ident, data, $data:ident) => {
+            $form = $form.text("data", serde_json::to_string(&$data)?);
+        };
+        ($form:ident, $tag:ident, $data:ident) => {
+            $form = $form.text(stringify!($tag), $data.to_string());
+        };
+    }
+    serialize!(multipart_form, timestamp, p_form_timestamp);
     if let Some(param_value) = p_form_world_id {
         multipart_form = multipart_form.text("worldId", param_value.to_string());
     }

templates/reqwest/api.mustache

@@ -483,8 +483,15 @@ pub {{#supportAsync}}async {{/supportAsync}}fn {{{operationId}}}(configuration:
     {{^isFile}}
     {{#required}}
     {{^isNullable}}
-    multipart_form = multipart_form.text("{{{baseName}}}", serde_json::to_string(&{{{vendorExtensions.x-rust-param-identifier}}})?);
-//Replaced:    multipart_form = multipart_form.text("{{{baseName}}}", {{{vendorExtensions.x-rust-param-identifier}}}{{#isArray}}.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(","){{/isArray}}.to_string());
+    macro_rules! serialize {
+        ($form:ident, data, $data:ident) => {
+            $form = $form.text("data", serde_json::to_string(&$data)?);
+        };
+        ($form:ident, $tag:ident, $data:ident) => {
+            $form = $form.text(stringify!($tag), $data{{#isArray}}.into_iter().map(|p| p.to_string()).collect::<Vec<String>>().join(","){{/isArray}}.to_string());
+        };
+    }
+    serialize!(multipart_form, {{{baseName}}}, {{{vendorExtensions.x-rust-param-identifier}}});
     {{/isNullable}}
     {{#isNullable}}
     match {{{vendorExtensions.x-rust-param-identifier}}} {