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

Fix auth tab crash when template rendering fails (#392)

Browse Source
This commit is contained in:
Gregory Schier
2026-02-11 14:59:17 -08:00
committed by GitHub
parent 26aba6034f
commit 565e053ee8
2 changed files with 11 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
crates-tauri/yaak-app/src/lib.rs
View File

@@ -1095,8 +1095,13 @@ async fn cmd_get_http_authentication_config<R: Runtime>(
// Convert HashMap<String, JsonPrimitive> to serde_json::Value for rendering // Convert HashMap<String, JsonPrimitive> to serde_json::Value for rendering
let values_json: serde_json::Value = serde_json::to_value(&values)?; let values_json: serde_json::Value = serde_json::to_value(&values)?;
let rendered_json = let rendered_json = render_json_value(
render_json_value(values_json, environment_chain, &cb, &RenderOptions::throw()).await?; values_json,
environment_chain,
&cb,
&RenderOptions::return_empty(),
)
.await?;
// Convert back to HashMap<String, JsonPrimitive> // Convert back to HashMap<String, JsonPrimitive>
let rendered_values: HashMap<String, JsonPrimitive> = serde_json::from_value(rendered_json)?; let rendered_values: HashMap<String, JsonPrimitive> = serde_json::from_value(rendered_json)?;

4
crates/yaak-templates/src/renderer.rs
View File

@@ -81,6 +81,10 @@ impl RenderOptions {
pub fn throw() -> Self { pub fn throw() -> Self {
Self { error_behavior: RenderErrorBehavior::Throw } Self { error_behavior: RenderErrorBehavior::Throw }
} }
pub fn return_empty() -> Self {
Self { error_behavior: RenderErrorBehavior::ReturnEmpty }
}
} }
impl RenderErrorBehavior { impl RenderErrorBehavior {