cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-26 14:37:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1428 from tgstation/APIFixup [APIDeploy][TGSDeploy]

Browse Source 
v5.3.1
This commit is contained in:
Jordan Dominion
2023-02-07 17:53:58 -05:00
committed by GitHub
parent 66ad0cf6d2 158c0b5daf
commit 9cc86cf5b6
3 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build/Version.props
+2 -2
View File
@@ -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>
src/Tgstation.Server.Host/Controllers/ApiController.cs
+3 -3
View File
@@ -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);
}
src/Tgstation.Server.Host/Controllers/DreamDaemonController.cs
+3 -2
View File
@@ -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));