From 7785fe1766fc61be66dfeea1fb13718016858163 Mon Sep 17 00:00:00 2001 From: Basique Evangelist Date: Thu, 22 Apr 2021 22:55:25 +0300 Subject: [PATCH] Fix GET with heartbeats --- JetHerald/Controllers/HeartbeatController.cs | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/JetHerald/Controllers/HeartbeatController.cs b/JetHerald/Controllers/HeartbeatController.cs index 8b43cc2..b187899 100644 --- a/JetHerald/Controllers/HeartbeatController.cs +++ b/JetHerald/Controllers/HeartbeatController.cs @@ -35,10 +35,11 @@ namespace JetHerald.Controllers HeartbeatArgs args = new(); args.Topic = q["Topic"]; args.WriteToken = q["WriteToken"]; - if (!int.TryParse(q["ExpiryTimeout"], out args.ExpiryTimeout)) + if (!int.TryParse(q["ExpiryTimeout"], out var expTimeout)) { return BadRequest(); } + args.ExpiryTimeout = expTimeout; return await DoHeartbeat(args); } @@ -58,7 +59,7 @@ namespace JetHerald.Controllers [Route("api/heartbeat")] [HttpGet] - public Task HeartbeatGet(HeartbeatArgs args) => DoHeartbeat(args); + public Task HeartbeatGet([FromQuery] HeartbeatArgs args) => DoHeartbeat(args); private async Task DoHeartbeat(HeartbeatArgs args) { @@ -81,10 +82,10 @@ namespace JetHerald.Controllers public class HeartbeatArgs { - [JsonPropertyName("Topic")] public string Topic; - [JsonPropertyName("Heart")] public string Heart; - [JsonPropertyName("ExpiryTimeout")] public int ExpiryTimeout; - [JsonPropertyName("WriteToken")] public string WriteToken; + [JsonPropertyName("Topic")] public string Topic { get; set; } + [JsonPropertyName("Heart")] public string Heart { get; set; } + [JsonPropertyName("ExpiryTimeout")] public int ExpiryTimeout { get; set; } + [JsonPropertyName("WriteToken")] public string WriteToken { get; set; } } } } \ No newline at end of file