From 4eb65fc3d2b865e482ed07e0180bfcb236af97a3 Mon Sep 17 00:00:00 2001
From: PMExtra <pm@jubeat.net>
Date: Tue, 31 Mar 2020 16:42:04 +0800
Subject: [PATCH 1/2] Support MqttClientOptionsBuilder.WithConnectionUri()

---
 .../MqttClientOptionsBuilderExtension.cs      | 48 +++++++++++++++++++
 .../MqttClientOptionsBuilder_Tests.cs         | 22 +++++++++
 2 files changed, 70 insertions(+)
 create mode 100644 Source/MQTTnet/Extensions/MqttClientOptionsBuilderExtension.cs
 create mode 100644 Tests/MQTTnet.Core.Tests/MqttClientOptionsBuilder_Tests.cs

diff --git a/Source/MQTTnet/Extensions/MqttClientOptionsBuilderExtension.cs b/Source/MQTTnet/Extensions/MqttClientOptionsBuilderExtension.cs
new file mode 100644
index 0000000..fc9da23
--- /dev/null
+++ b/Source/MQTTnet/Extensions/MqttClientOptionsBuilderExtension.cs
@@ -0,0 +1,48 @@
+using System;
+using System.Linq;
+using MQTTnet.Client.Options;
+
+namespace MQTTnet.Extensions
+{
+    public static class MqttClientOptionsBuilderExtension
+    {
+        public static MqttClientOptionsBuilder WithConnectionUri(this MqttClientOptionsBuilder builder, Uri uri)
+        {
+            var port = uri.IsDefaultPort ? null : (int?) uri.Port;
+            switch (uri.Scheme.ToLower())
+            {
+                case "tcp":
+                case "mqtt":
+                    builder.WithTcpServer(uri.Host, port);
+                    break;
+
+                case "mqtts":
+                    builder.WithTcpServer(uri.Host, port).WithTls();
+                    break;
+
+                case "ws":
+                case "wss":
+                    builder.WithWebSocketServer(uri.ToString());
+                    break;
+
+                default:
+                    throw new ArgumentException("Unexpected scheme in uri.");
+            }
+            
+            if (!string.IsNullOrEmpty(uri.UserInfo))
+            {
+                var userInfo = uri.UserInfo.Split(':');
+                var username = userInfo[0];
+                var password = userInfo.Length > 1 ? userInfo[1] : "";
+                builder.WithCredentials(username, password);
+            }
+
+            return builder;
+        }
+
+        public static MqttClientOptionsBuilder WithConnectionUri(this MqttClientOptionsBuilder builder, string uri)
+        {
+            return WithConnectionUri(builder, new Uri(uri, UriKind.Absolute));
+        }
+    }
+}
diff --git a/Tests/MQTTnet.Core.Tests/MqttClientOptionsBuilder_Tests.cs b/Tests/MQTTnet.Core.Tests/MqttClientOptionsBuilder_Tests.cs
new file mode 100644
index 0000000..a482081
--- /dev/null
+++ b/Tests/MQTTnet.Core.Tests/MqttClientOptionsBuilder_Tests.cs
@@ -0,0 +1,22 @@
+using System.Linq;
+using System.Text;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+using MQTTnet.Client.Options;
+using MQTTnet.Extensions;
+
+namespace MQTTnet.Tests
+{
+    [TestClass]
+    public class MqttClientOptionsBuilder_Tests
+    {
+        [TestMethod]
+        public void WithConnectionUri_Credential_Test()
+        {
+            var options = new MqttClientOptionsBuilder()
+                .WithConnectionUri("mqtt://user:password@127.0.0.1")
+                .Build();
+            Assert.AreEqual("user", options.Credentials.Username);
+            Assert.IsTrue(Encoding.UTF8.GetBytes("password").SequenceEqual(options.Credentials.Password));
+        }
+    }
+}

From 9368eebfd59f123310476406e9d96ed5888deadf Mon Sep 17 00:00:00 2001
From: PMExtra <pm@jubeat.net>
Date: Thu, 2 Apr 2020 16:07:21 +0800
Subject: [PATCH 2/2] Update nuspec.

---
 Build/MQTTnet.nuspec | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Build/MQTTnet.nuspec b/Build/MQTTnet.nuspec
index 7e78b6c..5892729 100644
--- a/Build/MQTTnet.nuspec
+++ b/Build/MQTTnet.nuspec
@@ -22,6 +22,7 @@
 * [Server] Added interceptor for unsubscriptions.
 * [MQTTnet.Server] Added interceptor for unsubscriptions.
 * [MQTTnet.AspNetCore] improved compatibility with AspNetCore 3.1
+* [Client] Support WithConnectionUri to configure client (thanks to @PMExtra).
     </releaseNotes>
     <copyright>Copyright Christian Kratky 2016-2020</copyright>
     <tags>MQTT Message Queue Telemetry Transport MQTTClient MQTTServer Server MQTTBroker Broker NETStandard IoT InternetOfThings Messaging Hardware Arduino Sensor Actuator M2M ESP Smart Home Cities Automation Xamarin</tags>