fix token validity checks

CivicTechTO · Jul 20, 2024 · c6f1226 · c6f1226
1 parent 3d3aefa
commit c6f1226
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/noisemeter-device/noisemeter-device.ino b/noisemeter-device/noisemeter-device.ino
@@ -132,7 +132,7 @@ void setup() {
     SERIAL.println(" done.");
 
     isAPNeeded = true;
-  } else if (Creds.get(Storage::Entry::Token).length() == 0) {
+  } else if (Creds.get(Storage::Entry::Token)[0] == '\0') {
     isAPNeeded = true;
   } else if (tryWifiConnection(WIFI_STA) < 0) {
     isAPNeeded = true;
@@ -292,8 +292,10 @@ std::optional<const char *> saveNetworkCreds(String ssid, String psk, String ema
           } else {
             return "The sensor was not able to register with the server.";
           }
-        } else {
+        } else if (Creds.get(Storage::Entry::Token)[0] != '\0') {
           return {};
+        } else {
+          return "An email is required to register the sensor with the server.";
         }
       } else {
         return "The sensor connected to your WiFi, but failed to reach the internet.";

diff --git a/noisemeter-device/storage.cpp b/noisemeter-device/storage.cpp
@@ -48,6 +48,7 @@ void Storage::clear() noexcept
     for (auto i = 0u; i < addrOf(Entry::TotalSize); ++i)
         writeByte(i, 0xFF);
 
+    set(Entry::Token, "\0");
     EEPROMClass::commit();
 }