Add user and pass

.vscode/settings.json

@@ -1,6 +1,6 @@
 {
     "terminal.integrated.env.linux": {
-        "PATH": "/home/master/.platformio/penv/bin:/home/master/.platformio/penv:/usr/local/sbin:/usr/local/bin:/usr/bin:/usr/lib/jvm/default/bin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl",
+        "PATH": "/home/master/.platformio/penv/bin:/home/master/.platformio/penv:/home/master/bin:/usr/local/bin:/usr/bin:/bin:/usr/local/sbin:/usr/bin/site_perl:/usr/bin/vendor_perl:/usr/bin/core_perl:/sbin:/usr/sbin",
         "PLATFORMIO_CALLER": "vscode"
     }
 }

data/config.json

@@ -4,7 +4,7 @@
     "apSSID": "sprocket",
     "apPassword": "th3r31sn0Sp00n",
     "connectTimeout": 20000,
-    "stationSSID": "MyAP",
+    "stationSSID": "th1ngs4p",
     "stationPassword": "th3r31sn0Sp00n",
     "meshSSID": "whateverYouLike",
     "meshPassword": "somethingSneaky",

data/mqttConfig.json

@@ -2,5 +2,7 @@
     "mqttClientName" : "sprocket",
     "mqttBrokerHost" : "192.168.1.2",
     "mqttBrokerPort" : 1883,
-    "mqttRootTopic" : "wirelos/sprocket"
+    "mqttRootTopic" : "wirelos/sprocket",
+    "mqttUser": "",
+    "mqttPass": ""
 }

platformio.ini

@@ -12,7 +12,6 @@ lib_deps =
     TaskScheduler
     SPIFFS
     ArduinoJson
-    ArduinoOTA
     https://gitlab.com/wirelos/sprocket-lib.git#develop
     https://gitlab.com/wirelos/sprocket-network-wifi.git
 
@@ -35,3 +34,13 @@ monitor_baud = ${common.monitor_baud}
 framework = ${common.framework}
 lib_deps = ${common.lib_deps}
     PubSubClient
+
+[env:chat-esp01]
+src_filter = +<*> -<examples/> +<examples/chat/>
+platform = ${common.platform}
+board = esp01
+upload_speed = ${common.upload_speed}
+monitor_baud = ${common.monitor_baud}
+framework = ${common.framework}
+lib_deps = ${common.lib_deps}
+    PubSubClient

src/MqttConfig.h

@@ -7,6 +7,8 @@
 #define JSON_MQTT_BROKER_HOST "mqttBrokerHost"
 #define JSON_MQTT_BROKER_PORT "mqttBrokerPort"
 #define JSON_MQTT_TOPIC_ROOT "mqttRootTopic"
+#define JSON_MQTT_USER "mqttUser"
+#define JSON_MQTT_PASS "mqttPass"
 
 struct MqttConfig
 {
@@ -14,6 +16,8 @@ struct MqttConfig
     const char *brokerHost;
     int brokerPort;
     const char *topicRoot;
+    const char *user;
+    const char *pass;
 };
 
 struct MqttConfigJson : public MqttConfig, public JsonStruct
@@ -24,6 +28,8 @@ struct MqttConfigJson : public MqttConfig, public JsonStruct
         root[JSON_MQTT_BROKER_HOST] = brokerHost;
         root[JSON_MQTT_BROKER_PORT] = brokerPort;
         root[JSON_MQTT_TOPIC_ROOT] = topicRoot;
+        root[JSON_MQTT_USER] = user;
+        root[JSON_MQTT_PASS] = pass;
     }
     void fromJsonObject(JsonObject &json)
     {
@@ -37,6 +43,8 @@ struct MqttConfigJson : public MqttConfig, public JsonStruct
         brokerHost = getAttr(json, JSON_MQTT_BROKER_HOST);
         brokerPort = getIntAttrFromJson(json, JSON_MQTT_BROKER_PORT);
         topicRoot = getAttr(json, JSON_MQTT_TOPIC_ROOT);
+        user = getAttr(json, JSON_MQTT_USER);
+        pass = getAttr(json, JSON_MQTT_PASS);
         valid = 1;
     };
 };

src/MqttPlugin.cpp

@@ -12,6 +12,8 @@ void MqttPlugin::applyConfig(MqttConfig cfg) {
     brokerPort = cfg.brokerPort;
     clientName = String(cfg.clientName);
     topicRoot = String(cfg.topicRoot);
+    user = String(cfg.user);
+    pass = String(cfg.pass);
 }
 
 void MqttPlugin::applyConfigFromFile(const char* fileName) {
@@ -51,7 +53,13 @@ void MqttPlugin::connect()
     if (!client->connected())
     {
         PRINT_MSG(Serial, "MQTT", "try connect");
-        if (client->connect(clientName.c_str()))
+        int connected = 0;
+        if(user.length() > 0 && pass.length() > 0){
+            connected = client->connect(clientName.c_str(), user.c_str(), pass.c_str());
+        } else {
+            client->connect(clientName.c_str());
+        }
+        if (connected)
         {
             // bind handlers to all local subscriptions
             if (!subscribed)

src/MqttPlugin.h

@@ -37,6 +37,8 @@ private:
   int brokerPort;
   String clientName;
   String topicRoot;
+  String user;
+  String pass;
   int connectTries = 0;
   int maxConnectTries = 5; // TODO add to config
 

src/examples/basic/main.cpp

@@ -26,7 +26,7 @@ void setup()
     });
     sprocket->addTask(publishHeap);
     sprocket->addPlugin(
-        new MqttPlugin({"mqttSprocket", "192.168.1.2", 1883, "wirelos/mqttSprocket/"}));
+        new MqttPlugin({"clientId", "192.168.1.2", 1883, "some/topic", "myuser", "mypass"}));
 
     network = new WiFiNet(
         SPROCKET_MODE,