Merge pull request #1781 from rabbitmq/rabbitmq-dotnet-client-1777

Fix #1777

Author: lukebakken

projects/RabbitMQ.Client/Impl/Channel.cs

@@ -795,13 +795,18 @@ protected async Task<bool> HandleConnectionCloseAsync(IncomingCommand cmd, Cance
             var reason = new ShutdownEventArgs(ShutdownInitiator.Peer, method._replyCode, method._replyText, method._classId, method._methodId);
             try
             {
-                await Session.Connection.ClosedViaPeerAsync(reason, cancellationToken)
-                    .ConfigureAwait(false);
-
+                /*
+                 * rabbitmq-dotnet-client#1777
+                 * Send the connection.close-ok message prior to closing within the client,
+                 * because ClosedViaPeerAsync will stop the main loop
+                 */
                 var replyMethod = new ConnectionCloseOk();
                 await ModelSendAsync(in replyMethod, cancellationToken)
                     .ConfigureAwait(false);
 
+                await Session.Connection.ClosedViaPeerAsync(reason, cancellationToken)
+                    .ConfigureAwait(false);
+
                 SetCloseReason(Session.Connection.CloseReason!);
             }
             catch (IOException)

projects/Test/Integration/GH/TestGitHubIssues.cs

@@ -34,6 +34,7 @@
 using System.Threading.Tasks;
 using RabbitMQ.Client;
 using RabbitMQ.Client.Events;
+using RabbitMQ.Client.Exceptions;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -147,5 +148,22 @@ public async Task DisposeWhileCatchingTimeoutDeadlocksRepro_GH1759()
 
             await _conn.DisposeAsync();
         }
+
+        [Fact]
+        public async Task InvalidCredentialsShouldThrow_GH1777()
+        {
+            string userPass = Guid.NewGuid().ToString();
+
+            _connFactory = new ConnectionFactory
+            {
+                UserName = userPass,
+                Password = userPass
+            };
+
+            BrokerUnreachableException ex =
+                await Assert.ThrowsAnyAsync<BrokerUnreachableException>(
+                    async () => await _connFactory.CreateConnectionAsync());
+            Assert.IsAssignableFrom<PossibleAuthenticationFailureException>(ex.InnerException);
+        }
     }
 }