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

Fix issue with property expressions throwing invalid cast exceptions (#173)

Browse source 
Expression was returning the JValue of the property and was unable to convert to a string.
This commit is contained in:
Peter Davis 2019-11-18 17:37:33 +10:30 committed by Sipke Schoorstra
parent dad6c254f5
commit bbfbba53ce
1 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/scripting/Elsa.Scripting.JavaScript/Services/JavaScriptExpressionEvaluator.cs
View file

@ -13,6 +13,7 @@ using Jint;
using Jint.Native;
using MediatR;
using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
using NodaTime;
using NodaTime.Serialization.JsonNet;
@ -34,7 +35,7 @@ namespace Elsa.Scripting.JavaScript.Services
{
this.mediator = mediator;
this.mapper = mapper;
serializerSettings = new JsonSerializerSettings().ConfigureForNodaTime(DateTimeZoneProviders.Tzdb);
serializerSettings.Converters.Add(new TruncatingNumberJsonConverter());
}
@ -117,13 +118,18 @@ namespace Elsa.Scripting.JavaScript.Services
{
var obj = value.AsObject().ToObject();
if (obj is ExpandoObject)
switch (obj)
{
var json = JsonConvert.SerializeObject(obj, serializerSettings);
return JsonConvert.DeserializeObject(json, targetType, serializerSettings);
case ExpandoObject _:
{
var json = JsonConvert.SerializeObject(obj, serializerSettings);
return JsonConvert.DeserializeObject(json, targetType, serializerSettings);
}
case JValue jValue:
return jValue.Value;
default:
return obj;
}
return obj;
}
throw new ArgumentException($"Value type {value.Type} is not supported.", nameof(value));