Merge pull request #746 from bcrosnier/pr/mqtt5-assigned-client-id

Better handling of AssignedClientIdentifier - chkr1011/MQTTnet#745

Source/MQTTnet/Server/MqttClientConnection.cs

@@ -118,13 +118,13 @@ namespace MQTTnet.Server
             _cancellationToken.Dispose();
         }
 
-        public Task<MqttClientDisconnectType> RunAsync()
+        public Task<MqttClientDisconnectType> RunAsync(MqttConnectionValidatorContext connectionValidatorContext)
         {
-            _packageReceiverTask = RunInternalAsync();
+            _packageReceiverTask = RunInternalAsync(connectionValidatorContext);
             return _packageReceiverTask;
         }
 
-        private async Task<MqttClientDisconnectType> RunInternalAsync()
+        private async Task<MqttClientDisconnectType> RunInternalAsync(MqttConnectionValidatorContext connectionValidatorContext)
         {
             var disconnectType = MqttClientDisconnectType.NotClean;
             try
@@ -142,12 +142,8 @@ namespace MQTTnet.Server
                 _keepAliveMonitor.Start(ConnectPacket.KeepAlivePeriod, _cancellationToken.Token);
 
                 await SendAsync(
-                    new MqttConnAckPacket
+                    _channelAdapter.PacketFormatterAdapter.DataConverter.CreateConnAckPacket(connectionValidatorContext)
-                    {
+                    ).ConfigureAwait(false);
-                        ReturnCode = MqttConnectReturnCode.ConnectionAccepted,
-                        ReasonCode = MqttConnectReasonCode.Success,
-                        IsSessionPresent = !Session.IsCleanSession
-                    }).ConfigureAwait(false);
 
                 Session.IsCleanSession = false;
 

Source/MQTTnet/Server/MqttClientSessionsManager.cs

@@ -240,10 +240,10 @@ namespace MQTTnet.Server
                     return;
                 }
 
-                clientId = connectPacket.ClientId;
-
                 var connectionValidatorContext = await ValidateConnectionAsync(connectPacket, channelAdapter).ConfigureAwait(false);
 
+                clientId = connectPacket.ClientId;
+
                 if (connectionValidatorContext.ReasonCode != MqttConnectReasonCode.Success)
                 {
                     // Send failure response here without preparing a session. The result for a successful connect
@@ -258,7 +258,7 @@ namespace MQTTnet.Server
 
                 await _eventDispatcher.HandleClientConnectedAsync(clientId).ConfigureAwait(false);
                 
-                disconnectType = await connection.RunAsync().ConfigureAwait(false);
+                disconnectType = await connection.RunAsync(connectionValidatorContext).ConfigureAwait(false);
             }
             catch (OperationCanceledException)
             {

Tests/MQTTnet.Core.Tests/MQTTv5/Client_Tests.cs

@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 using MQTTnet.Client;
@@ -57,6 +58,65 @@ namespace MQTTnet.Tests.MQTTv5
                 Assert.AreEqual(2, receivedMessage.UserProperties.Count);
             }
         }
+        [TestMethod]
+        public async Task Connect_With_AssignedClientId()
+        {
+            using (var testEnvironment = new TestEnvironment())
+            {
+                string serverConnectedClientId = null;
+                string serverDisconnectedClientId = null;
+                string clientAssignedClientId = null;
+
+                // Arrange server
+                var disconnectedMre = new ManualResetEventSlim();
+                var serverOptions = new MqttServerOptionsBuilder()
+                    .WithConnectionValidator((context) =>
+                    {
+                        if (string.IsNullOrEmpty(context.ClientId))
+                        {
+                            context.AssignedClientIdentifier = "test123";
+                            context.ReasonCode = MqttConnectReasonCode.Success;
+                        }
+                    });
+                await testEnvironment.StartServerAsync(serverOptions);
+                testEnvironment.Server.UseClientConnectedHandler((args) =>
+                {
+                    serverConnectedClientId = args.ClientId;
+                });
+                testEnvironment.Server.UseClientDisconnectedHandler((args) =>
+                {
+                    serverDisconnectedClientId = args.ClientId;
+                    disconnectedMre.Set();
+                });
+
+                // Arrange client
+                var client = testEnvironment.CreateClient();
+                client.UseConnectedHandler((args) =>
+                {
+                    clientAssignedClientId = args.AuthenticateResult.AssignedClientIdentifier;
+                });
+
+                // Act
+                await client.ConnectAsync(new MqttClientOptionsBuilder()
+                    .WithTcpServer("127.0.0.1", testEnvironment.ServerPort)
+                    .WithProtocolVersion(MqttProtocolVersion.V500)
+                    .WithClientId(null)
+                    .Build());
+                await client.DisconnectAsync();
+
+                // Wait for ClientDisconnectedHandler to trigger
+                disconnectedMre.Wait(500);
+
+                // Assert
+                Assert.IsNotNull(serverConnectedClientId);
+                Assert.IsNotNull(serverDisconnectedClientId);
+                Assert.IsNotNull(clientAssignedClientId);
+                Assert.AreEqual("test123", serverConnectedClientId);
+                Assert.AreEqual("test123", serverDisconnectedClientId);
+                Assert.AreEqual("test123", clientAssignedClientId);
+
+            }
+        }
 
         [TestMethod]
         public async Task Connect()