Merge pull request #8 from ayushsharma82/dev

fix: critical save flow bug

Author: ayushsharma82

README.md

@@ -9,7 +9,7 @@
 </p>
 <br/>
 
-<b>NetWizard</b> is an easy-to-use yet powerful WiFi manager and captive portal library for wireless microcontrollers. Avoid the hassle of hard-coding WiFi credentials and let NetWizard take care of networking for your device!
+<b>NetWizard</b> is a user-friendly yet robust WiFi manager and captive portal library for wireless microcontrollers. Eliminate the trouble of hard-coding WiFi credentials by letting NetWizard handle the networking for your device!
 
 Additionally, NetWizard lets you create a custom configuration page of your choice which is shown at the time of setup. The possibilities are endless! 
 

library.json

@@ -35,7 +35,7 @@
       "platforms": ["espressif8266", "raspberrypi"]
     }
   ],
-  "version": "1.0.6",
+  "version": "1.0.7",
   "frameworks": "arduino",
   "platforms": ["espressif32", "raspberrypi"]
 }

library.properties

@@ -1,5 +1,5 @@
 name=NetWizard
-version=1.0.6
+version=1.0.7
 author=Ayush Sharma
 category=Communication
 maintainer=Ayush Sharma <[email protected]>

src/NetWizard.cpp

@@ -821,13 +821,6 @@ void NetWizard::_startHTTP() {
 
       JsonObject obj = json.as<JsonObject>();
 
-      if (obj.containsKey("credentials") && obj["credentials"].is<JsonObject>()) {
-        JsonObject credentials = obj["credentials"];
-        if (!_parseCredentialsJson(credentials)) {
-          return request->send(400, "text/plain", "Invalid request data");
-        }
-      }
-
       if (obj.containsKey("params") && obj["params"].is<JsonArray>()) {
         JsonArray params = obj["params"];
         if (!_parseConfigJson(params)) {
@@ -840,6 +833,13 @@ void NetWizard::_startHTTP() {
         }
       }
 
+      if (obj.containsKey("credentials") && obj["credentials"].is<JsonObject>()) {
+        JsonObject credentials = obj["credentials"];
+        if (!_parseCredentialsJson(credentials)) {
+          return request->send(400, "text/plain", "Invalid request data");
+        }
+      }
+
       return request->send(200, "text/plain", "OK");
     }).setFilter(this->_onAPFilter);
 
@@ -974,13 +974,6 @@ void NetWizard::_startHTTP() {
 
       JsonObject obj = json.as<JsonObject>();
 
-      if (obj.containsKey("credentials") && obj["credentials"].is<JsonObject>()) {
-        JsonObject credentials = obj["credentials"];
-        if (!_parseCredentialsJson(credentials)) {
-          return _server->send(400, "text/plain", "Invalid request data");
-        }
-      }
-
       if (obj.containsKey("params") && obj["params"].is<JsonArray>()) {
         JsonArray params = obj["params"];
         if (!_parseConfigJson(params)) {
@@ -993,6 +986,13 @@ void NetWizard::_startHTTP() {
         }
       }
 
+      if (obj.containsKey("credentials") && obj["credentials"].is<JsonObject>()) {
+        JsonObject credentials = obj["credentials"];
+        if (!_parseCredentialsJson(credentials)) {
+          return _server->send(400, "text/plain", "Invalid request data");
+        }
+      }
+
       return _server->send(200, "text/plain", "OK");
     }).setFilter(this->_onAPFilter);