Add mqtt_secure parameter to MQTT credentials command.

Author: h2zero

docs/use/gateway.md

@@ -42,11 +42,18 @@ If the new connection fails the gateway will fallback to the previous connection
 :::
 
 ## Change the MQTT broker credentials
-
-`mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m '{"mqtt_user":"user_name", "mqtt_password":"password", "mqtt_server":"host", "mqtt_port":"port"}'`
-
+```
+mosquitto_pub -t "home/OpenMQTTGateway/commands/MQTTtoSYS/config" -m
+'{
+  "mqtt_user": "user_name",
+  "mqtt_password": "password",
+  "mqtt_server": "host",
+  "mqtt_port": "port",
+  "mqtt_secure": "false"
+}'
+```
 ::: tip
-Server and port are only required if changing connection to another broker, **only unsecured broker connections are supported**.  
+Server, port, and secure_flag are only required if changing connection to another broker.  
 If the new connection fails the gateway will fallback to the previous connection.
 :::
 

main/main.ino

@@ -1848,13 +1848,20 @@ void MQTTtoSYS(char* topicOri, JsonObject& SYSdata) { // json object decoding
       bool update_server = false;
       void* prev_client = nullptr;
 
-      if (SYSdata.containsKey("mqtt_server") && SYSdata.containsKey("mqtt_port")) {
+      if (SYSdata.containsKey("mqtt_server") &&
+          SYSdata.containsKey("mqtt_port") &&
+          SYSdata.containsKey("mqtt_secure")) {
         update_server = true;
 
-        if (mqtt_secure) {
-          Log.warning(F("Switching to unsecure MQTT broker" CR));
-          prev_client = eClient;
-          eClient = new WiFiClient;
+        if (SYSdata.get<bool>("mqtt_secure") != mqtt_secure) {
+          if (!mqtt_secure) {
+            prev_client = eClient;
+            eClient = new WiFiClientSecure;
+          } else {
+            Log.warning(F("Switching to unsecure MQTT broker" CR));
+            prev_client = eClient;
+            eClient = new WiFiClient;
+          }
         }
 
         client.setServer(SYSdata.get<const char*>("mqtt_server"), SYSdata.get<unsigned int>("mqtt_port"));
@@ -1871,8 +1878,8 @@ void MQTTtoSYS(char* topicOri, JsonObject& SYSdata) { // json object decoding
         if (update_server) {
           strcpy(mqtt_server, SYSdata["mqtt_server"]);
           strcpy(mqtt_port, SYSdata["mqtt_port"]);
-          if (mqtt_secure) {
-            mqtt_secure = false;
+          if (prev_client != nullptr) {
+            mqtt_secure = !mqtt_secure;
             delete prev_client;
           }
         }