From e8e0097e2d10a133f2eca3a906eeb6123fa1ee53 Mon Sep 17 00:00:00 2001 From: Quentin Ross Date: Wed, 29 Oct 2025 11:16:07 -0400 Subject: [PATCH] Fix websocket url parameters not parsing variables (#281) --- src-tauri/yaak-ws/src/render.rs | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src-tauri/yaak-ws/src/render.rs b/src-tauri/yaak-ws/src/render.rs index 7f667be6..36cbac03 100644 --- a/src-tauri/yaak-ws/src/render.rs +++ b/src-tauri/yaak-ws/src/render.rs @@ -1,6 +1,6 @@ use crate::error::Result; use std::collections::BTreeMap; -use yaak_models::models::{Environment, HttpRequestHeader, WebsocketRequest}; +use yaak_models::models::{Environment, HttpRequestHeader, HttpUrlParameter, WebsocketRequest}; use yaak_models::render::make_vars_hashmap; use yaak_templates::{parse_and_render, render_json_value_raw, RenderOptions, TemplateCallback}; @@ -12,6 +12,16 @@ pub async fn render_websocket_request( ) -> Result { let vars = &make_vars_hashmap(environment_chain); + let mut url_parameters = Vec::new(); + for p in r.url_parameters.clone() { + url_parameters.push(HttpUrlParameter { + enabled: p.enabled, + name: parse_and_render(&p.name, vars, cb, opt).await?, + value: parse_and_render(&p.value, vars, cb, opt).await?, + id: p.id, + }) + } + let mut headers = Vec::new(); for p in r.headers.clone() { headers.push(HttpRequestHeader { @@ -33,6 +43,7 @@ pub async fn render_websocket_request( Ok(WebsocketRequest { url, + url_parameters, headers, authentication, message,