Merge branch 'master' into 1.5.0-dev

Digest auth not working on ios #99

README.md

@@ -82,3 +82,6 @@ All available information and instructions can be found in the wiki:
 ## Debug
 To display DEBUG messages you must enable debug in settings (switch is disabled by default).
 You can connect via Telnet to read messages. IP: ESP8266 ip, port: 23
+
+___
+This project is tested with BrowserStack.

platformio.ini

@@ -14,7 +14,7 @@ extra_configs = secrets.default.ini
 core_dir = .pio
 
 [env]
-version = 1.5.0-alpha
+version = 1.5.0
 framework = arduino
 lib_deps = 
 	bblanchon/ArduinoJson@^7.1.0

src/MainTask.h

@@ -218,13 +218,13 @@ protected:
 
     // set outdoor sensor flag
     if (settings.equitherm.enabled) {
-      if (!Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP)) {
+      if (!Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::OUTDOOR_TEMP)) {
         emergencyFlags |= 0b00000001;
       }
     }
 
     // set indoor sensor flags
-    if (!Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::OUTDOOR_TEMP)) {
+    if (!Sensors::existsConnectedSensorsByPurpose(Sensors::Purpose::INDOOR_TEMP)) {
       if (!settings.equitherm.enabled && settings.pid.enabled) {
         emergencyFlags |= 0b00000010;
       }

src/OpenThermTask.h

@@ -1038,7 +1038,8 @@ protected:
     }
 
     // Set CH2 temp
-    if (vars.master.ch2.enabled && !settings.opentherm.nativeHeatingControl) {
+    if (!settings.opentherm.nativeHeatingControl && vars.master.ch2.enabled) {
+      if (settings.opentherm.heatingCh1ToCh2 || settings.opentherm.dhwToCh2) {
         // Converted target CH2 temp
         float convertedTemp = convertTemp(
           vars.master.ch2.targetTemp,
@@ -1061,6 +1062,7 @@ protected:
         }
       }
     }
+  }
 
   void initialize() {
     // Not all boilers support these, only try once when the boiler becomes connected

src/PortalTask.h

@@ -108,8 +108,8 @@ protected:
     // dashboard page
     auto dashboardPage = (new StaticPage("/dashboard.html", &LittleFS, F("/pages/dashboard.html"), PORTAL_CACHE))
       ->setBeforeSendCallback([this]() {
-        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+          this->webServer->requestAuthentication(BASIC_AUTH);
           return false;
         }
 
@@ -119,12 +119,10 @@ protected:
 
     // restart
     this->webServer->on(F("/restart.html"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
+        this->webServer->requestAuthentication(BASIC_AUTH);
-          this->webServer->send(401);
         return;
       }
-      }
 
       vars.actions.restart = true;
       this->webServer->sendHeader(F("Location"), "/");
@@ -134,8 +132,8 @@ protected:
     // network settings page
     auto networkPage = (new StaticPage("/network.html", &LittleFS, F("/pages/network.html"), PORTAL_CACHE))
       ->setBeforeSendCallback([this]() {
-        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+          this->webServer->requestAuthentication(BASIC_AUTH);
           return false;
         }
 
@@ -146,8 +144,8 @@ protected:
     // settings page
     auto settingsPage = (new StaticPage("/settings.html", &LittleFS, F("/pages/settings.html"), PORTAL_CACHE))
       ->setBeforeSendCallback([this]() {
-        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+          this->webServer->requestAuthentication(BASIC_AUTH);
           return false;
         }
 
@@ -158,8 +156,8 @@ protected:
     // sensors page
     auto sensorsPage = (new StaticPage("/sensors.html", &LittleFS, F("/pages/sensors.html"), PORTAL_CACHE))
       ->setBeforeSendCallback([this]() {
-        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+          this->webServer->requestAuthentication(BASIC_AUTH);
           return false;
         }
 
@@ -170,8 +168,8 @@ protected:
     // upgrade page
     auto upgradePage = (new StaticPage("/upgrade.html", &LittleFS, F("/pages/upgrade.html"), PORTAL_CACHE))
       ->setBeforeSendCallback([this]() {
-        if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+          this->webServer->requestAuthentication(BASIC_AUTH);
           return false;
         }
 
@@ -181,7 +179,7 @@ protected:
 
     // OTA
     auto upgradeHandler = (new UpgradeHandler("/api/upgrade"))->setCanUploadCallback([this](const String& uri) {
-      if (this->isAuthRequired() && !this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
         this->webServer->sendHeader(F("Connection"), F("close"));
         this->webServer->send(401);
         return false;
@@ -222,11 +220,9 @@ protected:
 
     // backup
     this->webServer->on(F("/api/backup/save"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
         return this->webServer->send(401);
       }
-      }
 
       JsonDocument doc;
 
@@ -248,11 +244,9 @@ protected:
     });
 
     this->webServer->on(F("/api/backup/restore"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
         return this->webServer->send(401);
       }
-      }
 
       if (vars.states.restarting) {
         return this->webServer->send(503);
@@ -329,11 +323,9 @@ protected:
 
     // network
     this->webServer->on(F("/api/network/settings"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
         return this->webServer->send(401);
       }
-      }
 
       JsonDocument doc;
       networkSettingsToJson(networkSettings, doc);
@@ -343,11 +335,9 @@ protected:
     });
 
     this->webServer->on(F("/api/network/settings"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
         return this->webServer->send(401);
       }
-      }
       
       if (vars.states.restarting) {
         return this->webServer->send(503);
@@ -402,11 +392,8 @@ protected:
     });
 
     this->webServer->on(F("/api/network/scan"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
+        return this->webServer->send(401);
-          this->webServer->send(401);
-          return;
-        }
       }
 
       auto apCount = WiFi.scanComplete();
@@ -448,11 +435,9 @@ protected:
 
     // settings
     this->webServer->on(F("/api/settings"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
         return this->webServer->send(401);
       }
-      }
 
       JsonDocument doc;
       settingsToJson(settings, doc);
@@ -462,11 +447,9 @@ protected:
     });
 
     this->webServer->on(F("/api/settings"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
         return this->webServer->send(401);
       }
-      }
       
       if (vars.states.restarting) {
         return this->webServer->send(503);
@@ -513,11 +496,9 @@ protected:
 
     // sensors list
     this->webServer->on(F("/api/sensors"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
         return this->webServer->send(401);
       }
-      }
 
       bool detailed = false;
       if (this->webServer->hasArg(F("detailed"))) {
@@ -528,6 +509,7 @@ protected:
       for (uint8_t sensorId = 0; sensorId <= Sensors::getMaxSensorId(); sensorId++) {
         if (detailed) {
           auto& sSensor = Sensors::settings[sensorId];
+          doc[sensorId][FPSTR(S_ENABLED)] = sSensor.enabled;
           doc[sensorId][FPSTR(S_NAME)] = sSensor.name;
           doc[sensorId][FPSTR(S_PURPOSE)] = static_cast<uint8_t>(sSensor.purpose);
           sensorResultToJson(sensorId, doc[sensorId]);
@@ -543,11 +525,9 @@ protected:
 
     // sensor settings
     this->webServer->on(F("/api/sensor"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
         return this->webServer->send(401);
       }
-      }
       
       if (!this->webServer->hasArg(F("id"))) {
         return this->webServer->send(400);
@@ -571,11 +551,9 @@ protected:
     });
     
     this->webServer->on(F("/api/sensor"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
         return this->webServer->send(401);
       }
-      }
       
       if (vars.states.restarting) {
         return this->webServer->send(503);
@@ -654,11 +632,9 @@ protected:
     });
 
     this->webServer->on(F("/api/vars"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
         return this->webServer->send(401);
       }
-      }
 
       const String& plain = this->webServer->arg(0);
       Log.straceln(FPSTR(L_PORTAL_WEBSERVER), F("Request /api/vars %d bytes: %s"), plain.length(), plain.c_str());
@@ -956,6 +932,10 @@ protected:
     return !network->isApEnabled() && settings.portal.auth && strlen(settings.portal.password);
   }
 
+  bool isValidCredentials() {
+    return this->webServer->authenticate(settings.portal.login, settings.portal.password);
+  }
+
   void onCaptivePortal() {
     const String& uri = this->webServer->uri();
 

src/SensorsTask.h

@@ -561,7 +561,7 @@ protected:
               return;
             }
 
-            float rawTemp = ((pData[0] | (pData[1] << 8)) * 0.01f);
+            float rawTemp = (pChar->getValue<int16_t>() * 0.01f);
             Log.straceln(
               FPSTR(L_SENSORS_BLE),
               F("Sensor #%hhu '%s': received temp: %.2f"),
@@ -634,7 +634,7 @@ protected:
               return;
             }
 
-            float rawTemp = ((pData[0] | (pData[1] << 8)) * 0.1f);
+            float rawTemp = (pChar->getValue<int16_t>() * 0.1f);
             Log.straceln(
               FPSTR(L_SENSORS_BLE),
               F("Sensor #%hhu '%s': received temp: %.2f"),
@@ -719,7 +719,7 @@ protected:
                 return;
               }
 
-              float rawHumidity = ((pData[0] | (pData[1] << 8)) * 0.01f);
+              float rawHumidity = (pChar->getValue<uint16_t>() * 0.01f);
               Log.straceln(
                 FPSTR(L_SENSORS_BLE),
                 F("Sensor #%hhu '%s': received humidity: %.2f"),
@@ -818,7 +818,7 @@ protected:
                 return;
               }
 
-              uint8_t rawBattery = pData[0];
+              auto rawBattery = pChar->getValue<uint8_t>();
               Log.straceln(
                 FPSTR(L_SENSORS_BLE),
                 F("Sensor #%hhu '%s': received battery: %.2f"),

src_data/pages/dashboard.html

@@ -380,13 +380,18 @@
               console.log(newSettings);
             }
 
-            let parameters = { cache: 'no-cache' };
+            let parameters = {
+              method: "GET",
+              cache: "no-cache",
+              credentials: "include"
+            };
+
             if (modified) {
               parameters.method = "POST";
               parameters.body = JSON.stringify(newSettings);
             }
 
-            const response = await fetch('/api/settings', parameters);
+            const response = await fetch("/api/settings", parameters);
             if (!response.ok) {
               throw new Error('Response not valid');
             }
@@ -424,7 +429,11 @@
 
           // vars
           try {
-            const response = await fetch('/api/vars', { cache: 'no-cache' });
+            const response = await fetch("/api/vars", {
+              cache: "no-cache",
+              credentials: "include"
+            });
+            
             if (!response.ok) {
               throw new Error('Response not valid');
             }
@@ -540,7 +549,11 @@
 
           // sensors
           try {
-            const response = await fetch("/api/sensors?detailed=1", { cache: "no-cache" });
+            const response = await fetch("/api/sensors?detailed=1", {
+              cache: "no-cache",
+              credentials: "include"
+            });
+            
             if (!response.ok) {
               throw new Error("Response not valid");
             }
@@ -568,12 +581,12 @@
               }
               
               const sData = result[sensorId];
-              if (sData.purpose == 255) {
+              if (!sData.enabled || sData.purpose == 255) {
-                sensorNode.classList.add("hidden");
+                sensorNode.classList.toggle("hidden", true);
                 continue;
               }
 
-              sensorNode.classList.remove("hidden");
+              sensorNode.classList.toggle("hidden", false);
 
               setStatus(
                 ".sStatus",

src_data/pages/index.html

@@ -170,7 +170,11 @@
 
         setTimeout(async function onLoadPage() {
           try {
-            const response = await fetch('/api/info', { cache: 'no-cache' });
+            const response = await fetch("/api/info", {
+              cache: "no-cache",
+              credentials: "include"
+            });
+            
             if (!response.ok) {
               throw new Error('Response not valid');
             }

src_data/pages/network.html

@@ -199,7 +199,11 @@
         };
 
         try {
-          const response = await fetch('/api/network/settings', { cache: 'no-cache' });
+          const response = await fetch("/api/network/settings", {
+            cache: "no-cache",
+            credentials: "include"
+          });
+          
           if (!response.ok) {
             throw new Error('Response not valid');
           }

src_data/pages/sensors.html

@@ -194,7 +194,11 @@
         const templateNode = container.querySelector("#template");
 
         try {
-          const response = await fetch("/api/sensors", { cache: "no-cache" });
+          const response = await fetch("/api/sensors", {
+            cache: "no-cache",
+            credentials: "include"
+          });
+
           if (!response.ok) {
             throw new Error("Response not valid");
           }
@@ -287,7 +291,11 @@
               }
 
               try {
-                const response = await fetch(sensorForm.action, { cache: "no-cache" });
+                const response = await fetch(sensorForm.action, {
+                  cache: "no-cache",
+                  credentials: "include"
+                });
+                
                 if (response.status != 200) {
                   return;
                 }

src_data/pages/settings.html

@@ -808,7 +808,11 @@
         };
 
         try {
-          const response = await fetch('/api/settings', { cache: 'no-cache' });
+          const response = await fetch("/api/settings", {
+            cache: "no-cache",
+            credentials: "include"
+          });
+          
           if (!response.ok) {
             throw new Error('Response not valid');
           }

src_data/scripts/lang.js

@@ -32,7 +32,7 @@ class Lang {
     }
 
     if (!this.localeIsSupported(this.defaultLocale)) {
-      const selected = this.switcher.selectedIndex ?? 0;
+      const selected = this.switcher.selectedIndex ? this.switcher.selectedIndex : 0;
       this.defaultLocale = this.switcher.options[selected].value;
     }
   

src_data/scripts/utils.js

@@ -60,10 +60,11 @@ const setupForm = (formSelector, onResultCallback = null, noCastItems = []) => {
       }
 
       let response = await fetch(url, {
-        method: 'POST',
+        method: "POST",
-        cache: 'no-cache',
+        cache: "no-cache",
+        credentials: "include",
         headers: {
-          'Content-Type': 'application/json'
+          "Content-Type": "application/json"
         },
         body: form2json(fd, noCastItems)
       });
@@ -218,7 +219,10 @@ const setupNetworkScanForm = (formSelector, tableSelector) => {
       attempts--;
 
       try {
-        let response = await fetch(url, { cache: 'no-cache' });
+        let response = await fetch(url, {
+          cache: "no-cache",
+          credentials: "include"
+        });
 
         if (response.status == 200) {
           await onSuccess(response);
@@ -309,10 +313,11 @@ const setupRestoreBackupForm = (formSelector) => {
 
         if (data.settings != undefined) {
           let response = await fetch(url, {
-            method: 'POST',
+            method: "POST",
-            cache: 'no-cache',
+            cache: "no-cache",
+            credentials: "include",
             headers: {
-              'Content-Type': 'application/json'
+              "Content-Type": "application/json"
             },
             body: JSON.stringify({"settings": data.settings})
           });
@@ -331,10 +336,11 @@ const setupRestoreBackupForm = (formSelector) => {
             payload["sensors"][sensorId] = data.sensors[sensorId];
 
             const response = await fetch(url, {
-              method: 'POST',
+              method: "POST",
-              cache: 'no-cache',
+              cache: "no-cache",
+              credentials: "include",
               headers: {
-                'Content-Type': 'application/json'
+                "Content-Type": "application/json"
               },
               body: JSON.stringify(payload)
             });
@@ -348,10 +354,11 @@ const setupRestoreBackupForm = (formSelector) => {
 
         if (data.network != undefined) {
           let response = await fetch(url, {
-            method: 'POST',
+            method: "POST",
-            cache: 'no-cache',
+            cache: "no-cache",
+            credentials: "include",
             headers: {
-              'Content-Type': 'application/json'
+              "Content-Type": "application/json"
             },
             body: JSON.stringify({"network": data.network})
           });
@@ -496,8 +503,9 @@ const setupUpgradeForm = (formSelector) => {
     try {
       let fd = new FormData(form);
       let response = await fetch(url, {
-        method: 'POST',
+        method: "POST",
-        cache: 'no-cache',
+        cache: "no-cache",
+        credentials: "include",
         body: fd
       });