Implemented WebAPI to set wifi credentials

include/helper.h

@@ -0,0 +1,4 @@
+#pragma once
+
+#define STR_HELPER(x) #x
+#define STR(x) STR_HELPER(x)

src/WebApi.cpp

@@ -4,6 +4,7 @@
 #include "Configuration.h"
 #include "WiFiSettings.h"
 #include "defaults.h"
+#include "helper.h"
 #include <LITTLEFS.h>
 #include <ResetReason.h>
 
@@ -123,36 +124,11 @@ void WebApiClass::onNetworkAdminGet(AsyncWebServerRequest* request)
 
     root[F("hostname")] = config.WiFi_Hostname;
     root[F("dhcp")] = config.WiFi_Dhcp;
-    root[F("ipaddress")] = IPAddress(
+    root[F("ipaddress")] = IPAddress(config.WiFi_Ip).toString();
-        config.WiFi_Ip[0],
+    root[F("netmask")] = IPAddress(config.WiFi_Netmask).toString();
-        config.WiFi_Ip[1],
+    root[F("gateway")] = IPAddress(config.WiFi_Gateway).toString();
-        config.WiFi_Ip[2],
+    root[F("dns1")] = IPAddress(config.WiFi_Dns1).toString();
-        config.WiFi_Ip[3])
+    root[F("dns2")] = IPAddress(config.WiFi_Dns2).toString();
-                               .toString();
-    root[F("netmask")] = IPAddress(
-        config.WiFi_Netmask[0],
-        config.WiFi_Netmask[1],
-        config.WiFi_Netmask[2],
-        config.WiFi_Netmask[3])
-                             .toString();
-    root[F("gateway")] = IPAddress(
-        config.WiFi_Gateway[0],
-        config.WiFi_Gateway[1],
-        config.WiFi_Gateway[2],
-        config.WiFi_Gateway[3])
-                             .toString();
-    root[F("dns1")] = IPAddress(
-        config.WiFi_Dns1[0],
-        config.WiFi_Dns1[1],
-        config.WiFi_Dns1[2],
-        config.WiFi_Dns1[3])
-                          .toString();
-    root[F("dns2")] = IPAddress(
-        config.WiFi_Dns2[0],
-        config.WiFi_Dns2[1],
-        config.WiFi_Dns2[2],
-        config.WiFi_Dns2[3])
-                          .toString();
     root[F("ssid")] = config.WiFi_Ssid;
     root[F("password")] = config.WiFi_Password;
 
@@ -175,11 +151,124 @@ void WebApiClass::onNetworkAdminPost(AsyncWebServerRequest* request)
 
     String json = request->getParam("data", true)->value();
 
