* Restore ICredentialsProvider to IConnectionFactory

* Make `TestRefreshTokenFailed` test work with new code

Author: lukebakken

projects/RabbitMQ.Client/PublicAPI.Unshipped.txt

@@ -13,6 +13,8 @@ RabbitMQ.Client.Credentials.UserName.get -> string!
 RabbitMQ.Client.Credentials.ValidUntil.get -> System.TimeSpan?
 RabbitMQ.Client.ExternalMechanism.HandleChallengeAsync(byte[]? challenge, RabbitMQ.Client.ConnectionConfig! config, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<byte[]!>!
 RabbitMQ.Client.IAuthMechanism.HandleChallengeAsync(byte[]? challenge, RabbitMQ.Client.ConnectionConfig! config, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<byte[]!>!
+RabbitMQ.Client.IConnectionFactory.CredentialsProvider.get -> RabbitMQ.Client.ICredentialsProvider?
+RabbitMQ.Client.IConnectionFactory.CredentialsProvider.set -> void
 RabbitMQ.Client.ICredentialsProvider
 RabbitMQ.Client.ICredentialsProvider.GetCredentialsAsync(System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.Client.Credentials!>!
 RabbitMQ.Client.ICredentialsProvider.Name.get -> string!

projects/RabbitMQ.Client/client/api/IConnectionFactory.cs

@@ -74,6 +74,11 @@ public interface IConnectionFactory
         /// </summary>
         string VirtualHost { get; set; }
 
+        /// <summary>
+        /// ICredentialsProvider used to obtain username and password.
+        /// </summary>
+        public ICredentialsProvider? CredentialsProvider { get; set; }
+
         /// <summary>
         /// Sets or gets the AMQP Uri to be used for connections.
         /// </summary>

projects/Test/OAuth2/TestCredentialsRefresher.cs

@@ -43,60 +43,30 @@ public class MockCredentialsProvider : ICredentialsProvider
     {
         private readonly ITestOutputHelper _testOutputHelper;
         private readonly TimeSpan _validUntil;
-        // private Exception _ex = null;
-        // private bool _refreshCalled = false;
+        private readonly Exception? _maybeGetCredentialsException;
 
-        public MockCredentialsProvider(ITestOutputHelper testOutputHelper, TimeSpan validUntil)
+        public MockCredentialsProvider(ITestOutputHelper testOutputHelper, TimeSpan validUntil,
+            Exception? maybeGetCredentialsException = null)
         {
             _testOutputHelper = testOutputHelper;
             _validUntil = validUntil;
+            _maybeGetCredentialsException = maybeGetCredentialsException;
         }
 
         public string Name => GetType().Name;
-        /*
-        public bool RefreshCalled
+
+        public Task<Credentials> GetCredentialsAsync(CancellationToken cancellationToken = default)
         {
-            get
+            if (_maybeGetCredentialsException is null)
             {
-                return _refreshCalled;
+                var creds = new Credentials(this.GetType().Name, "guest", "guest", _validUntil);
+                return Task.FromResult(creds);
             }
-        }
-
-        public string UserName => "guest";
-
-        public string Password
-        {
-            get
+            else
             {
-                if (_ex == null)
-                {
-                    return "guest";
-                }
-                else
-                {
-                    throw _ex;
-                }
+                throw _maybeGetCredentialsException;
             }
         }
-
-        public TimeSpan? ValidUntil => _validUntil;
-
-        public void Refresh()
-        {
-            _refreshCalled = true;
-        }
-
-        public void PasswordThrows(Exception ex)
-        {
-            _ex = ex;
-        }
-        */
-
-        public Task<Credentials> GetCredentialsAsync(CancellationToken cancellationToken = default)
-        {
-            var creds = new Credentials(this.GetType().Name, "guest", "guest", _validUntil);
-            return Task.FromResult(creds);
-        }
     }
 
     public class TestCredentialsRefresher
@@ -113,7 +83,7 @@ public async Task TestRefreshToken()
         {
             var expectedValidUntil = TimeSpan.FromSeconds(1);
             var tcs = new TaskCompletionSource<Credentials>(TaskCreationOptions.RunContinuationsAsynchronously);
-            var credentialsProvider = new MockCredentialsProvider(_testOutputHelper, TimeSpan.FromSeconds(1));
+            var credentialsProvider = new MockCredentialsProvider(_testOutputHelper, expectedValidUntil);
 
             Task cb(Credentials? argCreds, Exception? ex, CancellationToken argToken)
             {
@@ -144,34 +114,49 @@ Task cb(Credentials? argCreds, Exception? ex, CancellationToken argToken)
             Assert.Equal("guest", credentials.Password);
             Assert.Equal(expectedValidUntil, credentials.ValidUntil);
         }
-    }
 
-    /*
-    [Fact]
-    public async Task TestRefreshTokenFailed()
-    {
-        var tcs = new TaskCompletionSource<bool>(TaskCreationOptions.RunContinuationsAsynchronously);
-        using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5)))
+        [Fact]
+        public async Task TestRefreshTokenFailed()
         {
-            using (CancellationTokenRegistration ctr = cts.Token.Register(() => tcs.TrySetCanceled()))
+            string exceptionMessage = nameof(TestCredentialsRefresher);
+            var expectedException = new Exception(exceptionMessage);
+
+            var expectedValidUntil = TimeSpan.FromSeconds(1);
+            var tcs = new TaskCompletionSource<Credentials?>(TaskCreationOptions.RunContinuationsAsynchronously);
+            var credentialsProvider = new MockCredentialsProvider(_testOutputHelper, expectedValidUntil, expectedException);
+
+            ushort callbackCount = 0;
+            Task cb(Credentials? argCreds, Exception? ex, CancellationToken argToken)
             {
-                var credentialsProvider = new MockCredentialsProvider(_testOutputHelper, TimeSpan.FromSeconds(1));
+                callbackCount++;
 
-                Task cb(bool arg)
+                if (ex != null)
                 {
-                    tcs.SetResult(arg);
-                    return Task.CompletedTask;
+                    tcs.SetException(ex);
                 }
 
-                var ex = new Exception();
-                credentialsProvider.PasswordThrows(ex);
+                return Task.CompletedTask;
+            }
 
-                _credentialRefresher.Register(credentialsProvider, cb);
-                Assert.False(await tcs.Task);
-                Assert.True(credentialsProvider.RefreshCalled);
-                Assert.True(_credentialRefresher.Unregister(credentialsProvider));
+            Credentials? credentials = null;
+            using (var cts = new CancellationTokenSource(TimeSpan.FromSeconds(5)))
+            {
+                using (CancellationTokenRegistration ctr = cts.Token.Register(() => tcs.TrySetCanceled()))
+                {
+                    var credentialRefresher = new CredentialsRefresher(credentialsProvider, cb, cts.Token);
+                    try
+                    {
+                        credentials = await tcs.Task;
+                    }
+                    catch (Exception ex)
+                    {
+                        Assert.Same(expectedException, ex);
+                    }
+                }
             }
+
+            Assert.Null(credentials);
+            Assert.Equal(1, callbackCount);
         }
     }
-    */
 }