Bump NimBLE-Arduino to 2.1.0

Digest auth not working on ios #99

README.md

@@ -1,40 +1,44 @@
 <div align="center">
-   
-   ![logo](/assets/logo.svg)
-   <br>
+
    [![GitHub version](https://img.shields.io/github/release/Laxilef/OTGateway.svg?include_prereleases)](https://github.com/Laxilef/OTGateway/releases)
    [![GitHub download](https://img.shields.io/github/downloads/Laxilef/OTGateway/total.svg)](https://github.com/Laxilef/OTGateway/releases/latest)
    [![License](https://img.shields.io/github/license/Laxilef/OTGateway.svg)](LICENSE.txt)
    [![Telegram](https://img.shields.io/badge/Telegram-Channel-33A8E3)](https://t.me/otgateway)
-   
+
 </div>
+<hr />
+
+![Dashboard](/assets/poster-1.png) 
+![Configuration](/assets/poster-2.png) 
+![Integration with HomeAssistant](/assets/poster-3.png)
 
 ## Features
-- Hot water temperature control
+- DHW temperature control
 - Heating temperature control
 - Smart heating temperature control modes:
    - PID
    - Equithermic curves - adjusts the temperature based on indoor and outdoor temperatures
-- Hysteresis setting (for accurate maintenance of room temperature)
-- Ability to connect an external sensors to monitor outdoor and indoor temperature ([compatible sensors](https://github.com/Laxilef/OTGateway/wiki/Compatibility#temperature-sensors))
-- Emergency mode. If the Wi-Fi connection is lost or the gateway cannot connect to the MQTT server, the mode will turn on. This mode will automatically maintain the set temperature and prevent your home from freezing. In this mode it is also possible to use equithermal curves (weather-compensated control).
-- Automatic error reset (not with all boilers)
+- Hysteresis setting _(for accurate maintenance of room temperature)_
+- Ability to connect [additional (external) sensors](https://github.com/Laxilef/OTGateway/wiki/Compatibility#temperature-sensors): Dallas (1-wire), NTC 10k, Bluetooth (BLE). Makes it possible to monitor indoor and outdoor temperatures, temperatures on pipes/heat exchangers/etc.
+- Emergency mode. In any dangerous situation _(loss of connection with Wifi, MQTT, sensors, etc)_ it will not let you and your home freeze.
+- Ability of remote fault reset _(not with all boilers)_
 - Diagnostics:
-  - The process of heating: works/does not work
-  - The process of heating water for hot water: working/not working
-  - Display of boiler errors
-  - Burner status (flame): on/off
-  - Burner modulation level in percent
-  - Pressure in the heating system
-  - Gateway status (depending on errors and connection status)
-  - Boiler connection status via OpenTherm interface
-  - The current temperature of the heat carrier (usually the return heat carrier)
-  - Set heat carrier temperature (depending on the selected mode)
-  - Current hot water temperature
+  - Displaying gateway status
+  - Displaying the connection status to the boiler via OpenTherm
+  - Displaying the fault status and fault code
+  - Displaying the diagnostic status & diagnostic code
+  - Display of the process of heating: works/does not work
+  - Display of burner (flame) status: on/off
+  - Display of burner modulation level in percent
+  - Display of pressure in the heating system
+  - Display of current temperature of the heat carrier
+  - Display of return temperature of the heat carrier
+  - Display of setpoint heat carrier temperature (useful when using PID or Equitherm)
+  - Display of the process of DHW: working/not working
+  - Display of current DHW temperature
+  - _And other information..._
 - [Home Assistant](https://www.home-assistant.io/) integration via MQTT. The ability to create any automation for the boiler!
 
-![logo](/assets/ha.png)
-
 ## Documentation
 All available information and instructions can be found in the wiki:
 
@@ -52,6 +56,7 @@ All available information and instructions can be found in the wiki:
       * [Ratios](https://github.com/Laxilef/OTGateway/wiki#ratios)
       * [Fit coefficients](https://github.com/Laxilef/OTGateway/wiki#fit-coefficients)
    * [PID mode](https://github.com/Laxilef/OTGateway/wiki#pid-mode)
+   * [Logs and debug](https://github.com/Laxilef/OTGateway/wiki#logs-and-debug)
 * [Compatibility](https://github.com/Laxilef/OTGateway/wiki/Compatibility)
    * [Boilers](https://github.com/Laxilef/OTGateway/wiki/Compatibility#boilers)
    * [Boards](https://github.com/Laxilef/OTGateway/wiki/Compatibility#boards)
@@ -64,21 +69,5 @@ All available information and instructions can be found in the wiki:
       * [Connection](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#connection)
       * [Leds on board](https://github.com/Laxilef/OTGateway/wiki/OT-adapters#leds-on-board)
 
-
-
-## Dependencies
-- [ESP8266Scheduler](https://github.com/nrwiersma/ESP8266Scheduler) (for ESP8266)
-- [ESP32Scheduler](https://github.com/laxilef/ESP32Scheduler) (for ESP32)
-- [ArduinoJson](https://github.com/bblanchon/ArduinoJson)
-- [OpenTherm Library](https://github.com/ihormelnyk/opentherm_library)
-- [ArduinoMqttClient](https://github.com/arduino-libraries/ArduinoMqttClient)
-- [ESPTelnet](https://github.com/LennartHennigs/ESPTelnet)
-- [FileData](https://github.com/GyverLibs/FileData)
-- [GyverPID](https://github.com/GyverLibs/GyverPID)
-- [GyverBlinker](https://github.com/GyverLibs/GyverBlinker)
-- [DallasTemperature](https://github.com/milesburton/Arduino-Temperature-Control-Library)
-- [TinyLogger](https://github.com/laxilef/TinyLogger)
-
-## 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
@@ -91,7 +91,7 @@ board_build.partitions = esp32_partitions.csv
 lib_deps =
 	${env.lib_deps}
 	laxilef/ESP32Scheduler@^1.0.1
-nimble_lib = h2zero/NimBLE-Arduino@^1.4.2
+nimble_lib = h2zero/NimBLE-Arduino@^2.1.0
 lib_ignore = 
 extra_scripts = 
 	post:tools/esp32.py

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,25 +1038,27 @@ protected:
     }
 
     // Set CH2 temp
-    if (vars.master.ch2.enabled && !settings.opentherm.nativeHeatingControl) {
-      // Converted target CH2 temp
-      float convertedTemp = convertTemp(
-        vars.master.ch2.targetTemp,
-        settings.system.unitSystem,
-        settings.opentherm.unitSystem
-      );
+    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,
+          settings.system.unitSystem,
+          settings.opentherm.unitSystem
+        );
 
-      if (this->needSetCh2Temp(convertedTemp)) {
-        if (this->setCh2Temp(convertedTemp)) {
-          this->ch2SetTempTime = millis();
+        if (this->needSetCh2Temp(convertedTemp)) {
+          if (this->setCh2Temp(convertedTemp)) {
+            this->ch2SetTempTime = millis();
 
-          Log.sinfoln(
-            FPSTR(L_OT_CH2), F("Set temp: %.2f (converted: %.2f, response: %.2f)"),
-            vars.master.ch2.targetTemp, convertedTemp, vars.slave.ch2.targetTemp
-          );
+            Log.sinfoln(
+              FPSTR(L_OT_CH2), F("Set temp: %.2f (converted: %.2f, response: %.2f)"),
+              vars.master.ch2.targetTemp, convertedTemp, vars.slave.ch2.targetTemp
+            );
 
-        } else {
-          Log.swarningln(FPSTR(L_OT_CH2), F("Failed set temp"));
+          } else {
+            Log.swarningln(FPSTR(L_OT_CH2), F("Failed set temp"));
+          }
         }
       }
     }

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)) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
+          this->webServer->requestAuthentication(BASIC_AUTH);
           return false;
         }
 
@@ -119,11 +119,9 @@ protected:
 
     // restart
     this->webServer->on(F("/restart.html"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          this->webServer->send(401);
-          return;
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        this->webServer->requestAuthentication(BASIC_AUTH);
+        return;
       }
 
       vars.actions.restart = true;
@@ -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)) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
+          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)) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
+          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)) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
+          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)) {
-          this->webServer->requestAuthentication(DIGEST_AUTH);
+        if (this->isAuthRequired() && !this->isValidCredentials()) {
+          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,10 +220,8 @@ protected:
 
     // backup
     this->webServer->on(F("/api/backup/save"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
       JsonDocument doc;
@@ -248,10 +244,8 @@ protected:
     });
 
     this->webServer->on(F("/api/backup/restore"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
       if (vars.states.restarting) {
@@ -329,10 +323,8 @@ protected:
 
     // network
     this->webServer->on(F("/api/network/settings"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
       JsonDocument doc;
@@ -343,10 +335,8 @@ protected:
     });
 
     this->webServer->on(F("/api/network/settings"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
       
       if (vars.states.restarting) {
@@ -402,11 +392,8 @@ protected:
     });
 
     this->webServer->on(F("/api/network/scan"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          this->webServer->send(401);
-          return;
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
       auto apCount = WiFi.scanComplete();
@@ -448,10 +435,8 @@ protected:
 
     // settings
     this->webServer->on(F("/api/settings"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
       JsonDocument doc;
@@ -462,10 +447,8 @@ protected:
     });
 
     this->webServer->on(F("/api/settings"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
       
       if (vars.states.restarting) {
@@ -513,10 +496,8 @@ protected:
 
     // sensors list
     this->webServer->on(F("/api/sensors"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
       bool detailed = false;
@@ -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,10 +525,8 @@ protected:
 
     // sensor settings
     this->webServer->on(F("/api/sensor"), HTTP_GET, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
       
       if (!this->webServer->hasArg(F("id"))) {
@@ -571,10 +551,8 @@ protected:
     });
     
     this->webServer->on(F("/api/sensor"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
       
       if (vars.states.restarting) {
@@ -654,10 +632,8 @@ protected:
     });
 
     this->webServer->on(F("/api/vars"), HTTP_POST, [this]() {
-      if (this->isAuthRequired()) {
-        if (!this->webServer->authenticate(settings.portal.login, settings.portal.password)) {
-          return this->webServer->send(401);
-        }
+      if (this->isAuthRequired() && !this->isValidCredentials()) {
+        return this->webServer->send(401);
       }
 
       const String& plain = this->webServer->arg(0);
@@ -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) {
-                sensorNode.classList.add("hidden");
+              if (!sData.enabled || sData.purpose == 255) {
+                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/pages/upgrade.html

@@ -42,7 +42,7 @@
               <input type="file" name="settings" id="restore-file" accept=".json">
             </label>
 
-            <div class="grid">
+            <div role="group">
               <button type="submit" data-i18n>button.restore</button>
               <button type="button" class="secondary" onclick="window.location='/api/backup/save';" data-i18n>button.backup</button>
             </div>

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',
-        cache: 'no-cache',
+        method: "POST",
+        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',
-            cache: 'no-cache',
+            method: "POST",
+            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',
-              cache: 'no-cache',
+              method: "POST",
+              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',
-            cache: 'no-cache',
+            method: "POST",
+            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',
-        cache: 'no-cache',
+        method: "POST",
+        cache: "no-cache",
+        credentials: "include",
         body: fd
       });