From 3168eded05065353d3bcd6e1347ad2e6174ff176 Mon Sep 17 00:00:00 2001
From: Jordan Brown <Cyberboss@users.noreply.github.com>
Date: Mon, 7 Dec 2020 12:40:04 -0500
Subject: [PATCH] Refactors Scope into base OAuthTokenRequest

---
 .../Security/OAuth/DiscordTokenRequest.cs         |  8 +-------
 .../Security/OAuth/OAuthTokenRequest.cs           | 15 +++++++++++----
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/src/Tgstation.Server.Host/Security/OAuth/DiscordTokenRequest.cs b/src/Tgstation.Server.Host/Security/OAuth/DiscordTokenRequest.cs
index a3ee43c704..cf477ba156 100644
--- a/src/Tgstation.Server.Host/Security/OAuth/DiscordTokenRequest.cs
+++ b/src/Tgstation.Server.Host/Security/OAuth/DiscordTokenRequest.cs
@@ -13,21 +13,15 @@ namespace Tgstation.Server.Host.Security.OAuth
 		/// </summary>
 		public string GrantType { get; }
 
-		/// <summary>
-		/// The 'scope' field.
-		/// </summary>
-		public string Scope { get; }
-
 		/// <summary>
 		/// Initializes a new instance of the <see cref="DiscordTokenRequest"/> <see langword="class"/>.
 		/// </summary>
 		/// <param name="oAuthConfiguration">The <see cref="OAuthConfigurationBase"/> for the <see cref="OAuthTokenRequest"/>.</param>
 		/// <param name="code">The OAuth code for the <see cref="OAuthTokenRequest"/>.</param>
 		public DiscordTokenRequest(OAuthConfigurationBase oAuthConfiguration, string code)
-			: base(oAuthConfiguration, code)
+			: base(oAuthConfiguration, code, "identify")
 		{
 			GrantType = "authorization_code";
-			Scope = "identify";
 		}
 	}
 }
diff --git a/src/Tgstation.Server.Host/Security/OAuth/OAuthTokenRequest.cs b/src/Tgstation.Server.Host/Security/OAuth/OAuthTokenRequest.cs
index 1db7a8f692..cad2885746 100644
--- a/src/Tgstation.Server.Host/Security/OAuth/OAuthTokenRequest.cs
+++ b/src/Tgstation.Server.Host/Security/OAuth/OAuthTokenRequest.cs
@@ -9,19 +9,26 @@ namespace Tgstation.Server.Host.Security.OAuth
 	class OAuthTokenRequest : OAuthConfigurationBase
 	{
 		/// <summary>
-		/// The OAuth code.
+		/// The OAuth code received from the browser.
 		/// </summary>
 		public string Code { get; }
 
 		/// <summary>
-		/// Initializes a new instance of the <see cref="OAuthTokenRequest"/>
+		/// The scopes being requested.
+		/// </summary>
+		public string Scope { get; }
+
+		/// <summary>
+		/// Initializes a new instance of the <see cref="OAuthTokenRequest"/> <see langword="class"/>.
 		/// </summary>
 		/// <param name="oAuthConfiguration">The <see cref="OAuthConfiguration"/> to build from.</param>
-		/// <param name="code">The OAuth code received from the browser.</param>
-		public OAuthTokenRequest(OAuthConfigurationBase oAuthConfiguration, string code)
+		/// <param name="code">The value of <see cref="Code"/>.</param>
+		/// <param name="scope">The value of <see cref="Scope"/></param>
+		public OAuthTokenRequest(OAuthConfigurationBase oAuthConfiguration, string code, string scope)
 			: base(oAuthConfiguration)
 		{
 			Code = code ?? throw new ArgumentNullException(nameof(code));
+			Scope = scope ?? throw new ArgumentNullException(nameof(scope));
 		}
 	}
 }