starred/yaak-mountain-loop
1
0
Fork 0
mirror of https://github.com/mountain-loop/yaak.git synced 2026-04-23 00:58:32 +02:00
Code Issues 8 Packages Projects Releases 10 Wiki Activity

Fix GraphQL body handling

Browse Source
This commit is contained in:
Gregory Schier
2024-11-18 07:17:19 -08:00
parent 3ecfb15c89
commit 0cfec0ada6
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src-tauri/src/http_request.rs
View File

@@ -243,7 +243,7 @@ pub async fn send_http_request<R: Runtime>(
let request_body = rendered_request.body; let request_body = rendered_request.body;
if let Some(body_type) = &rendered_request.body_type { if let Some(body_type) = &rendered_request.body_type {
if request_body.contains_key("query") && request_body.contains_key("variables") { if body_type == "graphql" {
let query = get_str_h(&request_body, "query"); let query = get_str_h(&request_body, "query");
let variables = get_str_h(&request_body, "variables"); let variables = get_str_h(&request_body, "variables");
let body = if variables.trim().is_empty() { let body = if variables.trim().is_empty() {
@@ -255,9 +255,6 @@ pub async fn send_http_request<R: Runtime>(
) )
}; };
request_builder = request_builder.body(body.to_owned()); request_builder = request_builder.body(body.to_owned());
} else if request_body.contains_key("text") {
let body = get_str_h(&request_body, "text");
request_builder = request_builder.body(body.to_owned());
} else if body_type == "application/x-www-form-urlencoded" } else if body_type == "application/x-www-form-urlencoded"
&& request_body.contains_key("form") && request_body.contains_key("form")
{ {
@@ -359,6 +356,9 @@ pub async fn send_http_request<R: Runtime>(
} }
headers.remove("Content-Type"); // reqwest will add this automatically headers.remove("Content-Type"); // reqwest will add this automatically
request_builder = request_builder.multipart(multipart_form); request_builder = request_builder.multipart(multipart_form);
} else if request_body.contains_key("text") {
let body = get_str_h(&request_body, "text");
request_builder = request_builder.body(body.to_owned());
} else { } else {
warn!("Unsupported body type: {}", body_type); warn!("Unsupported body type: {}", body_type);
} }