cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-22 20:47:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix a CA1506 warning

Browse Source
This commit is contained in:
Jordan Dominion
2024-09-21 12:21:08 -04:00
parent f37883a438
commit c6f30f7f7e
1 changed files with 31 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Client/ApiClient.cs
+31 -20
View File
@@ -405,7 +405,7 @@ namespace Tgstation.Server.Client
if (loggingConfigureAction != null)
hubConnectionBuilder.ConfigureLogging(loggingConfigureAction);
async ValueTask<IAsyncDisposable> AttemptConnect()
async ValueTask<HubConnection> AttemptConnect()
{
hubConnection = hubConnectionBuilder.Build();
try
@@ -454,25 +454,7 @@ namespace Tgstation.Server.Client
}
}
try
{
return await AttemptConnect();
}
catch (HttpRequestException ex)
{
// status code is not in netstandard
var propertyInfo = ex.GetType().GetProperty("StatusCode");
if (propertyInfo != null)
{
var statusCode = (HttpStatusCode)propertyInfo.GetValue(ex);
if (statusCode != HttpStatusCode.Unauthorized)
throw;
}
await RefreshToken(cancellationToken);
return await AttemptConnect();
}
return await WrapHubInitialConnectAuthRefresh(AttemptConnect, cancellationToken);
}
/// <summary>
@@ -594,6 +576,35 @@ namespace Tgstation.Server.Client
}
#pragma warning restore CA1506
/// <summary>
/// Wrap a hub connection attempt via a <paramref name="connectFunc"/> with proper token refreshing.
/// </summary>
/// <param name="connectFunc">The <see cref="HubConnection"/> <see cref="Func{TResult}"/>.</param>
/// <param name="cancellationToken">The <see cref="CancellationToken"/> for the operation.</param>
/// <returns>A <see cref="ValueTask{TResult}"/> resulting in the connected <see cref="HubConnection"/>.</returns>
async ValueTask<HubConnection> WrapHubInitialConnectAuthRefresh(Func<ValueTask<HubConnection>> connectFunc, CancellationToken cancellationToken)
{
try
{
return await connectFunc();
}
catch (HttpRequestException ex)
{
// status code is not in netstandard
var propertyInfo = ex.GetType().GetProperty("StatusCode");
if (propertyInfo != null)
{
var statusCode = (HttpStatusCode)propertyInfo.GetValue(ex);
if (statusCode != HttpStatusCode.Unauthorized)
throw;
}
await RefreshToken(cancellationToken);
return await connectFunc();
}
}
/// <summary>
/// Main request method.
/// </summary>