cyberpresidentvanellope/tgstation-server
1
0
Fork 0
mirror of https://github.com/tgstation/tgstation-server.git synced 2026-08-30 08:33:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

Nullify InstancePermissionSet

Browse Source
This commit is contained in:
Jordan Dominion
2023-12-18 19:31:29 -05:00
parent 9ea0b7bed9
commit 3a6047702f
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Tgstation.Server.Host/Jobs/JobsHubGroupMapper.cs
+1 -1
View File
@@ -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(
src/Tgstation.Server.Host/Models/InstancePermissionSet.cs
+3 -5
View File
@@ -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,
src/Tgstation.Server.Host/Security/AuthenticationContextFactory.cs
+1 -1
View File
@@ -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);