From 8e7fe89e428d29c2c43148d0acabe0522baae6b2 Mon Sep 17 00:00:00 2001
From: Dominion <Cyberboss@users.noreply.github.com>
Date: Fri, 3 Feb 2023 18:59:22 -0500
Subject: [PATCH 1/2] Fix controller not accepting DreamDaemonRequests

---
 build/Version.props                                          | 4 ++--
 .../Controllers/DreamDaemonController.cs                     | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/build/Version.props b/build/Version.props
index a5f8a360ad..8f5af98351 100644
--- a/build/Version.props
+++ b/build/Version.props
@@ -3,9 +3,9 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="ControlPanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>5.3.0</TgsCoreVersion>
+    <TgsCoreVersion>5.3.1</TgsCoreVersion>
     <TgsConfigVersion>4.4.0</TgsConfigVersion>
-    <TgsApiVersion>9.8.0</TgsApiVersion>
+    <TgsApiVersion>9.8.1</TgsApiVersion>
     <TgsApiLibraryVersion>10.2.0</TgsApiLibraryVersion>
     <TgsClientVersion>11.2.0</TgsClientVersion>
     <TgsDmapiVersion>6.0.6</TgsDmapiVersion>
diff --git a/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs b/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs
index e12bd56859..60abece7b8 100644
--- a/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs
+++ b/src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs
@@ -11,6 +11,7 @@ using Microsoft.Extensions.Logging;
 
 using Tgstation.Server.Api;
 using Tgstation.Server.Api.Models;
+using Tgstation.Server.Api.Models.Request;
 using Tgstation.Server.Api.Models.Response;
 using Tgstation.Server.Api.Rights;
 using Tgstation.Server.Host.Components;
@@ -130,7 +131,7 @@ namespace Tgstation.Server.Host.Controllers
 		/// <summary>
 		/// Update watchdog settings to be applied at next server reboot.
 		/// </summary>
-		/// <param name="model">The updated <see cref="DreamDaemonResponse"/> settings.</param>
+		/// <param name="model">The <see cref="DreamDaemonRequest"/> with updated settings.</param>
 		/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
 		/// <returns>A <see cref="Task{TResult}"/> resulting in the <see cref="IActionResult"/> of the operation.</returns>
 		/// <response code="200">Settings applied successfully.</response>
@@ -154,7 +155,7 @@ namespace Tgstation.Server.Host.Controllers
 		[ProducesResponseType(typeof(ErrorMessageResponse), 410)]
 #pragma warning disable CA1502 // TODO: Decomplexify
 #pragma warning disable CA1506
-		public async Task<IActionResult> Update([FromBody] DreamDaemonResponse model, CancellationToken cancellationToken)
+		public async Task<IActionResult> Update([FromBody] DreamDaemonRequest model, CancellationToken cancellationToken)
 		{
 			if (model == null)
 				throw new ArgumentNullException(nameof(model));

From 158c0b5daf6b45f75cf3a29b09e66ecf7e462791 Mon Sep 17 00:00:00 2001
From: Dominion <Cyberboss@users.noreply.github.com>
Date: Fri, 3 Feb 2023 19:06:30 -0500
Subject: [PATCH 2/2] Minor fixup to log message placeholders

---
 src/Tgstation.Server.Host/Controllers/ApiController.cs | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Tgstation.Server.Host/Controllers/ApiController.cs b/src/Tgstation.Server.Host/Controllers/ApiController.cs
index c85a671c4a..172f81ddd2 100644
--- a/src/Tgstation.Server.Host/Controllers/ApiController.cs
+++ b/src/Tgstation.Server.Host/Controllers/ApiController.cs
@@ -180,18 +180,18 @@ namespace Tgstation.Server.Host.Controllers
 			{
 				if (ApiHeaders != null)
 					Logger.LogDebug(
-						"Starting API request: Version: {0}. {1}: {2}",
+						"Starting API request: Version: {clientApiVersion}. {userAgentHeaderName}: {clientUserAgent}",
 						ApiHeaders.ApiVersion.Semver(),
 						HeaderNames.UserAgent,
 						ApiHeaders.RawUserAgent);
 				else if (Request.Headers.TryGetValue(HeaderNames.UserAgent, out var userAgents))
 					Logger.LogDebug(
-						"Starting unauthorized API request. {0}: {1}",
+						"Starting unauthorized API request. {userAgentHeaderName}: {allUserAgents}",
 						HeaderNames.UserAgent,
 						userAgents);
 				else
 					Logger.LogDebug(
-						"Starting unauthorized API request. No {0}!",
+						"Starting unauthorized API request. No {userAgentHeaderName}!",
 						HeaderNames.UserAgent);
 				await base.OnActionExecutionAsync(context, next);
 			}