Add vhost creation

Add example

Signed-off-by: Gabriele Santomaggio <[email protected]>

Author: Gsantomaggio

RabbitMQ.AMQP.Client/IManagement.cs

@@ -63,7 +63,6 @@ Task<IQueueInfo> GetQueueInfoAsync(string queueName,
         /// <returns>A builder for <see cref="IBindingSpecification"/></returns>
         IBindingSpecification Binding();
 
-        public Task RefreshTokenAsync(string token);
     }
 
     internal interface IManagementTopology

RabbitMQ.AMQP.Client/Impl/AmqpConnection.cs

@@ -6,6 +6,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Linq;
+using System.Text;
 using System.Threading;
 using System.Threading.Tasks;
 using Amqp;
@@ -164,9 +165,18 @@ public IEnumerable<IConsumer> Consumers
         /// </summary>
         public long Id { get; set; }
 
+        /// <summary>
+        /// Refresh the OAuth token and update the connection settings.
+        /// </summary>
+        /// <param name="token">OAuth token</param>
         public async Task RefreshTokenAsync(string token)
         {
-            await _management.RefreshTokenAsync(token)
+            // here we use the primitive RequestAsync method because we don't want to
+            // expose this method in the IManagement interface
+            // we need to update the connection settings with the new token
+            int[] expectedResponseCodes = { AmqpManagement.Code204 };
+            _ = await _management.RequestAsync(Encoding.ASCII.GetBytes(token),
+                    AmqpManagement.AuthTokens, AmqpManagement.Put, expectedResponseCodes)
                 .ConfigureAwait(false);
             _connectionSettings.UpdateOAuthPassword(token);
         }

RabbitMQ.AMQP.Client/Impl/AmqpManagement.cs

@@ -47,7 +47,7 @@ public class AmqpManagement : AbstractLifeCycle, IManagement, IManagementTopolog
         internal const string Post = "POST";
         internal const string Delete = "DELETE";
         private const string ReplyTo = "$me";
-        private const string AuthTokens = "/auth/tokens";
+        internal const string AuthTokens = "/auth/tokens";
 
         protected readonly TaskCompletionSource<bool> _managementSessionClosedTcs =
             Utils.CreateTaskCompletionSource<bool>();
@@ -136,14 +136,6 @@ public IBindingSpecification Binding()
             return new AmqpBindingSpecification(this);
         }
 
-        public async Task RefreshTokenAsync(string token)
-        {
-            int[] expectedResponseCodes = { Code204 };
-            _ = await RequestAsync(Encoding.ASCII.GetBytes(token),
-            AuthTokens, Put, expectedResponseCodes)
-                .ConfigureAwait(false);
-        }
-
         /// <summary>
         /// Open the management session.
         /// </summary>

RabbitMQ.AMQP.Client/PublicAPI.Unshipped.txt

@@ -241,7 +241,6 @@ RabbitMQ.AMQP.Client.IManagement.GetQueueInfoAsync(RabbitMQ.AMQP.Client.IQueueSp
 RabbitMQ.AMQP.Client.IManagement.GetQueueInfoAsync(string! queueName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.AMQP.Client.IQueueInfo!>!
 RabbitMQ.AMQP.Client.IManagement.Queue() -> RabbitMQ.AMQP.Client.IQueueSpecification!
 RabbitMQ.AMQP.Client.IManagement.Queue(string! name) -> RabbitMQ.AMQP.Client.IQueueSpecification!
-RabbitMQ.AMQP.Client.IManagement.RefreshTokenAsync(string! token) -> System.Threading.Tasks.Task!
 RabbitMQ.AMQP.Client.IMessage
 RabbitMQ.AMQP.Client.IMessage.AbsoluteExpiryTime() -> System.DateTime
 RabbitMQ.AMQP.Client.IMessage.AbsoluteExpiryTime(System.DateTime absoluteExpiryTime) -> RabbitMQ.AMQP.Client.IMessage!
@@ -389,7 +388,6 @@ RabbitMQ.AMQP.Client.Impl.AmqpManagement.GetQueueInfoAsync(RabbitMQ.AMQP.Client.
 RabbitMQ.AMQP.Client.Impl.AmqpManagement.GetQueueInfoAsync(string! queueName, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken)) -> System.Threading.Tasks.Task<RabbitMQ.AMQP.Client.IQueueInfo!>!
 RabbitMQ.AMQP.Client.Impl.AmqpManagement.Queue() -> RabbitMQ.AMQP.Client.IQueueSpecification!
 RabbitMQ.AMQP.Client.Impl.AmqpManagement.Queue(string! name) -> RabbitMQ.AMQP.Client.IQueueSpecification!
-RabbitMQ.AMQP.Client.Impl.AmqpManagement.RefreshTokenAsync(string! token) -> System.Threading.Tasks.Task!
 RabbitMQ.AMQP.Client.Impl.AmqpMessage
 RabbitMQ.AMQP.Client.Impl.AmqpMessage.AbsoluteExpiryTime() -> System.DateTime
 RabbitMQ.AMQP.Client.Impl.AmqpMessage.AbsoluteExpiryTime(System.DateTime absoluteExpiryTime) -> RabbitMQ.AMQP.Client.IMessage!

docs/Examples/OAuth2/Program.cs

@@ -17,12 +17,30 @@
     ConnectionSettingsBuilder.Create()
         .Host("localhost")
         .Port(5672)
-        .OAuth2Options(new OAuth2Options(Token.GenerateToken(DateTime.UtcNow.AddMilliseconds(1500))))
+        .OAuth2Options(new OAuth2Options(Token.GenerateToken(DateTime.UtcNow.AddSeconds(5))))
         .Build()).ConfigureAwait(false);
 
 Trace.WriteLine(TraceLevel.Information, $"Connected to the broker {connection} successfully");
 Trace.WriteLine(TraceLevel.Information, $"Connection status {connection.State}");
 
-Thread.Sleep(TimeSpan.FromSeconds(15));
+CancellationTokenSource cts = new();
+
+_ = Task.Run(() =>
+{
+    while (!cts.IsCancellationRequested)
+    {
+        string token = Token.GenerateToken(DateTime.UtcNow.AddSeconds(5));
+        Trace.WriteLine(TraceLevel.Information, $"Token Refresh..{token}");
+        connection.RefreshTokenAsync(token).Wait();
+        Task.Delay(TimeSpan.FromSeconds(4), cts.Token).Wait();
+    }
+});
+
 
 Console.WriteLine("Connection state: " + connection.State);
+
+// press any key to exit
+Console.ReadKey();
+cts.Cancel();
+
+await connection.CloseAsync().ConfigureAwait(false);

docs/Examples/OAuth2/README.md

@@ -0,0 +1,13 @@
+### OAuth2 Example
+
+This example demonstrates how to use the OAuth2 authentication mechanism.
+
+It is meant to be used with the RabbitMQ server configured for the CI.
+
+To run the example:
+ - make rabbitmq-server-start
+ - dotnet run
+
+
+The example will create a connection given the token and refresh the token every 4 seconds.
+