From 4ccf7a20b331cd4d875baa5e99e3358aebb5d665 Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Tue, 11 Mar 2025 14:50:10 +0100 Subject: [PATCH] =?UTF-8?q?feat(AuthClient):=20try-start=20entfernen=20und?= =?UTF-8?q?=20Abbruch-Token=20hinzuf=C3=BCgen,=20um=20asynchron=20zu=20sta?= =?UTF-8?q?rten?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DigitalData.Auth.Abstractions/IAuthClient.cs | 4 +--- DigitalData.Auth.Client/AuthClient.cs | 18 +++++------------- .../Client/AuthClientTests.cs | 2 +- .../Properties/launchSettings.json | 6 +++--- 4 files changed, 10 insertions(+), 20 deletions(-) diff --git a/DigitalData.Auth.Abstractions/IAuthClient.cs b/DigitalData.Auth.Abstractions/IAuthClient.cs index 56cbe40..d2b8bae 100644 --- a/DigitalData.Auth.Abstractions/IAuthClient.cs +++ b/DigitalData.Auth.Abstractions/IAuthClient.cs @@ -4,7 +4,5 @@ public interface IAuthClient : IAuthListenHandler, IAuthSenderHandler { bool IsConnected { get; } - Task StartAsync(); - - Task TryStartAsync(); + Task StartAsync(CancellationToken cancellationToken = default); } diff --git a/DigitalData.Auth.Client/AuthClient.cs b/DigitalData.Auth.Client/AuthClient.cs index 49e4501..3ce284b 100644 --- a/DigitalData.Auth.Client/AuthClient.cs +++ b/DigitalData.Auth.Client/AuthClient.cs @@ -36,25 +36,17 @@ public class AuthClient : IAuthClient, IAsyncDisposable public IEnumerable PublicKeys => _params.PublicKeys; - public async Task StartAsync() + public async Task StartAsync(CancellationToken cancellationToken = default) { - await _connection.StartAsync(); + await _connection.StartAsync(cancellationToken); IsConnected = true; await GetAllPublicKeysAsync(); } - public async Task TryStartAsync() + public async Task StopAsync(CancellationToken cancellationToken) { - try - { - await StartAsync(); - return true; - } - catch(Exception ex) - { - _logger?.LogError(ex, "{message}", ex.Message); - return false; - } + await _connection.StopAsync(cancellationToken); + IsConnected = false; } public Task ReceivePublicKeyAsync(string issuer, string audience, string message) => Task.Run(() => _params.TriggerOnPublicReceivedEvent(this, issuer, audience, message, _logger)); diff --git a/DigitalData.Auth.Tests/Client/AuthClientTests.cs b/DigitalData.Auth.Tests/Client/AuthClientTests.cs index c2b784d..bbd2c1d 100644 --- a/DigitalData.Auth.Tests/Client/AuthClientTests.cs +++ b/DigitalData.Auth.Tests/Client/AuthClientTests.cs @@ -104,7 +104,7 @@ public class AuthClientTests // Stop test server if (_app is not null) { - await _app.StopAsync(); + await _app.DisposeAsync(); Console.WriteLine("Test server stopped."); } diff --git a/src/DigitalData.Auth.API/Properties/launchSettings.json b/src/DigitalData.Auth.API/Properties/launchSettings.json index 43a4e18..966400a 100644 --- a/src/DigitalData.Auth.API/Properties/launchSettings.json +++ b/src/DigitalData.Auth.API/Properties/launchSettings.json @@ -12,7 +12,7 @@ "http": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": true, + "launchBrowser": false, "launchUrl": "swagger", "applicationUrl": "http://localhost:5075", "environmentVariables": { @@ -22,7 +22,7 @@ "https": { "commandName": "Project", "dotnetRunMessages": true, - "launchBrowser": true, + "launchBrowser": false, "launchUrl": "swagger", "applicationUrl": "https://localhost:7192;http://localhost:5075", "environmentVariables": { @@ -31,7 +31,7 @@ }, "IIS Express": { "commandName": "IISExpress", - "launchBrowser": true, + "launchBrowser": false, "launchUrl": "swagger", "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Development"