Fix update wifi settings

lan143 · Feb 12, 2022 · b86f473 · b86f473
1 parent 0cb709b
commit b86f473
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 19 deletions.
diff --git a/.vscode/extensions.json b/.vscode/extensions.json
@@ -1,7 +1,10 @@
-{
-    // See http://go.microsoft.com/fwlink/?LinkId=827846
-    // for the documentation about the extensions.json format
-    "recommendations": [
-        "platformio.platformio-ide"
-    ]
-}
+{
+    // See http://go.microsoft.com/fwlink/?LinkId=827846
+    // for the documentation about the extensions.json format
+    "recommendations": [
+        "platformio.platformio-ide"
+    ],
+    "unwantedRecommendations": [
+        "ms-vscode.cpptools-extension-pack"
+    ]
+}
diff --git a/src/Web/Web.cpp b/src/Web/Web.cpp
@@ -41,29 +41,29 @@ Web::Web(WifiService* wifiService, Settings* settings)
         request->send(response);
     });
 
-    _server->on("/api/settings", HTTP_POST, [this](AsyncWebServerRequest *request) {
-        if (request->hasParam("mavlinkPort", true)) {
-            AsyncWebParameter* mavlinkPort = request->getParam("mavlinkPort", true);
+    _server->on("/api/settings/wifi", HTTP_POST, [this](AsyncWebServerRequest *request) {
+        if (request->hasParam("wifiSSID", true) && request->hasParam("wifiPassword", true)) {
+            AsyncWebParameter* wifiSSID = request->getParam("wifiSSID", true);
+            AsyncWebParameter* wifiPassword = request->getParam("wifiPassword", true);
 
-            _settings->setMavlinkPort(atoi(mavlinkPort->value().c_str()));
+            _settings->setWifiAPSSID(wifiSSID->value());
+            _settings->setWifiAPPassword(wifiPassword->value());
 
             request->send(200, "application/json", "{}");
         } else {
-            request->send(422, "application/json", "{}");
+            request->send(422, "application/json", "{\"message\": \"empty wifiSSID or wifiPassword\"}");
         }
     });
 
-    _server->on("/api/settings/wifi", HTTP_POST, [this](AsyncWebServerRequest *request) {
-        if (request->hasParam("wifiSSID", true) && request->hasParam("wifiPassword", true)) {
-            AsyncWebParameter* wifiSSID = request->getParam("wifiSSID", true);
-            AsyncWebParameter* wifiPassword = request->getParam("wifiPassword", true);
+    _server->on("/api/settings", HTTP_POST, [this](AsyncWebServerRequest *request) {
+        if (request->hasParam("mavlinkPort", true)) {
+            AsyncWebParameter* mavlinkPort = request->getParam("mavlinkPort", true);
 
-            _settings->setWifiAPSSID(wifiSSID->value());
-            _settings->setWifiAPPassword(wifiPassword->value());
+            _settings->setMavlinkPort(atoi(mavlinkPort->value().c_str()));
 
             request->send(200, "application/json", "{}");
         } else {
-            request->send(422, "application/json", "{}");
+            request->send(422, "application/json", "{\"message\": \"empty mavlinkPort\"}");
         }
     });