From a258a80fbdaf2eb8e1bbaeed22db32e2a9f50c57 Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Wed, 23 Jul 2025 17:20:17 -0700 Subject: [PATCH] Prevent auth from adding lone ? to URL https://feedback.yaak.app/p/using-inherited-api-key-causes-a-question-mark-to-be --- src-tauri/src/http_request.rs | 9 +++++---- src-tauri/yaak-ws/src/commands.rs | 8 +++++--- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src-tauri/src/http_request.rs b/src-tauri/src/http_request.rs index fae454e3..c6c595f1 100644 --- a/src-tauri/src/http_request.rs +++ b/src-tauri/src/http_request.rs @@ -488,10 +488,11 @@ pub async fn send_http_request( }; } - let mut query_pairs = sendable_req.url_mut().query_pairs_mut(); - for p in plugin_result.set_query_parameters.unwrap_or_default() { - println!("Adding query parameter: {:?}", p); - query_pairs.append_pair(&p.name, &p.value); + if let Some(params) = plugin_result.set_query_parameters { + let mut query_pairs = sendable_req.url_mut().query_pairs_mut(); + for p in params { + query_pairs.append_pair(&p.name, &p.value); + } } } } diff --git a/src-tauri/yaak-ws/src/commands.rs b/src-tauri/yaak-ws/src/commands.rs index 294549be..c606287b 100644 --- a/src-tauri/yaak-ws/src/commands.rs +++ b/src-tauri/yaak-ws/src/commands.rs @@ -294,9 +294,11 @@ pub(crate) async fn connect( _ => continue, }; } - let mut query_pairs = url.query_pairs_mut(); - for p in plugin_result.set_query_parameters.unwrap_or_default() { - query_pairs.append_pair(&p.name, &p.value); + if let Some(params) = plugin_result.set_query_parameters { + let mut query_pairs = url.query_pairs_mut(); + for p in params { + query_pairs.append_pair(&p.name, &p.value); + } } } }