From 5f9926e911c2c69915b72857655eca5eef9fe36a Mon Sep 17 00:00:00 2001 From: Developer 02 Date: Tue, 4 Feb 2025 20:50:34 +0100 Subject: [PATCH] refactor(AuthClientTests): Umbenennung der Variablennamen --- DigitalData.Auth.Abstractions/IAuthClient.cs | 2 +- .../IAuthListenHandler.cs | 6 ++++++ .../IListenHandler.cs | 6 ------ DigitalData.Auth.Client/AuthClient.cs | 4 ++-- .../Client/AuthClientTests.cs | 20 +++++++++---------- src/DigitalData.Auth.API/Hubs/AuthHub.cs | 8 ++++---- 6 files changed, 23 insertions(+), 23 deletions(-) create mode 100644 DigitalData.Auth.Abstractions/IAuthListenHandler.cs delete mode 100644 DigitalData.Auth.Abstractions/IListenHandler.cs diff --git a/DigitalData.Auth.Abstractions/IAuthClient.cs b/DigitalData.Auth.Abstractions/IAuthClient.cs index c14b927..c082138 100644 --- a/DigitalData.Auth.Abstractions/IAuthClient.cs +++ b/DigitalData.Auth.Abstractions/IAuthClient.cs @@ -1,6 +1,6 @@ namespace DigitalData.Auth.Abstractions; -public interface IAuthClient : IListenHandler, IAuthSenderHandler +public interface IAuthClient : IAuthListenHandler, IAuthSenderHandler { bool IsConnected { get; } diff --git a/DigitalData.Auth.Abstractions/IAuthListenHandler.cs b/DigitalData.Auth.Abstractions/IAuthListenHandler.cs new file mode 100644 index 0000000..0aeb7b4 --- /dev/null +++ b/DigitalData.Auth.Abstractions/IAuthListenHandler.cs @@ -0,0 +1,6 @@ +namespace DigitalData.Auth.Abstractions; + +public interface IAuthListenHandler +{ + Task ReceiveKeyAsync(string topic, string key); +} \ No newline at end of file diff --git a/DigitalData.Auth.Abstractions/IListenHandler.cs b/DigitalData.Auth.Abstractions/IListenHandler.cs deleted file mode 100644 index 2e2568f..0000000 --- a/DigitalData.Auth.Abstractions/IListenHandler.cs +++ /dev/null @@ -1,6 +0,0 @@ -namespace DigitalData.Auth.Abstractions; - -public interface IListenHandler -{ - Task ReceiveMessageAsync(string user, string message); -} \ No newline at end of file diff --git a/DigitalData.Auth.Client/AuthClient.cs b/DigitalData.Auth.Client/AuthClient.cs index 6fdf400..ebb8ac9 100644 --- a/DigitalData.Auth.Client/AuthClient.cs +++ b/DigitalData.Auth.Client/AuthClient.cs @@ -21,7 +21,7 @@ public class AuthClient : IAuthClient, IAsyncDisposable .WithUrl(paramsOptions.Value.Url) .Build(); - _connection.On(nameof(ReceiveMessageAsync), ReceiveMessageAsync); + _connection.On(nameof(ReceiveKeyAsync), ReceiveKeyAsync); _logger = logger; @@ -61,7 +61,7 @@ public class AuthClient : IAuthClient, IAsyncDisposable } } - public Task ReceiveMessageAsync(string user, string message) => Task.Run(() => _params.Events.OnMessageReceived(user, message, _logger)); + public Task ReceiveKeyAsync(string user, string message) => Task.Run(() => _params.Events.OnMessageReceived(user, message, _logger)); public Task SendKeyAsync(string user, string message) => _connection.InvokeAsync(nameof(SendKeyAsync), user, message); diff --git a/DigitalData.Auth.Tests/Client/AuthClientTests.cs b/DigitalData.Auth.Tests/Client/AuthClientTests.cs index 905a99f..426c56a 100644 --- a/DigitalData.Auth.Tests/Client/AuthClientTests.cs +++ b/DigitalData.Auth.Tests/Client/AuthClientTests.cs @@ -86,8 +86,8 @@ public class AuthClientTests public async Task ReceiveMessage_ShouldCallOnMessageReceived() { // Arrange - string rcv_user = string.Empty; - string rcv_msg = string.Empty; + string rcv_topic = string.Empty; + string rcv_key = string.Empty; // Sender client using var provider_sender = Build(opt => opt.Url = _hubUrl); @@ -98,20 +98,20 @@ public class AuthClientTests using var provider_receiver = Build(opt => { opt.Url = _hubUrl; - opt.Events.OnMessageReceived = (user, message, logger) => + opt.Events.OnMessageReceived = (topic, key, logger) => { - rcv_user = user; - rcv_msg = message; + rcv_topic = topic; + rcv_key = key; }; }); var client_receiver = provider_receiver.GetRequiredService(); await client_receiver.StartAsync(); - string user = "user"; - string message = "message"; + string topic = "topic"; + string key = "key"; // Act - await sender_client.SendKeyAsync(user, message); + await sender_client.SendKeyAsync(topic, key); // delay fort getting answer await Task.Delay(2000); @@ -119,8 +119,8 @@ public class AuthClientTests // Assert Assert.Multiple(() => { - Assert.That(rcv_user, Is.EqualTo(user)); - Assert.That(rcv_msg, Is.EqualTo(message)); + Assert.That(rcv_topic, Is.EqualTo(topic)); + Assert.That(rcv_key, Is.EqualTo(key)); }); } } \ No newline at end of file diff --git a/src/DigitalData.Auth.API/Hubs/AuthHub.cs b/src/DigitalData.Auth.API/Hubs/AuthHub.cs index d2579ef..8ab3c6f 100644 --- a/src/DigitalData.Auth.API/Hubs/AuthHub.cs +++ b/src/DigitalData.Auth.API/Hubs/AuthHub.cs @@ -3,14 +3,14 @@ using Microsoft.AspNetCore.SignalR; namespace DigitalData.Auth.API.Hubs; -public class AuthHub : Hub, IAuthSenderHandler +public class AuthHub : Hub, IAuthSenderHandler { public async Task SendKeyAsync(string user, string message) - => await Clients.All.ReceiveMessageAsync(user, message); + => await Clients.All.ReceiveKeyAsync(user, message); public async Task SendMessageToCaller(string user, string message) - => await Clients.Caller.ReceiveMessageAsync(user, message); + => await Clients.Caller.ReceiveKeyAsync(user, message); public async Task SendMessageToGroup(string user, string message) - => await Clients.Group("Auth.API Consumers").ReceiveMessageAsync(user, message); + => await Clients.Group("Auth.API Consumers").ReceiveKeyAsync(user, message); } \ No newline at end of file