diff --git a/src/modules/Elsa.Expressions/Options/ExpressionOptions.cs b/src/modules/Elsa.Expressions/Options/ExpressionOptions.cs index 460835be1..ec5ac1c19 100644 --- a/src/modules/Elsa.Expressions/Options/ExpressionOptions.cs +++ b/src/modules/Elsa.Expressions/Options/ExpressionOptions.cs @@ -24,16 +24,17 @@ public class ExpressionOptions this.AddTypeAlias("Boolean"); this.AddTypeAlias("Decimal"); this.AddTypeAlias("Double"); + this.AddTypeAlias("ByteArray"); this.AddTypeAlias("Guid"); this.AddTypeAlias("DateTime"); this.AddTypeAlias("DateTimeOffset"); this.AddTypeAlias("TimeSpan"); - this.AddTypeAlias("ExpandoObject"); + this.AddTypeAlias("Stream"); this.AddTypeAlias("JSON"); - this.AddTypeAlias>("StringDictionary"); + this.AddTypeAlias>("StringDictionary"); + this.AddTypeAlias>("ObjectDictionary"); this.AddTypeAlias>("StringMap"); this.AddTypeAlias>("ObjectMap"); - this.AddTypeAlias>("ObjectDictionary"); } /// Gets the type alias dictionary. diff --git a/src/modules/Elsa.Http/Features/HttpFeature.cs b/src/modules/Elsa.Http/Features/HttpFeature.cs index 57e76dc51..f355a0ace 100644 --- a/src/modules/Elsa.Http/Features/HttpFeature.cs +++ b/src/modules/Elsa.Http/Features/HttpFeature.cs @@ -217,6 +217,11 @@ public class HttpFeature : FeatureBase Services.Configure(options => { + options.AddTypeAlias("HttpRequest"); + options.AddTypeAlias("HttpResponse"); + options.AddTypeAlias("HttpResponseMessage"); + options.AddTypeAlias("HttpHeaders"); + options.AddTypeAlias("RouteData"); options.AddTypeAlias("FormFile"); options.AddTypeAlias("FormFile[]"); options.AddTypeAlias("HttpFile"); diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JArrayIsland.json b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JArrayIsland.json index f78e01922..b5b0378dc 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JArrayIsland.json +++ b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JArrayIsland.json @@ -4,5 +4,5 @@ "_island": "[\r\n {\r\n \u0022path\u0022: \u0022folder1\u0022,\r\n \u0022command\u0022: \u0022add\u0022\r\n }\r\n]", "_type": "Newtonsoft.Json.Linq.JArray, Newtonsoft.Json" }, - "_type": "ObjectDictionary" + "_type": "ObjectMap" } \ No newline at end of file diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JArrayWithoutType.json b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JArrayWithoutType.json index 42c531e42..33b4f89f9 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JArrayWithoutType.json +++ b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JArrayWithoutType.json @@ -6,5 +6,5 @@ "command": "add" } ], - "_type": "ObjectDictionary" + "_type": "ObjectMap" } \ No newline at end of file diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JObjectIsland.json b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JObjectIsland.json index ddc4af5d9..088f33e15 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JObjectIsland.json +++ b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JObjectIsland.json @@ -4,5 +4,5 @@ "_island": "{\r\n \u0022file1\u0022: {\r\n \u0022script\u0022: [\r\n {\r\n \u0022path\u0022: \u0022folder1\u0022,\r\n \u0022command\u0022: \u0022add\u0022\r\n }\r\n ]\r\n }\r\n}", "_type": "Newtonsoft.Json.Linq.JObject, Newtonsoft.Json" }, - "_type": "ObjectDictionary" + "_type": "ObjectMap" } \ No newline at end of file diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JObjectWithoutType.json b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JObjectWithoutType.json index 9a42638c9..6050dd05c 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JObjectWithoutType.json +++ b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JObjectWithoutType.json @@ -10,5 +10,5 @@ ] } }, - "_type": "ObjectDictionary" + "_type": "ObjectMap" } \ No newline at end of file diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JsonArrayIsland.json b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JsonArrayIsland.json index 1f33d0c25..a73017d36 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JsonArrayIsland.json +++ b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JsonArrayIsland.json @@ -4,5 +4,5 @@ "_island": "[\r\n {\r\n \u0022path\u0022: \u0022folder1\u0022,\r\n \u0022command\u0022: \u0022add\u0022\r\n }\r\n]", "_type": "System.Text.Json.Nodes.JsonArray, System.Text.Json" }, - "_type": "ObjectDictionary" + "_type": "ObjectMap" } \ No newline at end of file diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JsonObjectIsland.json b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JsonObjectIsland.json index cc7a4135e..661b6327e 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JsonObjectIsland.json +++ b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JsonObjectIsland.json @@ -4,5 +4,5 @@ "_island": "{\r\n \u0022file1\u0022: {\r\n \u0022script\u0022: [\r\n {\r\n \u0022path\u0022: \u0022folder1\u0022,\r\n \u0022command\u0022: \u0022add\u0022\r\n }\r\n ]\r\n }\r\n}", "_type": "System.Text.Json.Nodes.JsonObject, System.Text.Json" }, - "_type": "ObjectDictionary" + "_type": "ObjectMap" } \ No newline at end of file diff --git a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JsonObjectWithoutType.json b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JsonObjectWithoutType.json index 9a42638c9..6050dd05c 100644 --- a/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JsonObjectWithoutType.json +++ b/test/integration/Elsa.Workflows.IntegrationTests/Serialization/JsonSerialization/JsonObjectWithoutType.json @@ -10,5 +10,5 @@ ] } }, - "_type": "ObjectDictionary" + "_type": "ObjectMap" } \ No newline at end of file