Add API key flow

CYD-Klipper/src/conf/global_config.h

@@ -28,6 +28,9 @@ typedef struct _GLOBAL_CONFIG {
             bool onDuringPrint : 1;
             bool autoOtaUpdate : 1;
             unsigned char remaining_time_calc_mode : 2;
+
+            // Internal
+            bool auth_configured : 1;
         };
     };
     float screenCalXOffset;
@@ -47,6 +50,8 @@ typedef struct _GLOBAL_CONFIG {
 
     unsigned short hotend_presets[3];
     unsigned short bed_presets[3];
+
+    char klipper_auth[33];
 } GLOBAL_CONFIG;
     
 typedef struct _COLOR_DEF {

CYD-Klipper/src/core/data_setup.cpp

@@ -49,8 +49,11 @@ void send_gcode(bool wait, const char *gcode)
     sprintf(buff, "http://%s:%d/printer/gcode/script?script=%s", global_config.klipperHost, global_config.klipperPort, urlEncode(gcode).c_str());
     HTTPClient client;
     client.begin(buff);
-    int httpCode = client.GET();
 
+    if (global_config.auth_configured)
+        client.addHeader("X-Api-Key", global_config.klipper_auth);
+
+    int httpCode = client.GET();
 
     if (!wait)
     {
@@ -79,6 +82,10 @@ int get_slicer_time_estimate_s()
     HTTPClient client;
     client.useHTTP10(true);
     client.begin(buff);
+
+    if (global_config.auth_configured)
+        client.addHeader("X-Api-Key", global_config.klipper_auth);
+
     int httpCode = client.GET();
 
     if (httpCode != 200) 
@@ -126,6 +133,10 @@ void fetch_printer_data()
     HTTPClient client;
     client.useHTTP10(true);
     client.begin(buff);
+
+    if (global_config.auth_configured)
+        client.addHeader("X-Api-Key", global_config.klipper_auth);
+
     int httpCode = client.GET();
     delay(10);
     if (httpCode == 200)

CYD-Klipper/src/core/files_query.cpp

@@ -33,6 +33,10 @@ FILESYSTEM_FILE* get_files(int limit){
     client.useHTTP10(true);
     client.setTimeout(5000);
     client.begin(buff);
+
+    if (global_config.auth_configured)
+        client.addHeader("X-Api-Key", global_config.klipper_auth);
+
     int httpCode = client.GET();
     auto timer_parse = millis();
 

CYD-Klipper/src/core/macros_query.cpp

@@ -18,6 +18,10 @@ static void _macros_query_internal(){
     HTTPClient client;
     client.useHTTP10(true);
     client.begin(url.c_str());
+
+    if (global_config.auth_configured)
+        client.addHeader("X-Api-Key", global_config.klipper_auth);
+
     int httpCode = client.GET();
     if (httpCode == 200){
         JsonDocument doc;
@@ -57,6 +61,10 @@ void _power_devices_query_internal(){
     client.setTimeout(500);
     client.setConnectTimeout(1000);
     client.begin(url.c_str());
+
+    if (global_config.auth_configured)
+        client.addHeader("X-Api-Key", global_config.klipper_auth);
+
     int httpCode = client.GET();
     if (httpCode == 200){
         JsonDocument doc;
@@ -90,6 +98,10 @@ bool set_power_state(const char* device_name, bool state) {
     HTTPClient client;
     client.useHTTP10(true);
     client.begin(url.c_str());
+
+    if (global_config.auth_configured)
+        client.addHeader("X-Api-Key", global_config.klipper_auth);
+
     if (client.POST("") != 200)
         return false;
 

CYD-Klipper/src/ui/ip_setup.cpp

@@ -29,21 +29,35 @@ static const lv_btnmatrix_ctrl_t kb_ctrl[] = {
 
 void ip_init_inner();
 
-bool verify_ip(){
+enum connection_status_t {
+    CONNECT_FAIL = 0,
+    CONNECT_OK = 1,
+    CONNECT_AUTH_REQUIRED = 2,
+};
+
+connection_status_t verify_ip(){
     HTTPClient client;
     String url = "http://" + String(global_config.klipperHost) + ":" + String(global_config.klipperPort) + "/printer/info";
     int httpCode;
     try {
-        Serial.println(url);
         client.setTimeout(500);
         client.setConnectTimeout(1000);
         client.begin(url.c_str());
+
+        if (global_config.auth_configured)
+            client.addHeader("X-Api-Key", global_config.klipper_auth);
+
         httpCode = client.GET();
-        return httpCode == 200;
+        Serial.printf("%d %s", httpCode, url.c_str());
+
+        if (httpCode == 401)
+            return CONNECT_AUTH_REQUIRED;
+
+        return httpCode == 200 ? CONNECT_OK : CONNECT_FAIL;
     }
     catch (...) {
         Serial.println("Failed to connect");
-        return false;
+        return CONNECT_FAIL;
     }
 }
 
@@ -65,12 +79,19 @@ static void ta_event_cb(lv_event_t * e) {
         strcpy(global_config.klipperHost, lv_textarea_get_text(hostEntry));
         global_config.klipperPort = atoi(lv_textarea_get_text(portEntry));
 
-        if (verify_ip())
+        connection_status_t status = verify_ip();
+        if (status == CONNECT_OK)
         {
             global_config.ipConfigured = true;
             WriteGlobalConfig();
             connect_ok = true;
         }
+        else if (status == CONNECT_AUTH_REQUIRED)
+        {
+            label = NULL;
+            global_config.ipConfigured = true;
+            WriteGlobalConfig();
+        }
         else
         {
             lv_label_set_text(label, "Failed to connect");
@@ -149,6 +170,77 @@ void redraw_connect_screen(){
     }
 }
 
+static bool auth_entry_done = false;
+
+static void keyboard_event_auth_entry(lv_event_t * e) {
+    lv_event_code_t code = lv_event_get_code(e);
+    lv_obj_t * ta = lv_event_get_target(e);
+    lv_obj_t * kb = (lv_obj_t *)lv_event_get_user_data(e);
+
+    if (code == LV_EVENT_READY) 
+    {
+        const char * txt = lv_textarea_get_text(ta);
+        int len = strlen(txt);
+        if (len > 0)
+        {
+            global_config.auth_configured = true;
+            strcpy(global_config.klipper_auth, txt);
+            WriteGlobalConfig();
+            auth_entry_done = true;
+        }
+    }
+    else if (code == LV_EVENT_CANCEL)
+    {
+        auth_entry_done = true;
+    }
+}
+
+void handle_auth_entry(){
+    auth_entry_done = false;
+    global_config.klipper_auth[32] = 0;
+    lv_obj_clean(lv_scr_act());
+
+    lv_obj_t * root = lv_create_empty_panel(lv_scr_act());
+    lv_obj_set_size(root, CYD_SCREEN_WIDTH_PX, CYD_SCREEN_HEIGHT_PX);
+    lv_layout_flex_column(root);
+
+    lv_obj_t * top_root = lv_create_empty_panel(root);
+    lv_obj_set_width(top_root, CYD_SCREEN_WIDTH_PX);
+    lv_layout_flex_column(top_root);
+    lv_obj_set_flex_grow(top_root, 1);
+    lv_obj_set_style_pad_all(top_root, CYD_SCREEN_GAP_PX, 0);
+
+    lv_obj_t * label = lv_label_create(top_root);
+    lv_label_set_text(label, "Enter API Key");
+    lv_obj_set_width(label, CYD_SCREEN_WIDTH_PX - CYD_SCREEN_GAP_PX * 2);
+
+    lv_obj_t * keyboard = lv_keyboard_create(root);
+    lv_obj_t * passEntry = lv_textarea_create(top_root);
+    lv_textarea_set_max_length(passEntry, 32);
+    lv_textarea_set_one_line(passEntry, true);
+
+    if (global_config.auth_configured)
+        lv_textarea_set_text(passEntry, global_config.klipper_auth);
+    else
+        lv_textarea_set_text(passEntry, "");
+
+    lv_obj_set_width(passEntry, CYD_SCREEN_WIDTH_PX - CYD_SCREEN_GAP_PX * 2);
+    lv_obj_add_event_cb(passEntry, keyboard_event_auth_entry, LV_EVENT_ALL, keyboard);
+    lv_obj_set_flex_grow(passEntry, 1);
+    
+
+    lv_keyboard_set_textarea(keyboard, passEntry);
+    lv_keyboard_set_map(keyboard, LV_KEYBOARD_MODE_USER_1, kb_map, kb_ctrl);
+    lv_keyboard_set_mode(keyboard, LV_KEYBOARD_MODE_USER_1);
+
+    while (!auth_entry_done) {
+        lv_timer_handler();
+        lv_task_handler();
+    }
+
+    redraw_connect_screen();
+}
+
 void ip_init_inner(){
     if (global_config.ipConfigured) {
         redraw_connect_screen();
@@ -204,6 +296,7 @@ int retry_count = 0;
 void ip_init(){
     connect_ok = false;
     retry_count = 0;
+    int prev_power_device_count = 0;
 
     ip_init_inner();
 
@@ -213,15 +306,25 @@ void ip_init(){
         lv_task_handler();
 
         if (!connect_ok && global_config.ipConfigured && (millis() - last_data_update_ip) > data_update_interval_ip){
-            connect_ok = verify_ip();
+            connection_status_t status = verify_ip();
+
+            connect_ok = status == CONNECT_OK;
             last_data_update_ip = millis();
             retry_count++;
-            String retry_count_text = "Connecting to Klipper (Try " + String(retry_count + 1) + ")";
+            if (label != NULL){
-            lv_label_set_text(label, retry_count_text.c_str());
+                String retry_count_text = "Connecting to Klipper (Try " + String(retry_count + 1) + ")";
+                lv_label_set_text(label, retry_count_text.c_str());
+            }
 
-            _power_devices_query_internal();
+            if (status != CONNECT_AUTH_REQUIRED)
-            if (power_devices_query().count >= 1)
+                _power_devices_query_internal();
+            else
+                handle_auth_entry();
+
+            if (power_devices_query().count != prev_power_device_count) {
+                prev_power_device_count = power_devices_query().count;
                 redraw_connect_screen();
+            }
         }
     }
 }

CYD-Klipper/src/ui/nav_buttons.cpp

@@ -2,8 +2,8 @@
 #include "panels/panel.h"
 #include "../core/data_setup.h"
 #include "nav_buttons.h"
-#include <HTTPClient.h>
 #include "ui_utils.h"
+#include <stdio.h>
 
 static lv_style_t nav_button_style;
 

CYD-Klipper/src/ui/panels/print_panel.cpp

@@ -37,6 +37,10 @@ static void btn_print_file(lv_event_t * e){
 
     HTTPClient client;
     client.begin(buff);
+
+    if (global_config.auth_configured)
+        client.addHeader("X-Api-Key", global_config.klipper_auth);
+
     int httpCode = client.POST("");
     Serial.printf("Print start: HTTP %d\n", httpCode);
 }

CYD-Klipper/src/ui/panels/settings_panel.cpp

@@ -29,6 +29,7 @@ static void reset_calibration_click(lv_event_t * e){
 static void reset_wifi_click(lv_event_t * e){
     global_config.wifiConfigured = false;
     global_config.ipConfigured = false;
+    global_config.auth_configured = false;
     WriteGlobalConfig();
     ESP.restart();
 }