From 07cb396dd73da8133fe726c25e5fe86f24411457 Mon Sep 17 00:00:00 2001 From: Tom Date: Sat, 29 Mar 2025 20:09:22 +0000 Subject: [PATCH] Fixed issues with creating/deleting connection messages. --- Requests/CreateConnection.cs | 8 ++++---- Requests/DeleteConnection.cs | 10 +++++----- Store/ConnectionStore.cs | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/Requests/CreateConnection.cs b/Requests/CreateConnection.cs index c390621..82cddec 100644 --- a/Requests/CreateConnection.cs +++ b/Requests/CreateConnection.cs @@ -7,7 +7,7 @@ namespace HermesSocketServer.Requests public class CreateConnection : IRequest { public string Name => "create_connection"; - public string[] RequiredKeys => ["name", "type", "clientId", "accessToken", "grantType", "scope", "expiration"]; + public string[] RequiredKeys => ["name", "type", "client_id", "access_token", "grant_type", "scope", "expiration"]; private ILogger _logger; public CreateConnection(ILogger logger) @@ -19,9 +19,9 @@ namespace HermesSocketServer.Requests { string name = data["name"].ToString()!; string type = data["type"].ToString()!; - string clientId = data["clientId"].ToString()!; - string accessToken = data["accessToken"].ToString()!; - string grantType = data["grantType"].ToString()!; + string clientId = data["client_id"].ToString()!; + string accessToken = data["access_token"].ToString()!; + string grantType = data["grant_type"].ToString()!; string scope = data["scope"].ToString()!; if (!DateTime.TryParse(data["expiration"].ToString()!, out var expiresAt)) return Task.FromResult(RequestResult.Failed("Expiration needs to be a date time string.")); diff --git a/Requests/DeleteConnection.cs b/Requests/DeleteConnection.cs index 3706106..b953901 100644 --- a/Requests/DeleteConnection.cs +++ b/Requests/DeleteConnection.cs @@ -6,7 +6,7 @@ namespace HermesSocketServer.Requests public class DeleteConnection : IRequest { public string Name => "delete_connection"; - public string[] RequiredKeys => ["id"]; + public string[] RequiredKeys => ["name"]; private ILogger _logger; public DeleteConnection(ILogger logger) @@ -16,16 +16,16 @@ namespace HermesSocketServer.Requests public Task Grant(Channel channel, IDictionary data) { - var connectionId = data["id"].ToString()!; + var connectionName = data["name"].ToString()!; - var result = channel.Connections.Remove(connectionId); + var result = channel.Connections.Remove(connectionName); if (result) { - _logger.Information($"Deleted a connection by id [connection id: {connectionId}]"); + _logger.Information($"Deleted a connection by name [connection name: {connectionName}]"); return Task.FromResult(RequestResult.Successful(null)); } - _logger.Warning($"Connection Id does not exist [connection id: {connectionId}]"); + _logger.Warning($"Connection Name does not exist [connection name: {connectionName}]"); return Task.FromResult(RequestResult.Failed("Something went wrong when updating the cache.")); } } diff --git a/Store/ConnectionStore.cs b/Store/ConnectionStore.cs index 7de27d7..303f4fa 100644 --- a/Store/ConnectionStore.cs +++ b/Store/ConnectionStore.cs @@ -38,7 +38,7 @@ namespace HermesSocketServer.Store Default = reader.GetBoolean(7), }); }); - _logger.Information($"Loaded {_store.Count} groups from database."); + _logger.Information($"Loaded {_store.Count} connections from database."); } protected override void OnInitialAdd(string key, Connection value)