Remove synchronous Build method.

Author: lukebakken

projects/RabbitMQ.Client.OAuth2/OAuth2Client.cs

@@ -74,7 +74,9 @@ public OAuth2ClientBuilder(string clientId, string clientSecret, Uri? tokenEndpo
             _clientSecret = clientSecret ?? throw new ArgumentNullException(nameof(clientSecret));
 
             if (tokenEndpoint is null && issuer is null)
+            {
                 throw new ArgumentException("Either tokenEndpoint or issuer is required");
+            }
 
             _tokenEndpoint = tokenEndpoint;
             _issuer = issuer;
@@ -123,24 +125,6 @@ public OAuth2ClientBuilder AddRequestParameter(string param, string paramValue)
             return this;
         }
 
-        /// <summary>
-        /// Build the <see cref="OAuth2Client"/> with the provided properties of the builder.
-        /// </summary>
-        /// <returns>Configured OAuth2Client</returns>
-        public IOAuth2Client Build()
-        {
-            // Check if Token Endpoint is missing -> Use Issuer to receive Token Endpoint
-            if (_tokenEndpoint is null)
-            {
-                // Don't know how to better handle backwards compatibily
-                Uri tokenEndpoint = GetTokenEndpointFromIssuerAsync().GetAwaiter().GetResult();
-                return new OAuth2Client(_clientId, _clientSecret, tokenEndpoint, _scope, _additionalRequestParameters, _httpClientHandler);
-            }
-
-            return new OAuth2Client(_clientId, _clientSecret, _tokenEndpoint,
-                _scope, _additionalRequestParameters, _httpClientHandler);
-        }
-
         /// <summary>
         /// Build the <see cref="OAuth2Client"/> with the provided properties of the builder.
         /// </summary>

projects/RabbitMQ.Client.OAuth2/PublicAPI.Shipped.txt

@@ -7,7 +7,6 @@ RabbitMQ.Client.OAuth2.IToken.HasExpired.get -> bool
 RabbitMQ.Client.OAuth2.IToken.RefreshToken.get -> string
 RabbitMQ.Client.OAuth2.OAuth2ClientBuilder
 RabbitMQ.Client.OAuth2.OAuth2ClientBuilder.AddRequestParameter(string param, string paramValue) -> RabbitMQ.Client.OAuth2.OAuth2ClientBuilder
-RabbitMQ.Client.OAuth2.OAuth2ClientBuilder.Build() -> RabbitMQ.Client.OAuth2.IOAuth2Client
 RabbitMQ.Client.OAuth2.OAuth2ClientBuilder.OAuth2ClientBuilder(string! clientId, string! clientSecret, System.Uri? tokenEndpoint = null, System.Uri? issuer = null) -> void
 RabbitMQ.Client.OAuth2.OAuth2ClientBuilder.SetScope(string scope) -> RabbitMQ.Client.OAuth2.OAuth2ClientBuilder
 RabbitMQ.Client.OAuth2.OAuth2ClientCredentialsProvider

projects/Test/OAuth2/TestOAuth2.cs

