From 7ce4ac3239e9a6168a85a72df89b1b8a81d32f8d Mon Sep 17 00:00:00 2001 From: Gregory Schier Date: Mon, 30 Oct 2023 08:07:34 -0700 Subject: [PATCH] Fix GQL introspection and bearer auth templating --- src-tauri/src/main.rs | 5 +++-- src-tauri/tauri.conf.json | 2 +- src-web/components/BearerAuth.tsx | 2 ++ 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src-tauri/src/main.rs b/src-tauri/src/main.rs index d76a97d4..182ca7b8 100644 --- a/src-tauri/src/main.rs +++ b/src-tauri/src/main.rs @@ -65,13 +65,14 @@ async fn migrate_db( #[tauri::command] async fn send_ephemeral_request( request: models::HttpRequest, - environment_id: &str, + environment_id: Option<&str>, app_handle: AppHandle, db_instance: State<'_, Mutex>>, ) -> Result { let pool = &*db_instance.lock().await; let response = models::HttpResponse::default(); - return actually_send_ephemeral_request(request, &response, &environment_id, &app_handle, pool) + let environment_id2 = environment_id.unwrap_or("n/a").to_string(); + return actually_send_ephemeral_request(request, &response, &environment_id2, &app_handle, pool) .await; } diff --git a/src-tauri/tauri.conf.json b/src-tauri/tauri.conf.json index c9a76d24..6c409991 100644 --- a/src-tauri/tauri.conf.json +++ b/src-tauri/tauri.conf.json @@ -8,7 +8,7 @@ }, "package": { "productName": "Yaak", - "version": "2023.1.6" + "version": "2023.1.7" }, "tauri": { "windows": [], diff --git a/src-web/components/BearerAuth.tsx b/src-web/components/BearerAuth.tsx index 7ce6134a..1a63f049 100644 --- a/src-web/components/BearerAuth.tsx +++ b/src-web/components/BearerAuth.tsx @@ -15,6 +15,8 @@ export function BearerAuth({ requestId, authentication }: Props) {