move WithHubCredentials (#99)

Co-authored-by: ridomin <[email protected]>
iotmodels · Mar 14, 2023 · 1cd5ad4 · 1cd5ad4
1 parent 61037a8
commit 1cd5ad4
Show file tree

Hide file tree

Showing 12 changed files with 39 additions and 39 deletions.
diff --git a/samples/iothub-sample/Device.cs b/samples/iothub-sample/Device.cs
@@ -23,7 +23,7 @@ public Device(ILogger<Device> logger, IConfiguration configuration)
 
     protected override async Task ExecuteAsync(CancellationToken stoppingToken)
     {
-        var connectionSettings = new ConnectionSettings(_configuration.GetConnectionString("cs"));
+        var connectionSettings = new ConnectionSettings(_configuration.GetConnectionString("cs1"));
         _logger.LogWarning("Connecting to: {connectionSettings}", connectionSettings);
 
         var client = new HubMqttClient(await HubDpsFactory.CreateFromConnectionSettingsAsync(connectionSettings, stoppingToken));

diff --git a/samples/iothub-sample/Program.cs b/samples/iothub-sample/Program.cs
@@ -9,10 +9,10 @@ public class Program
         public static void Main(string[] args)
         {
 
-            //using (var consoleListener = new ConsoleTraceListener())
-            //{
-            //    Trace.Listeners.Add(consoleListener);
-            //}
+            using (var consoleListener = new ConsoleTraceListener())
+            {
+                Trace.Listeners.Add(consoleListener);
+            }
 
             CreateHostBuilder(args).Build().Run();
         }

diff --git a/...ensions.MultiCloud/Connections/SasAuth.cs → ...oud.AzureIoTClient/Connections/SasAuth.cs b/...ensions.MultiCloud/Connections/SasAuth.cs → ...oud.AzureIoTClient/Connections/SasAuth.cs
@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace MQTTnet.Extensions.MultiCloud.Connections;
+namespace MQTTnet.Extensions.MultiCloud.AzureIoTClient.Connections;
 
 internal class SasAuth
 {

diff --git a/...ud/Connections/WithAzureDpsCredentials.cs → ...nt/Connections/WithAzureDpsCredentials.cs b/...ud/Connections/WithAzureDpsCredentials.cs → ...nt/Connections/WithAzureDpsCredentials.cs
@@ -1,4 +1,5 @@
 using MQTTnet.Client;
+using MQTTnet.Extensions.MultiCloud.AzureIoTClient.Connections;
 using System.Security.Authentication;
 using System.Security.Cryptography.X509Certificates;
 

diff --git a/...Connections/WithAzureIoTHubCredentials.cs → ...Connections/WithAzureIoTHubCredentials.cs b/...Connections/WithAzureIoTHubCredentials.cs → ...Connections/WithAzureIoTHubCredentials.cs
@@ -1,10 +1,11 @@
 using MQTTnet.Client;
+using MQTTnet.Extensions.MultiCloud.AzureIoTClient.Connections;
 
 namespace MQTTnet.Extensions.MultiCloud.Connections;
 
 public static partial class MqttNetExtensions
 {
-    internal static MqttClientOptionsBuilder WithAzureIoTHubCredentials(this MqttClientOptionsBuilder builder, ConnectionSettings? cs)
+    public static MqttClientOptionsBuilder WithAzureIoTHubCredentials(this MqttClientOptionsBuilder builder, ConnectionSettings? cs)
     {
         string? hostName = cs!.HostName!;
         if (!string.IsNullOrEmpty(cs.GatewayHostName))
@@ -30,7 +31,9 @@ internal static MqttClientOptionsBuilder WithAzureIoTHubCredentials(this MqttCli
             }
 
             builder.WithTlsSettings(cs);
-            return builder.WithAzureIoTHubCredentialsSas(hostName, cs.DeviceId!, cs.ModuleId!, cs.HostName!, cs.SharedAccessKey!, cs.ModelId!, cs.SasMinutes, cs.GatewayHostName!);
+            builder.WithAzureIoTHubCredentialsSas(hostName, cs.DeviceId!, cs.ModuleId!, cs.HostName!, cs.SharedAccessKey!, cs.ModelId!, cs.SasMinutes, cs.GatewayHostName!);
+            builder.WithClientId(cs.ClientId);
+            return builder;
         }
         else if (cs?.Auth == AuthType.X509)
         {
@@ -49,7 +52,9 @@ internal static MqttClientOptionsBuilder WithAzureIoTHubCredentials(this MqttCli
             }
 
             builder.WithTlsSettings(cs);
-            return builder.WithAzureIoTHubCredentialsX509(hostName, cs.ClientId!, cs.ModelId!);
+            builder.WithAzureIoTHubCredentialsX509(hostName, cs.ClientId!, cs.ModelId!);
+            builder.WithClientId(cs.ClientId);
+            return builder;
         }
         else
         {

diff --git a/src/MQTTnet.Extensions.MultiCloud.AzureIoTClient/HubDpsFactory.cs b/src/MQTTnet.Extensions.MultiCloud.AzureIoTClient/HubDpsFactory.cs
@@ -33,7 +33,7 @@ public static async Task<IMqttClient> CreateFromConnectionSettingsAsync(Connecti
             }
             else
             {
-                connAck = await mqtt!.ConnectAsync(new MqttClientOptionsBuilder().WithConnectionSettings(cs).Build(), cancellationToken);
+                connAck = await mqtt!.ConnectAsync(new MqttClientOptionsBuilder().WithAzureIoTHubCredentials(cs).Build(), cancellationToken);
             }
             if (connAck.ResultCode != MqttClientConnectResultCode.Success)
             {
@@ -53,7 +53,7 @@ private static MqttClientConnectResult ConnectWithTimer(IMqttClient mqtt, Connec
             Trace.TraceInformation("Reconnecting before SasToken expires");
             var connAck = mqtt.ConnectAsync(
                 new MqttClientOptionsBuilder()
-                    .WithConnectionSettings(connectionSettings)
+                    .WithAzureIoTHubCredentials(connectionSettings)
                     .WithKeepAlivePeriod(TimeSpan.FromSeconds(connectionSettings.KeepAliveInSeconds))
                     .Build(),
                 cancellationToken).Result;

diff --git a/src/MQTTnet.Extensions.MultiCloud.AzureIoTClient/InternalsVisibileTo.cs b/src/MQTTnet.Extensions.MultiCloud.AzureIoTClient/InternalsVisibileTo.cs
@@ -1,3 +1,3 @@
 using System.Runtime.CompilerServices;
 
-[assembly: InternalsVisibleTo("MQTTnet.Extensions.MultiCloud.UnitTests")]
+[assembly: InternalsVisibleTo("MQTTnet.Extensions.MultiCloud.UnitTests")]
diff --git a/src/MQTTnet.Extensions.MultiCloud/Connections/WithConnectionSettings.cs b/src/MQTTnet.Extensions.MultiCloud/Connections/WithConnectionSettings.cs
@@ -6,28 +6,21 @@ public static partial class MqttNetExtensions
 {
     public static MqttClientOptionsBuilder WithConnectionSettings(this MqttClientOptionsBuilder builder, ConnectionSettings cs, bool withLWT = false)
     {
-        if (cs.HostName != null && cs.HostName.Contains("azure-devices.net"))
+        builder
+            .WithTimeout(TimeSpan.FromSeconds(30))
+            .WithTcpServer(cs.HostName, cs.TcpPort)
+            .WithKeepAlivePeriod(TimeSpan.FromSeconds(cs.KeepAliveInSeconds))
+            .WithCleanSession(cs.CleanSession)
+            .WithTlsSettings(cs);
+
+        if (!string.IsNullOrEmpty(cs.Password))
         {
-            builder.WithAzureIoTHubCredentials(cs);
+            builder.WithCredentials(cs.UserName, cs.Password);
         }
-        else
+
+        if (cs.ClientId == "{machineName}")
         {
-            builder
-                .WithTimeout(TimeSpan.FromSeconds(30))
-                .WithTcpServer(cs.HostName, cs.TcpPort)
-                .WithKeepAlivePeriod(TimeSpan.FromSeconds(cs.KeepAliveInSeconds))
-                .WithCleanSession(cs.CleanSession)
-                .WithTlsSettings(cs);
-
-            if (!string.IsNullOrEmpty(cs.Password))
-            {
-                builder.WithCredentials(cs.UserName, cs.Password);
-            }
-
-            if (cs.ClientId == "{machineName}")
-            {
-                cs.ClientId = Environment.MachineName;
-            }
+            cs.ClientId = Environment.MachineName;
         }
 
         builder.WithClientId(cs.ClientId);

diff --git a/src/MQTTnet.Extensions.MultiCloud/Connections/WithTlsSettings.cs b/src/MQTTnet.Extensions.MultiCloud/Connections/WithTlsSettings.cs
@@ -6,7 +6,7 @@ namespace MQTTnet.Extensions.MultiCloud.Connections;
 
 public static partial class MqttNetExtensions
 {
-    internal static MqttClientOptionsBuilder WithTlsSettings(this MqttClientOptionsBuilder builder, ConnectionSettings cs)
+    public static MqttClientOptionsBuilder WithTlsSettings(this MqttClientOptionsBuilder builder, ConnectionSettings cs)
     {
         var tls = new MqttClientOptionsBuilderTlsParameters
         {

diff --git a/src/MQTTnet.Extensions.MultiCloud/Connections/X509ClientCertificateLocator.cs b/src/MQTTnet.Extensions.MultiCloud/Connections/X509ClientCertificateLocator.cs
@@ -3,7 +3,7 @@
 
 namespace MQTTnet.Extensions.MultiCloud.Connections;
 
-internal class X509ClientCertificateLocator
+public class X509ClientCertificateLocator
 {
     public static X509Certificate2 Load(string certSettings)
     {

diff --git a/src/MQTTnet.Extensions.MultiCloud/Connections/X509CommonNameParser.cs b/src/MQTTnet.Extensions.MultiCloud/Connections/X509CommonNameParser.cs
@@ -3,7 +3,7 @@
 
 namespace MQTTnet.Extensions.MultiCloud.Connections;
 
-internal static class X509CommonNameParser
+public static class X509CommonNameParser
 {
     public static string GetCNFromCertSubject(X509Certificate2 cert)
     {

diff --git a/tests/MQTTnet.Extensions.MultiCloud.IntegrationTests/IoTHubConnectionFixture.cs b/tests/MQTTnet.Extensions.MultiCloud.IntegrationTests/IoTHubConnectionFixture.cs
@@ -1,5 +1,6 @@
 using MQTTnet.Client;
 using MQTTnet.Extensions.MultiCloud.Connections;
+using MQTTnet.Extensions.MultiCloud.AzureIoTClient.Connections;
 using System.Text;
 
 namespace MQTTnet.Extensions.MultiCloud.IntegrationTests
@@ -23,7 +24,7 @@ public async Task DeviceSas()
 
             };
             var connAck = await client!.ConnectAsync(new MqttClientOptionsBuilder()
-                .WithConnectionSettings(cs)
+                .WithAzureIoTHubCredentials(cs)
                 .Build());
             Assert.Equal(MqttClientConnectResultCode.Success, connAck.ResultCode);
             Assert.True(client.IsConnected);
@@ -41,7 +42,7 @@ public async Task ModuleSas()
                 SharedAccessKey = "py0vifQWT7QGK4AiDO3IlreGsvXrLet+sKZnErKMkAk="
             };
             var connAck = await client!.ConnectAsync(new MqttClientOptionsBuilder()
-                .WithConnectionSettings(cs)
+                .WithAzureIoTHubCredentials(cs)
                 .Build());
             Assert.Equal(MqttClientConnectResultCode.Success, connAck.ResultCode);
             Assert.True(client.IsConnected);
@@ -57,7 +58,7 @@ public async Task DeviceCert()
                 X509Key = "ca-device.pem|ca-device.key"
             };
             var connAck = await client!.ConnectAsync(new MqttClientOptionsBuilder()
-                .WithConnectionSettings(cs)
+                .WithAzureIoTHubCredentials(cs)
                 .Build());
             Assert.Equal(MqttClientConnectResultCode.Success, connAck.ResultCode);
             Assert.True(client.IsConnected);
@@ -89,7 +90,7 @@ public async Task ModuleCert()
                 X509Key = "ca-module.pem|ca-module.key"
             };
             var connAck = await client!.ConnectAsync(new MqttClientOptionsBuilder()
-                .WithConnectionSettings(cs)
+                .WithAzureIoTHubCredentials(cs)
                 .Build());
             Assert.Equal(MqttClientConnectResultCode.Success, connAck.ResultCode);
             Assert.True(client.IsConnected);
@@ -108,7 +109,7 @@ public async Task ModuleSasUsingEdgeHub()
                 GatewayHostName = "localhost"
             };
             var connAck = await client!.ConnectAsync(new MqttClientOptionsBuilder()
-                .WithConnectionSettings(cs)
+                .WithAzureIoTHubCredentials(cs)
                 .Build());
             Assert.Equal(MqttClientConnectResultCode.Success, connAck.ResultCode);
             Assert.True(client.IsConnected);