From 590f5c6a5510a511cc30291436e5dadeba4cfdac Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sun, 29 Oct 2023 15:26:34 -0400
Subject: [PATCH] Fix `ApiHeaders` improperly storing `OAuthCode`

- Store in its own property instead of `Token`
---
 src/Tgstation.Server.Api/ApiHeaders.cs        | 19 ++++++++++---------
 .../Controllers/HomeController.cs             |  2 +-
 2 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Tgstation.Server.Api/ApiHeaders.cs b/src/Tgstation.Server.Api/ApiHeaders.cs
index e9b721a303..5670abb8a3 100644
--- a/src/Tgstation.Server.Api/ApiHeaders.cs
+++ b/src/Tgstation.Server.Api/ApiHeaders.cs
@@ -112,6 +112,11 @@ namespace Tgstation.Server.Api
 		/// </summary>
 		public string? Password { get; }
 
+		/// <summary>
+		/// The OAuth code in use.
+		/// </summary>
+		public string? OAuthCode { get; }
+
 		/// <summary>
 		/// The <see cref="Models.OAuthProvider"/> the <see cref="Token"/> is for, if any.
 		/// </summary>
@@ -122,11 +127,6 @@ namespace Tgstation.Server.Api
 		/// </summary>
 		public bool IsTokenAuthentication => Token != null && !OAuthProvider.HasValue;
 
-		/// <summary>
-		/// The OAuth code in use.
-		/// </summary>
-		readonly string? oAuthCode;
-
 		/// <summary>
 		/// Checks if a given <paramref name="otherVersion"/> is compatible with our own.
 		/// </summary>
@@ -154,7 +154,7 @@ namespace Tgstation.Server.Api
 		/// Initializes a new instance of the <see cref="ApiHeaders"/> class. Used for token authentication.
 		/// </summary>
 		/// <param name="userAgent">The value of <see cref="UserAgent"/>.</param>
-		/// <param name="oAuthCode">The value of <see cref="oAuthCode"/>.</param>
+		/// <param name="oAuthCode">The value of <see cref="OAuthCode"/>.</param>
 		/// <param name="oAuthProvider">The value of <see cref="OAuthProvider"/>.</param>
 		public ApiHeaders(ProductHeaderValue userAgent, string oAuthCode, OAuthProvider oAuthProvider)
 			: this(userAgent, null, null, null)
@@ -162,7 +162,7 @@ namespace Tgstation.Server.Api
 			if (userAgent == null)
 				throw new ArgumentNullException(nameof(userAgent));
 
-			this.oAuthCode = oAuthCode ?? throw new ArgumentNullException(nameof(oAuthCode));
+			OAuthCode = oAuthCode ?? throw new ArgumentNullException(nameof(oAuthCode));
 			OAuthProvider = oAuthProvider;
 		}
 
@@ -267,7 +267,8 @@ namespace Tgstation.Server.Api
 								else
 									AddError(HeaderTypes.OAuthProvider, $"Missing {OAuthProviderHeader} header!");
 
-								goto case BearerAuthenticationScheme;
+								OAuthCode = parameter;
+								break;
 							case BearerAuthenticationScheme:
 								var tokenSplits = parameter.Split('.');
 								DateTimeOffset? expiresAt = null;
@@ -379,7 +380,7 @@ namespace Tgstation.Server.Api
 			headers.Add(ApiVersionHeader, CreateApiVersionHeader());
 			if (OAuthProvider.HasValue)
 			{
-				headers.Authorization = new AuthenticationHeaderValue(OAuthAuthenticationScheme, Token!.Bearer);
+				headers.Authorization = new AuthenticationHeaderValue(OAuthAuthenticationScheme, OAuthCode!);
 				headers.Add(OAuthProviderHeader, OAuthProvider.ToString());
 			}
 			else if (!IsTokenAuthentication)
diff --git a/src/Tgstation.Server.Host/Controllers/HomeController.cs b/src/Tgstation.Server.Host/Controllers/HomeController.cs
index 1c832f5d81..af1d4b90dd 100644
--- a/src/Tgstation.Server.Host/Controllers/HomeController.cs
+++ b/src/Tgstation.Server.Host/Controllers/HomeController.cs
@@ -261,7 +261,7 @@ namespace Tgstation.Server.Host.Controllers
 							return BadRequest(new ErrorMessageResponse(ErrorCode.OAuthProviderDisabled));
 
 						externalUserId = await validator
-							.ValidateResponseCode(ApiHeaders.Token.Bearer!, cancellationToken);
+							.ValidateResponseCode(ApiHeaders.OAuthCode!, cancellationToken);
 
 						Logger.LogTrace("External {oAuthProvider} UID: {externalUserId}", oAuthProvider, externalUserId);
 					}