move uploadURL as an action

src/system.cpp

@@ -1134,7 +1134,7 @@ bool System::check_restore() {
                 // it's a custom support file - save it to /config
                 new_file.close();
                 if (LittleFS.rename(TEMP_FILENAME_PATH, EMSESP_CUSTOMSUPPORT_FILE)) {
-                    LOG_INFO("Custom support information loaded");
+                    LOG_DEBUG("Custom support information found");
                     return false; // no need to reboot
                 } else {
                     LOG_ERROR("Failed to save custom support file");

src/version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.7.0-dev.41"
+#define EMSESP_APP_VERSION "3.7.0-dev.42"

src/web/WebStatusService.cpp

@@ -24,11 +24,12 @@
 
 namespace emsesp {
 
-WebStatusService::WebStatusService(AsyncWebServer * server, SecurityManager * securityManager) {
+WebStatusService::WebStatusService(AsyncWebServer * server, SecurityManager * securityManager)
+    : _securityManager(securityManager) {
     // GET
     server->on(EMSESP_SYSTEM_STATUS_SERVICE_PATH, HTTP_GET, [this](AsyncWebServerRequest * request) { systemStatus(request); });
 
-    // generic action - POST
+    // POST - generic action handler
     server->on(EMSESP_ACTION_SERVICE_PATH, [this](AsyncWebServerRequest * request, JsonVariant json) { action(request, json); });
 }
 
@@ -150,10 +151,14 @@ void WebStatusService::action(AsyncWebServerRequest * request, JsonVariant json)
     auto *     response = new AsyncJsonResponse();
     JsonObject root     = response->getRoot();
 
-    // get action and optional param
+    // get action and any optional param
     std::string action = json["action"];
     std::string param  = json["param"]; // is optional
 
+    // check if we're authenticated for admin tasks, some actions are only for admins
+    Authentication authentication = _securityManager->authenticateRequest(request);
+    bool           is_admin       = AuthenticationPredicates::IS_ADMIN(authentication);
+
     bool ok = true;
     if (action == "checkUpgrade") {
         ok = checkUpgrade(root, param);
@@ -161,6 +166,8 @@ void WebStatusService::action(AsyncWebServerRequest * request, JsonVariant json)
         ok = exportData(root, param);
     } else if (action == "customSupport") {
         ok = customSupport(root);
+    } else if (action == "uploadURL" && is_admin) {
+        ok = uploadURL(param.c_str());
     }
 
 #if defined(EMSESP_UNITY)
@@ -184,6 +191,7 @@ void WebStatusService::action(AsyncWebServerRequest * request, JsonVariant json)
     request->send(response);
 }
 
+// action = checkUpgrade
 // returns true if there is an upgrade available
 bool WebStatusService::checkUpgrade(JsonObject root, std::string & latest_version) {
     version::Semver200_version settings_version(EMSESP_APP_VERSION);
@@ -198,6 +206,7 @@ bool WebStatusService::checkUpgrade(JsonObject root, std::string & latest_versio
     return true;
 }
 
+// action = allvalues
 // output all the devices and the values
 void WebStatusService::allvalues(JsonObject output) {
     JsonDocument doc;
@@ -226,6 +235,7 @@ void WebStatusService::allvalues(JsonObject output) {
     EMSESP::temperaturesensor_.get_value_info(device_output, value);
 }
 
+// action = export
 // returns data for a specific feature/settings as a json object
 bool WebStatusService::exportData(JsonObject root, std::string & type) {
     root["type"] = type;
@@ -253,7 +263,8 @@ bool WebStatusService::exportData(JsonObject root, std::string & type) {
     return true;
 }
 
-// custom support
+// action = customSupport
+// reads any upload customSupport.json file and sends to to Help page to be shown as Guest
 bool WebStatusService::customSupport(JsonObject root) {
 #ifndef EMSESP_STANDALONE
     // check if we have custom support file uploaded
@@ -275,4 +286,12 @@ bool WebStatusService::customSupport(JsonObject root) {
     return true;
 }
 
+// action = uploadURL
+// uploads a firmware file from a URL
+bool WebStatusService::uploadURL(const char * url) {
+    // this will keep a copy of the URL, but won't initiate the download yet
+    emsesp::EMSESP::system_.uploadFirmwareURL(url);
+    return true;
+}
+
 } // namespace emsesp

src/web/WebStatusService.h

@@ -12,7 +12,7 @@ class WebStatusService {
   public:
     WebStatusService(AsyncWebServer * server, SecurityManager * securityManager);
 
-// make all functions public so we can test in the debug and standalone mode
+// make action function public so we can test in the debug and standalone mode
 #ifndef EMSESP_STANDALONE
   protected:
 #endif
@@ -20,9 +20,14 @@ class WebStatusService {
     void action(AsyncWebServerRequest * request, JsonVariant json);
 
   private:
+    SecurityManager * _securityManager;
+
+    // actions
     bool checkUpgrade(JsonObject root, std::string & latest_version);
     bool exportData(JsonObject root, std::string & type);
     bool customSupport(JsonObject root);
+    bool uploadURL(const char * url);
+
     void allvalues(JsonObject output);
 };