CloneRepos/CYD-Klipper
2
0
Fork 0
mirror of https://github.com/suchmememanyskill/CYD-Klipper.git synced 2026-03-21 05:33:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix auth on minimal requests

Browse Source
This commit is contained in:
suchmememanyskill
2024-07-14 19:54:38 +02:00
parent 5d2571ef83
commit 04d890227e
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CYD-Klipper/src/core/data_setup.cpp
View File

@@ -349,7 +349,7 @@ void fetch_printer_data_minimal()
delay(10); delay(10);
HTTPClient client; 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(); freeze_request_thread();
int httpCode = client.GET(); int httpCode = client.GET();

11
CYD-Klipper/src/core/http_client.cpp
View File

@@ -2,16 +2,19 @@
String get_full_url(String url_part, PRINTER_CONFIG * config) 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; 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){ if (stream){
client.useHTTP10(true); client.useHTTP10(true);
} }

7
CYD-Klipper/src/core/http_client.h
View File

@@ -3,11 +3,8 @@
#include <HTTPClient.h> #include <HTTPClient.h>
#include "../conf/global_config.h" #include "../conf/global_config.h"
String get_full_url(String url_part); String get_full_url(String url_part, PRINTER_CONFIG * config = NULL);
String get_full_url(String url_part, PRINTER_CONFIG * config); void configure_http_client(HTTPClient &client, String url, bool stream = true, int timeout = 1000, PRINTER_CONFIG * config = NULL);
void configure_http_client(HTTPClient &client, String url, bool stream = true, int timeout = 1000);
#define SETUP_HTTP_CLIENT(url_part) HTTPClient client; configure_http_client(client, get_full_url(url_part)); #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); #define SETUP_HTTP_CLIENT_FULL(url_part, stream, timeout) HTTPClient client; configure_http_client(client, get_full_url(url_part), stream, timeout);