Fix client issues

This commit is contained in:
Jordan Brown
2020-05-24 22:46:03 -04:00
parent c1155fce3a
commit e9d1ff89e0
3 changed files with 8 additions and 5 deletions
+1 -1
View File
@@ -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)
@@ -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 />
@@ -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>