From 449e3ad2828f44da8fcecf4d369b254a2002ec15 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Sun, 6 Oct 2024 10:09:23 -0400
Subject: [PATCH] Make authorized gateway information fields properly
 non-nullable

---
 .../GraphQL/Types/GatewayInformation.cs       | 21 ++++++++++---------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/src/Tgstation.Server.Host/GraphQL/Types/GatewayInformation.cs b/src/Tgstation.Server.Host/GraphQL/Types/GatewayInformation.cs
index aefc2562bb..a4fc74bd1d 100644
--- a/src/Tgstation.Server.Host/GraphQL/Types/GatewayInformation.cs
+++ b/src/Tgstation.Server.Host/GraphQL/Types/GatewayInformation.cs
@@ -1,5 +1,6 @@
-using System;
+using System;
 using System.Collections.Generic;
+using System.Diagnostics.CodeAnalysis;
 
 using HotChocolate;
 
@@ -28,7 +29,7 @@ namespace Tgstation.Server.Host.GraphQL.Types
 		/// <param name="generalConfigurationOptions">The <see cref="IOptionsSnapshot{TOptions}"/> containing the <see cref="GeneralConfiguration"/>.</param>
 		/// <returns>A <see cref="uint"/> specifying the minimumn valid password length for TGS users.</returns>
 		[TgsGraphQLAuthorize(AdministrationRights.WriteUsers | AdministrationRights.EditOwnPassword)]
-		public uint? MinimumPasswordLength(
+		public uint MinimumPasswordLength(
 			[Service] IOptionsSnapshot<GeneralConfiguration> generalConfigurationOptions)
 		{
 			ArgumentNullException.ThrowIfNull(generalConfigurationOptions);
@@ -41,7 +42,7 @@ namespace Tgstation.Server.Host.GraphQL.Types
 		/// <param name="generalConfigurationOptions">The <see cref="IOptionsSnapshot{TOptions}"/> containing the <see cref="GeneralConfiguration"/>.</param>
 		/// <returns>A <see cref="uint"/> specifying the maximum allowed attached instances for the <see cref="SwarmNode"/>.</returns>
 		[TgsGraphQLAuthorize(InstanceManagerRights.Create)]
-		public uint? InstanceLimit(
+		public uint InstanceLimit(
 			[Service] IOptionsSnapshot<GeneralConfiguration> generalConfigurationOptions)
 		{
 			ArgumentNullException.ThrowIfNull(generalConfigurationOptions);
@@ -55,7 +56,7 @@ namespace Tgstation.Server.Host.GraphQL.Types
 		/// <returns>A <see cref="uint"/> specifying the maximum allowed registered users for the <see cref="ServerSwarm"/>.</returns>
 		/// <remarks>This limit only applies to user creation attempts made via the current <see cref="SwarmNode"/>.</remarks>
 		[TgsGraphQLAuthorize(AdministrationRights.WriteUsers)]
-		public uint? UserLimit(
+		public uint UserLimit(
 			[Service] IOptionsSnapshot<GeneralConfiguration> generalConfigurationOptions)
 		{
 			ArgumentNullException.ThrowIfNull(generalConfigurationOptions);
@@ -69,7 +70,7 @@ namespace Tgstation.Server.Host.GraphQL.Types
 		/// <returns>A <see cref="uint"/> specifying the maximum allowed registered <see cref="UserGroup"/>s for the <see cref="ServerSwarm"/>.</returns>
 		/// <remarks>This limit only applies to <see cref="UserGroup"/> creation attempts made via the current <see cref="SwarmNode"/>.</remarks>
 		[TgsGraphQLAuthorize(AdministrationRights.WriteUsers)]
-		public uint? UserGroupLimit(
+		public uint UserGroupLimit(
 			[Service] IOptionsSnapshot<GeneralConfiguration> generalConfigurationOptions)
 		{
 			ArgumentNullException.ThrowIfNull(generalConfigurationOptions);
@@ -95,7 +96,7 @@ namespace Tgstation.Server.Host.GraphQL.Types
 		/// <param name="platformIdentifier">The <see cref="IPlatformIdentifier"/> to use.</param>
 		/// <returns><see langword="true"/> if the <see cref="SwarmNode"/> runs on a Windows operating system, <see langword="false"/> otherwise.</returns>
 		[TgsGraphQLAuthorize]
-		public bool? WindowsHost(
+		public bool WindowsHost(
 			[Service] IPlatformIdentifier platformIdentifier)
 		{
 			ArgumentNullException.ThrowIfNull(platformIdentifier);
@@ -106,7 +107,7 @@ namespace Tgstation.Server.Host.GraphQL.Types
 		/// Gets the swarm protocol <see cref="Version"/>.
 		/// </summary>
 		[TgsGraphQLAuthorize]
-		public Version? SwarmProtocolVersion => global::System.Version.Parse(MasterVersionsAttribute.Instance.RawSwarmProtocolVersion);
+		public Version SwarmProtocolVersion => global::System.Version.Parse(MasterVersionsAttribute.Instance.RawSwarmProtocolVersion);
 
 		/// <summary>
 		/// Gets the <see cref="global::System.Version"/> of tgstation-server the <see cref="SwarmNode"/> is running.
@@ -114,7 +115,7 @@ namespace Tgstation.Server.Host.GraphQL.Types
 		/// <param name="assemblyInformationProvider">The <see cref="IAssemblyInformationProvider"/> to use.</param>
 		/// <returns>The <see cref="global::System.Version"/> of tgstation-server the <see cref="SwarmNode"/> is running.</returns>
 		[TgsGraphQLAuthorize]
-		public Version? Version(
+		public Version Version(
 			[Service] IAssemblyInformationProvider assemblyInformationProvider)
 		{
 			ArgumentNullException.ThrowIfNull(assemblyInformationProvider);
@@ -130,13 +131,13 @@ namespace Tgstation.Server.Host.GraphQL.Types
 		/// Gets the HTTP API <see cref="global::System.Version"/> of the <see cref="SwarmNode"/>.
 		/// </summary>
 		[TgsGraphQLAuthorize]
-		public Version? ApiVersion => ApiHeaders.Version;
+		public Version ApiVersion => ApiHeaders.Version;
 
 		/// <summary>
 		/// Gets the DMAPI interop <see cref="global::System.Version"/> the <see cref="SwarmNode"/> uses.
 		/// </summary>
 		[TgsGraphQLAuthorize]
-		public Version? DMApiVersion => DMApiConstants.InteropVersion;
+		public Version DMApiVersion => DMApiConstants.InteropVersion;
 
 		/// <summary>
 		/// Gets the information needed to perform open authentication with the <see cref="SwarmNode"/>.