From c269fbd57c76efb33d1fcb93eac06b327fb016ee Mon Sep 17 00:00:00 2001 From: Jordan Dominion Date: Fri, 24 Nov 2023 09:35:04 -0500 Subject: [PATCH] Nullify `AuthenticationContextFactory` --- src/Tgstation.Server.Host/Security/AuthenticationContext.cs | 2 +- .../Security/AuthenticationContextFactory.cs | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/Tgstation.Server.Host/Security/AuthenticationContext.cs b/src/Tgstation.Server.Host/Security/AuthenticationContext.cs index f0f4e5be03..c40d122743 100644 --- a/src/Tgstation.Server.Host/Security/AuthenticationContext.cs +++ b/src/Tgstation.Server.Host/Security/AuthenticationContext.cs @@ -50,7 +50,7 @@ namespace Tgstation.Server.Host.Security /// The value of . /// The value of . /// The value of . - public void Initialize(ISystemIdentity systemIdentity, User user, InstancePermissionSet instanceUser) + public void Initialize(ISystemIdentity? systemIdentity, User user, InstancePermissionSet? instanceUser) { this.user = user ?? throw new ArgumentNullException(nameof(user)); if (systemIdentity == null && User.SystemIdentifier != null) diff --git a/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs b/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs index 3be3bc8061..8dca0248c7 100644 --- a/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs +++ b/src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs @@ -11,8 +11,6 @@ using Tgstation.Server.Host.Configuration; using Tgstation.Server.Host.Database; using Tgstation.Server.Host.Models; -#nullable disable - namespace Tgstation.Server.Host.Security { /// @@ -99,7 +97,7 @@ namespace Tgstation.Server.Host.Security return currentAuthenticationContext; } - ISystemIdentity systemIdentity; + ISystemIdentity? systemIdentity; if (user.SystemIdentifier != null) systemIdentity = identityCache.LoadCachedIdentity(user); else @@ -116,7 +114,7 @@ namespace Tgstation.Server.Host.Security var userPermissionSet = user.PermissionSet ?? user.Group.PermissionSet; try { - InstancePermissionSet instancePermissionSet = null; + InstancePermissionSet? instancePermissionSet = null; if (instanceId.HasValue) { instancePermissionSet = await databaseContext.InstancePermissionSets