* Fix OAuth2 integration test bug

Author: lukebakken

projects/RabbitMQ.Client.OAuth2/CredentialsRefresher.cs

@@ -105,7 +105,7 @@ await _onRefreshed(null, ex, _linkedCts.Token)
                         .ConfigureAwait(false);
                 }
 
-                TimeSpan delaySpan = TimeSpan.FromMinutes(5); // TODO
+                TimeSpan delaySpan = TimeSpan.FromSeconds(30);
                 if (_credentials != null && _credentials.ValidUntil.HasValue)
                 {
                     delaySpan = TimeSpan.FromMilliseconds(_credentials.ValidUntil.Value.TotalMilliseconds * (1.0 - (1 / 3.0)));

projects/RabbitMQ.Client.OAuth2/OAuth2CredentialsProvider.cs

@@ -53,28 +53,26 @@ public OAuth2ClientCredentialsProvider(string name, IOAuth2Client oAuth2Client)
 
         public async Task<Credentials> GetCredentialsAsync(CancellationToken cancellationToken = default)
         {
-            bool mustRetrieveToken = false;
             await _semaphore.WaitAsync(cancellationToken)
                 .ConfigureAwait(false);
             try
             {
-                if (_token is null || _token.HasExpired)
+                if (_token == null || string.IsNullOrEmpty(_token.RefreshToken))
                 {
-                    mustRetrieveToken = true;
+                    _token = await _oAuth2Client.RequestTokenAsync(cancellationToken)
+                        .ConfigureAwait(false);
+                }
+                else
+                {
+                    _token = await _oAuth2Client.RefreshTokenAsync(_token, cancellationToken)
+                        .ConfigureAwait(false);
                 }
             }
             finally
             {
                 _semaphore.Release();
             }
 
-            cancellationToken.ThrowIfCancellationRequested();
-
-            if (mustRetrieveToken)
-            {
-                await RetrieveTokenAsync(cancellationToken).ConfigureAwait(false);
-            }
-
             if (_token is null)
             {
                 throw new InvalidOperationException("_token should not be null here");
@@ -90,28 +88,5 @@ public void Dispose()
         {
             _semaphore.Dispose();
         }
-
-        private async Task RetrieveTokenAsync(CancellationToken cancellationToken)
-        {
-            await _semaphore.WaitAsync(cancellationToken)
-                .ConfigureAwait(false);
-            try
-            {
-                if (_token == null || string.IsNullOrEmpty(_token.RefreshToken))
-                {
-                    _token = await _oAuth2Client.RequestTokenAsync(cancellationToken)
-                        .ConfigureAwait(false);
-                }
-                else
-                {
-                    _token = await _oAuth2Client.RefreshTokenAsync(_token, cancellationToken)
-                        .ConfigureAwait(false);
-                }
-            }
-            finally
-            {
-                _semaphore.Release();
-            }
-        }
     }
 }

projects/Test/OAuth2/TestOAuth2.cs

@@ -132,12 +132,13 @@ public class TestOAuth2 : IAsyncLifetime
         private readonly SemaphoreSlim _doneEvent = new SemaphoreSlim(0, 1);
         private readonly ITestOutputHelper _testOutputHelper;
         private readonly IConnectionFactory _connectionFactory;
-        private IConnection? _connection;
         private readonly int _tokenExpiresInSeconds;
         private readonly OAuth2ClientCredentialsProvider _credentialsProvider;
-        private readonly CredentialsRefresher _credentialsRefresher;
         private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
 
+        private IConnection? _connection;
+        private CredentialsRefresher? _credentialsRefresher;
+
         public TestOAuth2(ITestOutputHelper testOutputHelper)
         {
             _testOutputHelper = testOutputHelper;
@@ -156,15 +157,15 @@ public TestOAuth2(ITestOutputHelper testOutputHelper)
             };
 
             _tokenExpiresInSeconds = options.TokenExpiresInSeconds;
-
-            _credentialsRefresher = new CredentialsRefresher(_credentialsProvider,
-                OnCredentialsRefreshedAsync,
-                _cancellationTokenSource.Token);
         }
 
         public async Task InitializeAsync()
         {
-            _connection = await _connectionFactory.CreateConnectionAsync(CancellationToken.None);
+            _connection = await _connectionFactory.CreateConnectionAsync(_cancellationTokenSource.Token);
+
+            _credentialsRefresher = new CredentialsRefresher(_credentialsProvider,
+                OnCredentialsRefreshedAsync,
+                _cancellationTokenSource.Token);
         }
 
         public async Task DisposeAsync()
@@ -189,8 +190,6 @@ public async Task DisposeAsync()
         private Task OnCredentialsRefreshedAsync(Credentials? credentials, Exception? exception,
             CancellationToken cancellationToken = default)
         {
-            _testOutputHelper.WriteLine("[INFO] OnCredentialsRefreshedAsync called");
-
             if (_connection is null)
             {
                 Assert.Fail("_connection is unexpectedly null!");
@@ -223,10 +222,11 @@ public async void IntegrationTest()
                     {
                         for (int i = 0; i < 4; i++)
                         {
-                            _testOutputHelper.WriteLine("Wait until Token expires. Attempt #" + (i + 1));
-
-                            await Task.Delay(TimeSpan.FromSeconds(_tokenExpiresInSeconds + 10));
-                            _testOutputHelper.WriteLine("Resuming ..");
+                            var delaySpan = TimeSpan.FromSeconds(_tokenExpiresInSeconds + 10);
+                            _testOutputHelper.WriteLine("{0} [INFO] wait '{1}' until Token expires. Attempt #{1}",
+                                DateTime.Now, delaySpan, (i + 1));
+                            await Task.Delay(delaySpan);
+                            _testOutputHelper.WriteLine("{0} [INFO] Resuming ...", DateTime.Now);
 
                             await PublishAsync(publishChannel);
                             await ConsumeAsync(consumeChannel);