From 3a6047702f6bc1534fad80f43e22539f4404e4c7 Mon Sep 17 00:00:00 2001
From: Jordan Dominion <Cyberboss@users.noreply.github.com>
Date: Mon, 18 Dec 2023 19:31:29 -0500
Subject: [PATCH] Nullify `InstancePermissionSet`

---
 src/Tgstation.Server.Host/Jobs/JobsHubGroupMapper.cs      | 2 +-
 src/Tgstation.Server.Host/Models/InstancePermissionSet.cs | 8 +++-----
 .../Security/AuthenticationContextFactory.cs              | 2 +-
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/src/Tgstation.Server.Host/Jobs/JobsHubGroupMapper.cs b/src/Tgstation.Server.Host/Jobs/JobsHubGroupMapper.cs
index 1342091caa..6264c185d7 100644
--- a/src/Tgstation.Server.Host/Jobs/JobsHubGroupMapper.cs
+++ b/src/Tgstation.Server.Host/Jobs/JobsHubGroupMapper.cs
@@ -67,7 +67,7 @@ namespace Tgstation.Server.Host.Jobs
 		public ValueTask InstancePermissionSetCreated(InstancePermissionSet instancePermissionSet, CancellationToken cancellationToken)
 		{
 			ArgumentNullException.ThrowIfNull(instancePermissionSet);
-			var permissionSetId = instancePermissionSet.PermissionSet.Id ?? instancePermissionSet.PermissionSetId;
+			var permissionSetId = instancePermissionSet.PermissionSetId;
 
 			logger.LogTrace("InstancePermissionSetCreated");
 			return RefreshHubGroups(
diff --git a/src/Tgstation.Server.Host/Models/InstancePermissionSet.cs b/src/Tgstation.Server.Host/Models/InstancePermissionSet.cs
index 01bc99ae42..8db1f17fba 100644
--- a/src/Tgstation.Server.Host/Models/InstancePermissionSet.cs
+++ b/src/Tgstation.Server.Host/Models/InstancePermissionSet.cs
@@ -2,8 +2,6 @@
 
 using Tgstation.Server.Api.Models.Response;
 
-#nullable disable
-
 namespace Tgstation.Server.Host.Models
 {
 	/// <inheritdoc cref="Api.Models.Internal.InstancePermissionSet" />
@@ -23,16 +21,16 @@ namespace Tgstation.Server.Host.Models
 		/// The <see cref="Models.Instance"/> the <see cref="InstancePermissionSet"/> belongs to.
 		/// </summary>
 		[Required]
-		public Instance Instance { get; set; }
+		public Instance? Instance { get; set; }
 
 		/// <summary>
 		/// The <see cref="Models.PermissionSet"/> the <see cref="InstancePermissionSet"/> belongs to.
 		/// </summary>
 		[Required]
-		public PermissionSet PermissionSet { get; set; }
+		public PermissionSet? PermissionSet { get; set; }
 
 		/// <inheritdoc />
-		public InstancePermissionSetResponse ToApi() => new InstancePermissionSetResponse
+		public InstancePermissionSetResponse ToApi() => new()
 		{
 			EngineRights = EngineRights,
 			ChatBotRights = ChatBotRights,
diff --git a/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs b/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs
index 8dca0248c7..7fa7b2802f 100644
--- a/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs
+++ b/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs
@@ -119,7 +119,7 @@ namespace Tgstation.Server.Host.Security
 				{
 					instancePermissionSet = await databaseContext.InstancePermissionSets
 						.AsQueryable()
-						.Where(x => x.PermissionSetId == userPermissionSet.Id && x.InstanceId == instanceId && x.Instance.SwarmIdentifer == swarmConfiguration.Identifier)
+						.Where(x => x.PermissionSetId == userPermissionSet.Id && x.InstanceId == instanceId && x.Instance!.SwarmIdentifer == swarmConfiguration.Identifier)
 						.Include(x => x.Instance)
 						.FirstOrDefaultAsync(cancellationToken);