From e9d1ff89e038cb5ee5fda5522ab04c8de1d8eb69 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Sun, 24 May 2020 22:45:00 -0400
Subject: [PATCH] Fix client issues

---
 src/Tgstation.Server.Client/ApiClient.cs                 | 2 +-
 src/Tgstation.Server.Client/ServerClientFactory.cs       | 9 ++++++---
 .../Tgstation.Server.Client.csproj                       | 2 +-
 3 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Tgstation.Server.Client/ApiClient.cs b/src/Tgstation.Server.Client/ApiClient.cs
index 4fcdc1e981..539b3ce319 100644
--- a/src/Tgstation.Server.Client/ApiClient.cs
+++ b/src/Tgstation.Server.Client/ApiClient.cs
@@ -216,7 +216,7 @@ namespace Tgstation.Server.Client
 
 			try
 			{
-				var token = await RunRequest<Token>(Routes.Root, null, HttpMethod.Post, null, true, cancellationToken);
+				var token = await RunRequest<Token>(Routes.Root, new object(), HttpMethod.Post, null, true, cancellationToken);
 				headers = new ApiHeaders(headers.UserAgent!, token.Bearer!);
 			}
 			catch (ClientException)
diff --git a/src/Tgstation.Server.Client/ServerClientFactory.cs b/src/Tgstation.Server.Client/ServerClientFactory.cs
index 9dc883cca1..211645a9cb 100644
--- a/src/Tgstation.Server.Client/ServerClientFactory.cs
+++ b/src/Tgstation.Server.Client/ServerClientFactory.cs
@@ -62,13 +62,16 @@ namespace Tgstation.Server.Client
 				token = await api.Update<Token>(Routes.Root, cancellationToken).ConfigureAwait(false);
 			}
 
-			var client = CreateFromToken(host, token);
+			var apiHeaders = new ApiHeaders(productHeaderValue, token.Bearer!);
+
+			var client = new ServerClient(ApiClientFactory.CreateApiClient(host, apiHeaders, loginHeaders), token);
 			if (timeout.HasValue)
 				client.Timeout = timeout.Value;
 
-			var apiHeaders = new ApiHeaders(productHeaderValue, token.Bearer!);
+			foreach (var requestLogger in requestLoggers)
+				client.AddRequestLogger(requestLogger);
 
-			return new ServerClient(ApiClientFactory.CreateApiClient(host, apiHeaders, loginHeaders), token);
+			return client;
 		}
 
 		/// <inheritdoc />
diff --git a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
index 40d7a56503..3070b75011 100644
--- a/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
+++ b/src/Tgstation.Server.Client/Tgstation.Server.Client.csproj
@@ -16,7 +16,7 @@
     <RepositoryUrl>https://github.com/tgstation/tgstation-server</RepositoryUrl>
     <Copyright>2018</Copyright>
     <PackageTags>json web api tgstation-server tgstation ss13 byond client</PackageTags>
-    <PackageReleaseNotes>.Net Standard 2.1, allow login requests to be logged.</PackageReleaseNotes>
+    <PackageReleaseNotes>Fixed automatic refresh erroring internally. Fixed request loggers given to ServerClientFactory not being passed to the IServerClient.</PackageReleaseNotes>
     <IncludeSymbols>true</IncludeSymbols>
     <SymbolPackageFormat>snupkg</SymbolPackageFormat>
     <CodeAnalysisRuleSet>../../build/analyzers.ruleset</CodeAnalysisRuleSet>