remove set user key call, move into parse, error checking within nvs

Author: brentru

src/Wippersnapper.cpp

@@ -77,14 +77,10 @@ void Wippersnapper::provision() {
   // init. LED for status signaling
   statusLEDInit();
 #ifdef USE_TINYUSB
-  // init new filesystem
   _fileSystem = new Wippersnapper_FS();
-  // parse out secrets.json file
   _fileSystem->parseSecrets();
 #elif defined(USE_NVS)
-  // init esp32 nvs partition namespace
   _nvs = new Wippersnapper_ESP32_nvs();
-  // parse out secrets
   _nvs->parseSecrets();
 #endif
   // Set credentials
@@ -108,19 +104,6 @@ void Wippersnapper::set_user_key(const char *aio_username,
   WS._key = aio_key;
 }
 
-/****************************************************************************/
-/*!
-    @brief    Configures the device's Adafruit IO credentials from the
-                secrets.json file.
-*/
-/****************************************************************************/
-void Wippersnapper::set_user_key() {
-#ifdef USE_TINYUSB
-  WS._username = _fileSystem->io_username;
-  WS._key = _fileSystem->io_key;
-#endif
-}
-
 /**************************************************************************/
 /*!
     @brief    Disconnects from Adafruit IO+ Wippersnapper.

src/Wippersnapper.h

@@ -187,7 +187,6 @@ class Wippersnapper {
   bool lockStatusLED = false; ///< True if status LED is using the built-in LED
 
   void set_user_key(const char *aio_username, const char *aio_key);
-  void set_user_key();
   virtual void set_ssid_pass(const char *ssid, const char *ssidPassword);
   virtual void set_ssid_pass();
 

src/provisioning/Wippersnapper_ESP32_nvs.cpp

@@ -44,20 +44,26 @@ Wippersnapper_ESP32_nvs::~Wippersnapper_ESP32_nvs() { nvs.end(); }
 */
 /****************************************************************************/
 void Wippersnapper_ESP32_nvs::parseSecrets() {
-  // parsey
+  // Parse from
+  // https://github.com/adafruit/Adafruit_WebSerial_NVMGenerator/blob/main/wsPartitions.csv
   _ssid = nvs.getString("wsNetSSID", "");
   _ssidPass = nvs.getString("wsNetPass", "");
   _aioUser = nvs.getString("wsAIOUser", "");
   _aioPass = nvs.getString("wsAIOKey", "");
-  _aioURL = nvs.getString("wsAIOURL", "");
 
-  // Validate configuration was set within the partition
-  if (_ssid == "" || _ssidPass == "" || _aioUser == "" || _aioPass == "") {
+  // Validate getString() calls
+  if (_ssid.length() == 0 || _ssidPass.length() == 0 ||
+      _aioUser.length() == 0 || _aioPass.length() == 0) {
     WS.setStatusLEDColor(RED);
     while (1)
       ;
   }
 
+  // optional NVS staging url
+  _aioURL = nvs.getString("wsAIOURL", "");
+  if (_aioURL.length() == 0)
+    _aioURL = "io.adafruit.com";
+
   // Set global configuration strings
   WS._network_ssid = _ssid.c_str();
   WS._network_pass = _ssidPass.c_str();

src/provisioning/tinyusb/Wippersnapper_FS.cpp

@@ -340,6 +340,7 @@ void Wippersnapper_FS::parseSecrets() {
         "effect");
     fsHalt();
   }
+  WS._username = _fileSystem->io_username;
 
   // Get io key
   io_key = doc["io_key"];
@@ -349,6 +350,7 @@ void Wippersnapper_FS::parseSecrets() {
     writeErrorToBootOut("ERROR: invalid io_key value in secrets.json!");
     fsHalt();
   }
+  WS._key = _fileSystem->io_key;
 
   // next, we detect the network interface from the `secrets.json`
   WS_DEBUG_PRINTLN("Attempting to find network interface...");