lancommander-ref/LANCommander
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update RestSharp

Browse source
This commit is contained in:
Pat Hartl 2024-08-04 20:47:19 -05:00
parent f6cae223ca
commit 4fa3e339f6
4 changed files with 85 additions and 62 deletions
Download patch file Download diff file Expand all files Collapse all files

86
LANCommander.SDK/Client.cs
View file

@ -86,9 +86,11 @@ namespace LANCommander.SDK
if (!String.IsNullOrWhiteSpace(baseUrl))
{
BaseUrl = new Uri(baseUrl);
ApiClient = new RestClient(BaseUrl);
ApiClient.ThrowOnAnyError = true;
ApiClient = new RestClient(new RestClientOptions
{
BaseUrl = BaseUrl,
ThrowOnAnyError = true
});
}
}
@ -102,42 +104,6 @@ namespace LANCommander.SDK
return SemVersion.FromVersion(Assembly.GetExecutingAssembly().GetName().Version);
}
private void ValidateVersion(IRestResponse response)
{
try
{
var version = GetCurrentVersion();
var header = response.Headers.FirstOrDefault(h => h.Name == "X-API-Version");
if (response.IsSuccessful && header == null)
{
response.ErrorException = new ApiVersionMismatchException(version, null, $"The server is out of date and does not support client version {version}.");
return;
}
var apiVersion = SemVersion.Parse((string)header.Value, SemVersionStyles.Any);
if (version.Major != apiVersion.Major || version.Minor != apiVersion.Minor)
{
switch (version.ComparePrecedenceTo(apiVersion))
{
case -1:
response.ErrorException = new ApiVersionMismatchException(version, apiVersion, $"Your client (v{version}) is out of date and is not supported by the server (v{apiVersion})");
break;
case 1:
response.ErrorException = new ApiVersionMismatchException(version, apiVersion, $"Your client (v{version}) is on a version not supported by the server (v{apiVersion})");
break;
}
}
}
catch (Exception ex)
{
Logger?.LogError(ex, "Could not validate API version");
}
}
internal T PostRequest<T>(string route, object body, bool ignoreVersion = false)
{
if (Token == null)
@ -149,11 +115,11 @@ namespace LANCommander.SDK
.AddHeader("X-API-Version", GetCurrentVersion().ToString());
if (!ignoreVersion)
request.OnBeforeDeserialization += ValidateVersion;
request.Interceptors.Add(new VersionInterceptor());
var response = ApiClient.Post<T>(request);
return response.Data;
return response;
}
internal T PostRequest<T>(string route, bool ignoreVersion = false)
@ -166,11 +132,11 @@ namespace LANCommander.SDK
.AddHeader("X-API-Version", GetCurrentVersion().ToString());
if (!ignoreVersion)
request.OnBeforeDeserialization += ValidateVersion;
request.Interceptors.Add(new VersionInterceptor());
var response = ApiClient.Post<T>(request);
return response.Data;
return response;
}
internal async Task<T> PostRequestAsync<T>(string route, object body, bool ignoreVersion = false)
@ -184,7 +150,7 @@ namespace LANCommander.SDK
.AddHeader("X-API-Version", GetCurrentVersion().ToString());
if (!ignoreVersion)
request.OnBeforeDeserialization += ValidateVersion;
request.Interceptors.Add(new VersionInterceptor());
var response = await ApiClient.PostAsync<T>(request);
@ -201,7 +167,7 @@ namespace LANCommander.SDK
.AddHeader("X-API-Version", GetCurrentVersion().ToString());
if (!ignoreVersion)
request.OnBeforeDeserialization += ValidateVersion;
request.Interceptors.Add(new VersionInterceptor());
var response = await ApiClient.PostAsync<T>(request);
@ -218,11 +184,11 @@ namespace LANCommander.SDK
.AddHeader("X-API-Version", GetCurrentVersion().ToString());
if (!ignoreVersion)
request.OnBeforeDeserialization += ValidateVersion;
request.Interceptors.Add(new VersionInterceptor());
var response = ApiClient.Get<T>(request);
return response.Data;
return response;
}
internal async Task<T> GetRequestAsync<T>(string route, bool ignoreVersion = false)
@ -235,7 +201,7 @@ namespace LANCommander.SDK
.AddHeader("X-API-Version", GetCurrentVersion().ToString());
if (!ignoreVersion)
request.OnBeforeDeserialization += ValidateVersion;
request.Interceptors.Add(new VersionInterceptor());
var response = await ApiClient.GetAsync<T>(request);
@ -309,28 +275,28 @@ namespace LANCommander.SDK
internal T UploadRequest<T>(string route, string fileName, byte[] data, bool ignoreVersion = false)
{
var request = new RestRequest(route, Method.POST)
var request = new RestRequest(route, Method.Post)
.AddHeader("Authorization", $"Bearer {Token.AccessToken}")
.AddHeader("X-API-Version", GetCurrentVersion().ToString());
if (!ignoreVersion)
request.OnBeforeDeserialization += ValidateVersion;
request.Interceptors.Add(new VersionInterceptor());
request.AddFile(fileName, data, fileName);
var response = ApiClient.Post<T>(request);
return response.Data;
return response;
}
internal async Task<T> UploadRequestAsync<T>(string route, string fileName, byte[] data, bool ignoreVersion = false)
{
var request = new RestRequest(route, Method.POST)
var request = new RestRequest(route, Method.Post)
.AddHeader("Authorization", $"Bearer {Token.AccessToken}")
.AddHeader("X-API-Version", GetCurrentVersion().ToString());
if (!ignoreVersion)
request.OnBeforeDeserialization += ValidateVersion;
request.Interceptors.Add(new VersionInterceptor());
request.AddFile(fileName, data, fileName);
@ -341,7 +307,7 @@ namespace LANCommander.SDK
public async Task<AuthToken> AuthenticateAsync(string username, string password, bool ignoreVersion = false)
{
var request = new RestRequest("/api/Auth", Method.POST);
var request = new RestRequest("/api/Auth", Method.Post);
request.AddJsonBody(new AuthRequest()
{
@ -350,7 +316,7 @@ namespace LANCommander.SDK
});
if (!ignoreVersion)
request.OnBeforeDeserialization += ValidateVersion;
request.Interceptors.Add(new VersionInterceptor());
var response = await ApiClient.ExecuteAsync<AuthToken>(request);
@ -387,7 +353,7 @@ namespace LANCommander.SDK
public async Task LogoutAsync()
{
await ApiClient.ExecuteAsync(new RestRequest("/api/Auth/Logout", Method.POST));
await ApiClient.ExecuteAsync(new RestRequest("/api/Auth/Logout", Method.Post));
Connected = false;
Token = null;
@ -395,7 +361,7 @@ namespace LANCommander.SDK
public async Task<AuthToken> RegisterAsync(string username, string password)
{
var response = await ApiClient.ExecuteAsync<AuthResponse>(new RestRequest("/api/auth/register", Method.POST).AddJsonBody(new AuthRequest()
var response = await ApiClient.ExecuteAsync<AuthResponse>(new RestRequest("/api/auth/register", Method.Post).AddJsonBody(new AuthRequest()
{
UserName = username,
Password = password
@ -429,7 +395,7 @@ namespace LANCommander.SDK
public async Task<bool> PingAsync()
{
var response = await ApiClient.ExecuteAsync(new RestRequest("/api/Ping", Method.GET));
var response = await ApiClient.ExecuteAsync(new RestRequest("/api/Ping", Method.Get));
return response.StatusCode == HttpStatusCode.OK;
}
@ -454,7 +420,7 @@ namespace LANCommander.SDK
.AddHeader("X-API-Version", GetCurrentVersion().ToString());
if (!ignoreVersion)
request.OnBeforeDeserialization += ValidateVersion;
request.Interceptors.Add(new VersionInterceptor());
if (String.IsNullOrEmpty(token.AccessToken) || String.IsNullOrEmpty(token.RefreshToken))
{
@ -505,7 +471,7 @@ namespace LANCommander.SDK
.AddHeader("X-API-Version", GetCurrentVersion().ToString());
if (!ignoreVersion)
request.OnBeforeDeserialization += ValidateVersion;
request.Interceptors.Add(new VersionInterceptor());
if (String.IsNullOrEmpty(token.AccessToken) || String.IsNullOrEmpty(token.RefreshToken))
{

2
LANCommander.SDK/LANCommander.SDK.csproj
View file

@ -9,7 +9,7 @@
<PackageReference Include="Crc32.NET" Version="1.2.0" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
<PackageReference Include="PowerShellStandard.Library" Version="5.1.1" />
<PackageReference Include="RestSharp" Version="106.15.0" />
<PackageReference Include="RestSharp" Version="111.4.1" />
<PackageReference Include="Semver" Version="2.3.0" />
<PackageReference Include="YamlDotNet" Version="5.4.0" />
</ItemGroup>

2
LANCommander.SDK/LauncherService.cs
View file

@ -39,7 +39,7 @@ namespace LANCommander.SDK
{
try
{
var request = new RestRequest("/api/Launcher", Method.GET);
var request = new RestRequest("/api/Launcher", Method.Get);
return await Client.GetRequestAsync<CheckForUpdateResponse>("/api/Launcher/CheckForUpdate", true);
}

57
LANCommander.SDK/VersionInterceptor.cs Normal file
View file

@ -0,0 +1,57 @@
using LANCommander.SDK.Exceptions;
using Microsoft.Extensions.Logging;
using RestSharp;
using RestSharp.Interceptors;
using Semver;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
namespace LANCommander.SDK
{
internal class VersionInterceptor : Interceptor
{
private readonly ILogger Logger;
public override ValueTask AfterRequest(RestResponse response, CancellationToken cancellationToken)
{
try
{
var version = Client.GetCurrentVersion();
var header = response.Headers.FirstOrDefault(h => h.Name == "X-API-Version");
if (response.IsSuccessful && header == null)
{
response.ErrorException = new ApiVersionMismatchException(version, null, $"The server is out of date and does not support client version {version}.");
return new ValueTask();
}
var apiVersion = SemVersion.Parse((string)header.Value, SemVersionStyles.Any);
if (version.Major != apiVersion.Major || version.Minor != apiVersion.Minor)
{
switch (version.ComparePrecedenceTo(apiVersion))
{
case -1:
response.ErrorException = new ApiVersionMismatchException(version, apiVersion, $"Your client (v{version}) is out of date and is not supported by the server (v{apiVersion})");
break;
case 1:
response.ErrorException = new ApiVersionMismatchException(version, apiVersion, $"Your client (v{version}) is on a version not supported by the server (v{apiVersion})");
break;
}
}
}
catch (Exception ex)
{
Logger?.LogError(ex, "Could not validate API version");
}
return new ValueTask();
}
}
}