@@ -46,29 +46,33 @@ public class TestOAuth2 : IAsyncLifetime
     {
         private const string Exchange = "test_direct";
 
+        private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
         private readonly SemaphoreSlim _doneEvent = new SemaphoreSlim(0, 1);
         private readonly ITestOutputHelper _testOutputHelper;
-        private readonly IConnectionFactory _connectionFactory;
         private readonly int _tokenExpiresInSeconds;
-        private readonly OAuth2ClientCredentialsProvider _producerCredentialsProvider;
-        private readonly OAuth2ClientCredentialsProvider _httpApiCredentialsProvider;
-        private readonly CancellationTokenSource _cancellationTokenSource = new CancellationTokenSource();
 
+        private OAuth2ClientCredentialsProvider? _producerCredentialsProvider;
+        private OAuth2ClientCredentialsProvider? _httpApiCredentialsProvider;
+        private IConnectionFactory? _connectionFactory;
         private IConnection? _connection;
         private CredentialsRefresher? _credentialsRefresher;
 
         public TestOAuth2(ITestOutputHelper testOutputHelper)
         {
             _testOutputHelper = testOutputHelper;
+            _tokenExpiresInSeconds = OAuth2OptionsBase.TokenExpiresInSeconds;
+        }
 
+        public async Task InitializeAsync()
+        {
             string modeStr = Environment.GetEnvironmentVariable("OAUTH2_MODE") ?? "uaa";
             Mode mode = (Mode)Enum.Parse(typeof(Mode), modeStr.ToLowerInvariant());
 
             var producerOptions = new OAuth2ProducerOptions(mode);
-            _producerCredentialsProvider = GetCredentialsProvider(producerOptions);
+            _producerCredentialsProvider = await GetCredentialsProviderAsync(producerOptions);
 
             var httpApiOptions = new OAuth2HttpApiOptions(mode);
-            _httpApiCredentialsProvider = GetCredentialsProvider(httpApiOptions);
+            _httpApiCredentialsProvider = await GetCredentialsProviderAsync(httpApiOptions);
 
             _connectionFactory = new ConnectionFactory
             {
@@ -77,11 +81,6 @@ public TestOAuth2(ITestOutputHelper testOutputHelper)
                 ClientProvidedName = nameof(TestOAuth2)
             };
 
-            _tokenExpiresInSeconds = OAuth2OptionsBase.TokenExpiresInSeconds;
-        }
-
-        public async Task InitializeAsync()
-        {
             _connection = await _connectionFactory.CreateConnectionAsync(_cancellationTokenSource.Token);
 
             _connection.ConnectionShutdown += (sender, ea) =>
@@ -119,7 +118,7 @@ public async Task DisposeAsync()
             finally
             {
                 _doneEvent.Dispose();
-                _producerCredentialsProvider.Dispose();
+                _producerCredentialsProvider?.Dispose();
                 _connection?.Dispose();
             }
         }
@@ -174,6 +173,7 @@ public async Task IntegrationTest()
                                 async Task CloseConnection()
                                 {
                                     Assert.NotNull(_connection);
+                                    Assert.NotNull(_httpApiCredentialsProvider);
                                     Credentials httpApiCredentials = await _httpApiCredentialsProvider.GetCredentialsAsync();
                                     closeConnectionUtil = new Util(_testOutputHelper, "mgt_api_client", httpApiCredentials.Password);
                                     await closeConnectionUtil.CloseConnectionAsync(_connection.ClientProvidedName);
@@ -217,6 +217,7 @@ async Task CloseConnection()
         [Fact]
         public async Task SecondConnectionCrashes_GH1429()
         {
+            Assert.NotNull(_connectionFactory);
             // https://github.com/rabbitmq/rabbitmq-dotnet-client/issues/1429
             IConnection secondConnection = await _connectionFactory.CreateConnectionAsync(CancellationToken.None);
             secondConnection.Dispose();
@@ -267,7 +268,7 @@ private async Task ConsumeAsync(IChannel consumeChannel)
             await consumeChannel.BasicCancelAsync(consumerTag);
         }
 
-        private OAuth2ClientCredentialsProvider GetCredentialsProvider(OAuth2OptionsBase opts)
+        private async Task<OAuth2ClientCredentialsProvider> GetCredentialsProviderAsync(OAuth2OptionsBase opts)
         {
             _testOutputHelper.WriteLine("OAuth2Client ");
             _testOutputHelper.WriteLine($"- ClientId: {opts.ClientId}");
@@ -276,7 +277,8 @@ private OAuth2ClientCredentialsProvider GetCredentialsProvider(OAuth2OptionsBase
             _testOutputHelper.WriteLine($"- Scope: {opts.Scope}");
 
             var tokenEndpointUri = new Uri(opts.TokenEndpoint);
-            IOAuth2Client oAuth2Client = new OAuth2ClientBuilder(opts.ClientId, opts.ClientSecret, tokenEndpointUri).Build();
+            var builder = new OAuth2ClientBuilder(opts.ClientId, opts.ClientSecret, tokenEndpointUri);
+            IOAuth2Client oAuth2Client = await builder.BuildAsync();
             return new OAuth2ClientCredentialsProvider(opts.Name, oAuth2Client);
         }
 

projects/Test/OAuth2/TestOAuth2Client.cs

@@ -41,24 +41,36 @@
 
 namespace OAuth2Test
 {
-    public class TestOAuth2Client
+    public class TestOAuth2Client : IAsyncLifetime
     {
         protected string _client_id = "producer";
         protected string _client_secret = "kbOFBXI9tANgKUq8vXHLhT6YhbivgXxn";
         protected WireMockServer _oauthServer;
 
-        protected IOAuth2Client _client;
+        protected IOAuth2Client? _client;
 
         public TestOAuth2Client()
         {
             _oauthServer = WireMockServer.Start();
+        }
+
+        public async Task InitializeAsync()
+        {
             var uri = new Uri(_oauthServer.Url + "/token");
-            _client = new OAuth2ClientBuilder(_client_id, _client_secret, uri).Build();
+            var builder = new OAuth2ClientBuilder(_client_id, _client_secret, uri);
+            _client = await builder.BuildAsync();
+        }
+
+        public Task DisposeAsync()
+        {
+            return Task.CompletedTask;
         }
 
         [Fact]
         public async Task TestRequestToken()
         {
+            Assert.NotNull(_client);
+
             JsonToken expectedJsonToken = new JsonToken("the_access_token", "the_refresh_token", TimeSpan.FromSeconds(10));
             ExpectTokenRequest(new RequestFormMatcher()
                             .WithParam("client_id", _client_id)
@@ -76,6 +88,8 @@ public async Task TestRequestToken()
         [Fact]
         public async Task TestRefreshToken()
         {
+            Assert.NotNull(_client);
+
             const string accessToken0 = "the_access_token";
             const string accessToken1 = "the_access_token_2";
             const string refreshToken = "the_refresh_token";
@@ -110,6 +124,8 @@ public async Task TestRefreshToken()
         [Fact]
         public async Task TestInvalidCredentials()
         {
+            Assert.NotNull(_client);
+
             _oauthServer
                 .Given(
                     Request.Create()