Fix auth on minimal requests

suchmememanyskill · Jul 14, 2024 · 04d8902 · 04d8902
1 parent 5d2571e
commit 04d8902
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/CYD-Klipper/src/core/data_setup.cpp b/CYD-Klipper/src/core/data_setup.cpp
@@ -349,7 +349,7 @@ void fetch_printer_data_minimal()
 
         delay(10);
         HTTPClient client;
-        configure_http_client(client, get_full_url("/printer/objects/query?webhooks&print_stats&virtual_sdcard", config), true, 1000);
+        configure_http_client(client, get_full_url("/printer/objects/query?webhooks&print_stats&virtual_sdcard", config), true, 1000, config);
         freeze_request_thread();
 
         int httpCode = client.GET();

diff --git a/CYD-Klipper/src/core/http_client.cpp b/CYD-Klipper/src/core/http_client.cpp
@@ -2,16 +2,19 @@
 
 String get_full_url(String url_part, PRINTER_CONFIG * config)
 {
+    if (config == NULL){
+        config = get_current_printer_config();
+    }
+
     return "http://" + String(config->klipper_host) + ":" + String(config->klipper_port) + url_part;
 }
 
-String get_full_url(String url_part)
+void configure_http_client(HTTPClient &client, String url, bool stream, int timeout, PRINTER_CONFIG * config)
 {
-    return "http://" + String(get_current_printer_config()->klipper_host) + ":" + String(get_current_printer_config()->klipper_port) + url_part;
-}
+    if (config == NULL){
+        config = get_current_printer_config();
+    }
 
-void configure_http_client(HTTPClient &client, String url, bool stream, int timeout)
-{
     if (stream){
         client.useHTTP10(true);
     }

diff --git a/CYD-Klipper/src/core/http_client.h b/CYD-Klipper/src/core/http_client.h
@@ -3,11 +3,8 @@
 #include <HTTPClient.h>
 #include "../conf/global_config.h"
 
-String get_full_url(String url_part);
-String get_full_url(String url_part, PRINTER_CONFIG * config);
-
-void configure_http_client(HTTPClient &client, String url, bool stream = true, int timeout = 1000);
+String get_full_url(String url_part, PRINTER_CONFIG * config = NULL);
+void configure_http_client(HTTPClient &client, String url, bool stream = true, int timeout = 1000, PRINTER_CONFIG * config = NULL);
 
 #define SETUP_HTTP_CLIENT(url_part) HTTPClient client; configure_http_client(client, get_full_url(url_part));
-
 #define SETUP_HTTP_CLIENT_FULL(url_part, stream, timeout) HTTPClient client; configure_http_client(client, get_full_url(url_part), stream, timeout);