Browse Source

Fix scheduler role check.

pull/542/head
Sebastian 6 years ago
parent
commit
22caad27c3
  1. 5
      backend/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs
  2. 2
      backend/src/Squidex.Domain.Apps.Entities/Contents/DynamicContentWorkflow.cs

5
backend/src/Squidex.Domain.Apps.Entities/Contents/ContentSchedulerGrain.cs

@ -8,6 +8,7 @@
using System; using System;
using System.Threading; using System.Threading;
using System.Threading.Tasks; using System.Threading.Tasks;
using Newtonsoft.Json.Bson;
using NodaTime; using NodaTime;
using Orleans; using Orleans;
using Orleans.Runtime; using Orleans.Runtime;
@ -77,7 +78,9 @@ namespace Squidex.Domain.Apps.Entities.Contents
if (job != null) if (job != null)
{ {
var command = new ChangeContentStatus { ContentId = content.Id, Status = job.Status, Actor = job.ScheduledBy, JobId = job.Id }; var command = new ChangeContentStatus { ContentId = content.Id, Status = job.Status, JobId = job.Id };
command.Actor = job.ScheduledBy;
await commandBus.PublishAsync(command); await commandBus.PublishAsync(command);
} }

2
backend/src/Squidex.Domain.Apps.Entities/Contents/DynamicContentWorkflow.cs

@ -105,7 +105,7 @@ namespace Squidex.Domain.Apps.Entities.Contents
private bool IsTrue(WorkflowCondition condition, NamedContentData data, ClaimsPrincipal user) private bool IsTrue(WorkflowCondition condition, NamedContentData data, ClaimsPrincipal user)
{ {
if (condition?.Roles != null) if (condition?.Roles != null && user != null)
{ {
if (!user.Claims.Any(x => x.Type == ClaimTypes.Role && condition.Roles.Contains(x.Value))) if (!user.Claims.Any(x => x.Type == ClaimTypes.Role && condition.Roles.Contains(x.Value)))
{ {

Loading…
Cancel
Save