Merge branch 'develop' into feature/MQTTv5

grammy-work · Dec 22, 2018 · 38b215e · 38b215e
2 parents 45df33c + ba4fdfb
commit 38b215e
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/Source/MQTTnet/Client/MqttClientOptionsBuilderWebSocketParameters.cs b/Source/MQTTnet/Client/MqttClientOptionsBuilderWebSocketParameters.cs
@@ -0,0 +1,12 @@
+using System.Collections.Generic;
+using System.Net;
+
+namespace MQTTnet.Client
+{
+    public class MqttClientOptionsBuilderWebSocketParameters
+    {
+        public IDictionary<string, string> RequestHeaders { get; set; }
+
+        public CookieContainer CookieContainer { get; set; }
+    }
+}
diff --git a/Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs b/Source/MQTTnet/Client/Options/MqttClientOptionsBuilder.cs
@@ -141,11 +141,13 @@ public MqttClientOptionsBuilder WithProxy(string address, string username = null
             return this;
         }
 
-        public MqttClientOptionsBuilder WithWebSocketServer(string uri)
+        public MqttClientOptionsBuilder WithWebSocketServer(string uri, MqttClientOptionsBuilderWebSocketParameters parameters = null)
         {
             _webSocketOptions = new MqttClientWebSocketOptions
             {
-                Uri = uri
+                Uri = uri,
+                RequestHeaders = parameters?.RequestHeaders,
+                CookieContainer = parameters?.CookieContainer
             };
 
             return this;