SemianiakaVY/elsa-core
1
0
Fork 0
Code Issues Pull requests Actions 1 Packages Projects Releases Wiki Activity

Harden Flowchart and Connection JSON serializers

Browse source
This commit is contained in:
Sipke Schoorstra 2023-07-12 18:33:19 +02:00
parent 7c4546e315
commit b9ac7f2c4b
2 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/modules/Elsa.Workflows.Core/Activities/Flowchart/Serialization/ConnectionJsonConverter.cs
View file

@ -44,6 +44,9 @@ public class ConnectionJsonConverter : JsonConverter<Connection>
/// <inheritdoc />
public override void Write(Utf8JsonWriter writer, Connection value, JsonSerializerOptions options)
{
if (value.Source.Activity == null! || value.Target.Activity == null!)
return;
var model = new
{
Source = new

8
src/modules/Elsa.Workflows.Core/Activities/Flowchart/Serialization/FlowchartJsonConverter.cs
View file

@ -124,8 +124,12 @@ public class FlowchartJsonConverter : JsonConverter<Activities.Flowchart>
{
var missingSource = notFoundConnection.Source;
var missingTarget = notFoundConnection.Target;
var source = foundActivities.FirstOrDefault(x => x.Id == missingSource.Activity.Id);
var target = foundActivities.FirstOrDefault(x => x.Id == missingTarget.Activity.Id);
// ReSharper disable ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
// Activity might be null in case of JSON missing information.
var source = foundActivities.FirstOrDefault(x => x.Id == missingSource.Activity?.Id);
var target = foundActivities.FirstOrDefault(x => x.Id == missingTarget.Activity?.Id);
// ReSharper restore ConditionalAccessQualifierIsNonNullableAccordingToAPIContract
if (source == null || target == null) continue;