Merge pull request #2440 from tgstation/2439-bleh

Fix OIDC when a user is not in a group

build/Version.props

@@ -3,7 +3,7 @@
   <!-- Integration tests will ensure they match across the board -->
   <Import Project="WebpanelVersion.props" />
   <PropertyGroup>
-    <TgsCoreVersion>6.19.2</TgsCoreVersion>
+    <TgsCoreVersion>6.19.3</TgsCoreVersion>
     <TgsConfigVersion>5.9.0</TgsConfigVersion>
     <TgsRestVersion>10.14.1</TgsRestVersion>
     <TgsGraphQLVersion>0.7.0</TgsGraphQLVersion>

src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs

@@ -109,9 +109,9 @@ namespace Tgstation.Server.Host.Security
 		public void Dispose() => currentAuthenticationContext.Dispose();
 
 		/// <inheritdoc />
-		#pragma warning disable CA1506 // TODO: Decomplexify
+#pragma warning disable CA1506 // TODO: Decomplexify
 		public async Task ValidateTgsToken(Microsoft.AspNetCore.Authentication.JwtBearer.TokenValidatedContext tokenValidatedContext, CancellationToken cancellationToken)
-		#pragma warning restore CA1506
+#pragma warning restore CA1506
 		{
 			ArgumentNullException.ThrowIfNull(tokenValidatedContext);
 
@@ -212,6 +212,8 @@ namespace Tgstation.Server.Host.Security
 				.Include(oidcConnection => oidcConnection.User)
 					.ThenInclude(user => user!.Group)
 						.ThenInclude(group => group!.PermissionSet)
+				.Include(oidcConnection => oidcConnection.User)
+					.ThenInclude(user => user!.PermissionSet)
 				.FirstOrDefaultAsync(cancellationToken);
 
 			User user;