From fd2245075f1f477eff779f998a2735e82c92d4ee Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sun, 3 Nov 2024 12:23:22 -0500
Subject: [PATCH] Fix bad state if admin GET request was canceled

---
 .../Authority/AdministrationAuthority.cs               | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/Tgstation.Server.Host/Authority/AdministrationAuthority.cs b/src/Tgstation.Server.Host/Authority/AdministrationAuthority.cs
index 0655ebf6f2..76c7fc937b 100644
--- a/src/Tgstation.Server.Host/Authority/AdministrationAuthority.cs
+++ b/src/Tgstation.Server.Host/Authority/AdministrationAuthority.cs
@@ -98,11 +98,12 @@ namespace Tgstation.Server.Host.Authority
 				{
 					Version? greatestVersion = null;
 					Uri? repoUrl = null;
+					var scopeCancellationToken = CancellationToken.None; // DCT: None available
 					try
 					{
-						var gitHubService = await gitHubServiceFactory.CreateService(cancellationToken);
-						var repositoryUrlTask = gitHubService.GetUpdatesRepositoryUrl(cancellationToken);
-						var releases = await gitHubService.GetTgsReleases(cancellationToken);
+						var gitHubService = await gitHubServiceFactory.CreateService(scopeCancellationToken);
+						var repositoryUrlTask = gitHubService.GetUpdatesRepositoryUrl(scopeCancellationToken);
+						var releases = await gitHubService.GetTgsReleases(scopeCancellationToken);
 
 						foreach (var kvp in releases)
 						{
@@ -139,7 +140,8 @@ namespace Tgstation.Server.Host.Authority
 				else
 					task = (Task<AdministrationResponse>)rawCacheObject!;
 
-				return new AuthorityResponse<AdministrationResponse>(await task);
+				var result = await task.WaitAsync(cancellationToken);
+				return new AuthorityResponse<AdministrationResponse>(result);
 			}
 			catch (RateLimitExceededException e)
 			{