feat(AuthClient): implementiert IHostedService.
- Aktualisiert um AuthClient zu den Diensten als Hosted Service hinzuzufügen. - Der zugehörige Unit-Test wurde aktualisiert, um IHost anstelle von IServiceProvider zu verwenden, um gehostete Dienste testen zu können.
This commit is contained in:
parent
4ccf7a20b3
commit
3b0428130a
@ -1,11 +1,12 @@
|
|||||||
using DigitalData.Auth.Abstractions;
|
using DigitalData.Auth.Abstractions;
|
||||||
using Microsoft.AspNetCore.SignalR.Client;
|
using Microsoft.AspNetCore.SignalR.Client;
|
||||||
|
using Microsoft.Extensions.Hosting;
|
||||||
using Microsoft.Extensions.Logging;
|
using Microsoft.Extensions.Logging;
|
||||||
using Microsoft.Extensions.Options;
|
using Microsoft.Extensions.Options;
|
||||||
|
|
||||||
namespace DigitalData.Auth.Client;
|
namespace DigitalData.Auth.Client;
|
||||||
|
|
||||||
public class AuthClient : IAuthClient, IAsyncDisposable
|
public class AuthClient : IAuthClient, IHostedService
|
||||||
{
|
{
|
||||||
private readonly HubConnection _connection;
|
private readonly HubConnection _connection;
|
||||||
|
|
||||||
@ -60,11 +61,4 @@ public class AuthClient : IAuthClient, IAsyncDisposable
|
|||||||
foreach (var publicKey in PublicKeys)
|
foreach (var publicKey in PublicKeys)
|
||||||
await GetPublicKeyAsync(publicKey.Issuer, publicKey.Audience);
|
await GetPublicKeyAsync(publicKey.Issuer, publicKey.Audience);
|
||||||
}
|
}
|
||||||
|
|
||||||
public virtual async ValueTask DisposeAsync()
|
|
||||||
{
|
|
||||||
await _connection.StopAsync();
|
|
||||||
await _connection.DisposeAsync();
|
|
||||||
GC.SuppressFinalize(this);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -18,6 +18,14 @@ public static class DIExtensions
|
|||||||
.AddSingleton<IAuthClient, AuthClient>()
|
.AddSingleton<IAuthClient, AuthClient>()
|
||||||
.TryAddSingleton<HubConnectionBuilder>();
|
.TryAddSingleton<HubConnectionBuilder>();
|
||||||
|
|
||||||
|
services.AddHostedService(sp =>
|
||||||
|
{
|
||||||
|
var client = sp.GetRequiredService<IAuthClient>() as AuthClient;
|
||||||
|
if (client is not null)
|
||||||
|
return client;
|
||||||
|
else throw new Exception();
|
||||||
|
});
|
||||||
|
|
||||||
return services;
|
return services;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@ -29,6 +29,7 @@
|
|||||||
<PackageReference Include="DigitalData.Core.Abstractions" Version="3.3.0" />
|
<PackageReference Include="DigitalData.Core.Abstractions" Version="3.3.0" />
|
||||||
<PackageReference Include="DigitalData.Core.Security" Version="1.0.0" />
|
<PackageReference Include="DigitalData.Core.Security" Version="1.0.0" />
|
||||||
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.1" />
|
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="9.0.1" />
|
||||||
|
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="8.0.1" />
|
||||||
</ItemGroup>
|
</ItemGroup>
|
||||||
|
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
|
|||||||
@ -18,7 +18,7 @@ public class AuthClientTests
|
|||||||
{
|
{
|
||||||
private string _hubUrl;
|
private string _hubUrl;
|
||||||
|
|
||||||
private Func<Action<ClientParams>, ServiceProvider> Build;
|
private Func<Action<ClientParams>, IHost> Build;
|
||||||
|
|
||||||
private WebApplication? _app;
|
private WebApplication? _app;
|
||||||
|
|
||||||
@ -84,13 +84,18 @@ public class AuthClientTests
|
|||||||
{
|
{
|
||||||
Build = options =>
|
Build = options =>
|
||||||
{
|
{
|
||||||
var provider = new ServiceCollection()
|
var host = Host.CreateDefaultBuilder()
|
||||||
.AddAuthHubClient(options: options)
|
.ConfigureServices(services =>
|
||||||
.BuildServiceProvider();
|
{
|
||||||
|
services.AddAuthHubClient(options: options)
|
||||||
|
.BuildServiceProvider();
|
||||||
|
})
|
||||||
|
.Build();
|
||||||
|
|
||||||
_disposableAsync.Enqueue(provider);
|
if(host is IAsyncDisposable disposable)
|
||||||
|
_disposableAsync.Enqueue(disposable);
|
||||||
|
|
||||||
return provider;
|
return host;
|
||||||
};
|
};
|
||||||
|
|
||||||
// Create and run test server
|
// Create and run test server
|
||||||
@ -104,26 +109,38 @@ public class AuthClientTests
|
|||||||
// Stop test server
|
// Stop test server
|
||||||
if (_app is not null)
|
if (_app is not null)
|
||||||
{
|
{
|
||||||
|
await _app.StopAsync();
|
||||||
await _app.DisposeAsync();
|
await _app.DisposeAsync();
|
||||||
Console.WriteLine("Test server stopped.");
|
Console.WriteLine("Test server stopped.");
|
||||||
}
|
}
|
||||||
|
|
||||||
while (_disposableAsync.Count > 0)
|
while (_disposableAsync.Count > 0)
|
||||||
await _disposableAsync.Dequeue().DisposeAsync();
|
{
|
||||||
|
var disposable = _disposableAsync.Dequeue();
|
||||||
|
if (disposable is IHost host)
|
||||||
|
await host.StopAsync();
|
||||||
|
await disposable.DisposeAsync();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
public async Task StartAsync_ShouldConnectSuccessfully()
|
[TestCase(true, false, true, TestName = "ShouldStart_WhenHostStartsEvenIfClientDoesNot")]
|
||||||
|
[TestCase(false, true, true, TestName = "ShouldStart_WhenClientStartsEvenIfHostDoesNot")]
|
||||||
|
public async Task StartAsync_ShouldConnectSuccessfully(bool startHost, bool startClient, bool expectedIsConnected)
|
||||||
{
|
{
|
||||||
// Arrange
|
// Arrange
|
||||||
var provider = Build(opt => opt.Url = _hubUrl);
|
var host = Build(opt => opt.Url = _hubUrl);
|
||||||
var client = provider.GetRequiredService<IAuthClient>();
|
var client = host.Services.GetRequiredService<IAuthClient>();
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
await client.StartAsync();
|
if (startHost)
|
||||||
|
await host.StartAsync();
|
||||||
|
|
||||||
|
if (startClient)
|
||||||
|
await client.StartAsync();
|
||||||
|
|
||||||
// Assert
|
// Assert
|
||||||
Assert.That(client.IsConnected);
|
Assert.That(client.IsConnected, Is.EqualTo(expectedIsConnected));
|
||||||
}
|
}
|
||||||
|
|
||||||
[Test]
|
[Test]
|
||||||
@ -135,12 +152,12 @@ public class AuthClientTests
|
|||||||
string rcv_key = string.Empty;
|
string rcv_key = string.Empty;
|
||||||
|
|
||||||
// Sender client
|
// Sender client
|
||||||
var provider_sender = Build(opt => opt.Url = _hubUrl);
|
var sender_host = Build(opt => opt.Url = _hubUrl);
|
||||||
var sender_client = provider_sender.GetRequiredService<IAuthClient>();
|
var sender_client = sender_host.Services.GetRequiredService<IAuthClient>();
|
||||||
await sender_client.StartAsync();
|
await sender_client.StartAsync();
|
||||||
|
|
||||||
// Receiver client
|
// Receiver client
|
||||||
var provider_receiver = Build(opt =>
|
var receiver_host = Build(opt =>
|
||||||
{
|
{
|
||||||
opt.Url = _hubUrl;
|
opt.Url = _hubUrl;
|
||||||
opt.OnPublicKeyReceived += (client, issuer, audience, key, logger) =>
|
opt.OnPublicKeyReceived += (client, issuer, audience, key, logger) =>
|
||||||
@ -150,7 +167,7 @@ public class AuthClientTests
|
|||||||
rcv_key = key;
|
rcv_key = key;
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
var client_receiver = provider_receiver.GetRequiredService<IAuthClient>();
|
var client_receiver = receiver_host.Services.GetRequiredService<IAuthClient>();
|
||||||
await client_receiver.StartAsync();
|
await client_receiver.StartAsync();
|
||||||
|
|
||||||
string issuer = "issuer";
|
string issuer = "issuer";
|
||||||
@ -177,12 +194,12 @@ public class AuthClientTests
|
|||||||
{
|
{
|
||||||
// Arrange
|
// Arrange
|
||||||
string? publicKey = null;
|
string? publicKey = null;
|
||||||
var provider = Build(opt =>
|
var host = Build(opt =>
|
||||||
{
|
{
|
||||||
opt.Url = _hubUrl;
|
opt.Url = _hubUrl;
|
||||||
opt.OnPublicKeyReceived += (client, issuer, audience, key, logger) => publicKey = key;
|
opt.OnPublicKeyReceived += (client, issuer, audience, key, logger) => publicKey = key;
|
||||||
});
|
});
|
||||||
var client = provider.GetRequiredService<IAuthClient>();
|
var client = host.Services.GetRequiredService<IAuthClient>();
|
||||||
await client.StartAsync();
|
await client.StartAsync();
|
||||||
|
|
||||||
|
|
||||||
@ -207,12 +224,12 @@ public class AuthClientTests
|
|||||||
{
|
{
|
||||||
// Arrange
|
// Arrange
|
||||||
var publicKey = new ClientPublicKey() { Issuer = "Foo", Audience = "Bar" };
|
var publicKey = new ClientPublicKey() { Issuer = "Foo", Audience = "Bar" };
|
||||||
var provider = Build(opt =>
|
var host = Build(opt =>
|
||||||
{
|
{
|
||||||
opt.Url = _hubUrl;
|
opt.Url = _hubUrl;
|
||||||
opt.PublicKeys.Add(publicKey);
|
opt.PublicKeys.Add(publicKey);
|
||||||
});
|
});
|
||||||
var client = provider.GetRequiredService<IAuthClient>();
|
var client = host.Services.GetRequiredService<IAuthClient>();
|
||||||
await client.StartAsync();
|
await client.StartAsync();
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
@ -230,18 +247,18 @@ public class AuthClientTests
|
|||||||
{
|
{
|
||||||
// Arrange
|
// Arrange
|
||||||
var publicKey = new ClientPublicKey() { Issuer = "Foo", Audience = "Bar" };
|
var publicKey = new ClientPublicKey() { Issuer = "Foo", Audience = "Bar" };
|
||||||
var provider = Build(opt =>
|
var host = Build(opt =>
|
||||||
{
|
{
|
||||||
opt.Url = _hubUrl;
|
opt.Url = _hubUrl;
|
||||||
opt.PublicKeys.Add(publicKey);
|
opt.PublicKeys.Add(publicKey);
|
||||||
opt.RetryDelay = new TimeSpan(0, 0, 1);
|
opt.RetryDelay = new TimeSpan(0, 0, 1);
|
||||||
});
|
});
|
||||||
var client = provider.GetRequiredService<IAuthClient>();
|
var client = host.Services.GetRequiredService<IAuthClient>();
|
||||||
await client.StartAsync();
|
await client.StartAsync();
|
||||||
|
|
||||||
// Act
|
// Act
|
||||||
CancellationToken cancellationToken = default;
|
CancellationToken cancellationToken = default;
|
||||||
await _app.StopAsync(cancellationToken);
|
await _app!.StopAsync(cancellationToken);
|
||||||
_app = null;
|
_app = null;
|
||||||
|
|
||||||
var newApp = CreateWebApplication(_port);
|
var newApp = CreateWebApplication(_port);
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user