+    if (json.length() > 1024) {
+        retMsg[F("message")] = F("Data too large!");
+        response->setLength();
+        request->send(response);
+        return;
+    }
+
+    DynamicJsonDocument root(1024);
+    DeserializationError error = deserializeJson(root, json);
+
+    if (error) {
+        retMsg[F("message")] = F("Failed to parse data!");
+        response->setLength();
+        request->send(response);
+        return;
+    }
+
+    if (!(root.containsKey("ssid") && root.containsKey("password") && root.containsKey("hostname") && root.containsKey("dhcp") && root.containsKey("ipaddress") && root.containsKey("netmask") && root.containsKey("gateway") && root.containsKey("dns1") && root.containsKey("dns2"))) {
+        retMsg[F("message")] = F("Values are missing!");
+        response->setLength();
+        request->send(response);
+        return;
+    }
+
+    IPAddress ipaddress;
+    if (!ipaddress.fromString(root[F("ipaddress")].as<String>())) {
+        retMsg[F("message")] = F("IP address is invalid!");
+        response->setLength();
+        request->send(response);
+        return;
+    }
+    IPAddress netmask;
+    if (!netmask.fromString(root[F("netmask")].as<String>())) {
+        retMsg[F("message")] = F("Netmask is invalid!");
+        response->setLength();
+        request->send(response);
+        return;
+    }
+    IPAddress gateway;
+    if (!gateway.fromString(root[F("gateway")].as<String>())) {
+        retMsg[F("message")] = F("Gateway is invalid!");
+        response->setLength();
+        request->send(response);
+        return;
+    }
+    IPAddress dns1;
+    if (!dns1.fromString(root[F("dns1")].as<String>())) {
+        retMsg[F("message")] = F("DNS Server IP 1 is invalid!");
+        response->setLength();
+        request->send(response);
+        return;
+    }
+    IPAddress dns2;
+    if (!dns2.fromString(root[F("dns2")].as<String>())) {
+        retMsg[F("message")] = F("DNS Server IP 2 is invalid!");
+        response->setLength();
+        request->send(response);
+        return;
+    }
+
+    if (root[F("hostname")].as<String>().length() == 0 || root[F("hostname")].as<String>().length() > WIFI_MAX_HOSTNAME_STRLEN) {
+        retMsg[F("message")] = F("Hostname must between 1 and " STR(WIFI_MAX_HOSTNAME_STRLEN) " characters long!");
+        response->setLength();
+        request->send(response);
+        return;
+    }
+    if (root[F("ssid")].as<String>().length() == 0 || root[F("ssid")].as<String>().length() > WIFI_MAX_SSID_STRLEN) {
+        retMsg[F("message")] = F("SSID must between 1 and " STR(WIFI_MAX_SSID_STRLEN) " characters long!");
+        response->setLength();
+        request->send(response);
+        return;
+    }
+    if (root[F("password")].as<String>().length() > WIFI_MAX_PASSWORD_STRLEN - 1) {
+        retMsg[F("message")] = F("Password must not be longer than " STR(WIFI_MAX_PASSWORD_STRLEN) " characters long!");
+        response->setLength();
+        request->send(response);
+        return;
+    }
+
+    CONFIG_T& config = Configuration.get();
+    config.WiFi_Ip[0] = ipaddress[0];
+    config.WiFi_Ip[1] = ipaddress[1];
+    config.WiFi_Ip[2] = ipaddress[2];
+    config.WiFi_Ip[3] = ipaddress[3];
+    config.WiFi_Netmask[0] = netmask[0];
+    config.WiFi_Netmask[1] = netmask[1];
+    config.WiFi_Netmask[2] = netmask[2];
+    config.WiFi_Netmask[3] = netmask[3];
+    config.WiFi_Gateway[0] = gateway[0];
+    config.WiFi_Gateway[1] = gateway[1];
+    config.WiFi_Gateway[2] = gateway[2];
+    config.WiFi_Gateway[3] = gateway[3];
+    config.WiFi_Dns1[0] = dns1[0];
+    config.WiFi_Dns1[1] = dns1[1];
+    config.WiFi_Dns1[2] = dns1[2];
+    config.WiFi_Dns1[3] = dns1[3];
+    config.WiFi_Dns2[0] = dns2[0];
+    config.WiFi_Dns2[1] = dns2[1];
+    config.WiFi_Dns2[2] = dns2[2];
+    config.WiFi_Dns2[3] = dns2[3];
+    strcpy(config.WiFi_Ssid, root[F("ssid")].as<String>().c_str());
+    strcpy(config.WiFi_Password, root[F("password")].as<String>().c_str());
+    strcpy(config.WiFi_Hostname, root[F("hostname")].as<String>().c_str());
+    if (root[F("dhcp")].as<bool>()) {
+        config.WiFi_Dhcp = true;
+    } else {
+        config.WiFi_Dhcp = false;
+    }
+    Configuration.write();
+
     retMsg[F("type")] = F("success");
     retMsg[F("message")] = F("Settings saved!");
 
     response->setLength();
     request->send(response);
+
+    WiFiSettings.enableAdminMode();
+    WiFiSettings.applyConfig();
 }
 
 WebApiClass WebApi;