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

Merge branch 'master' of https://github.com/elsa-workflows/elsa-core

Browse source
This commit is contained in:
Sipke Schoorstra 2021-12-20 17:24:26 +01:00
parent ee6296d930 1d059f878b
commit 5bc368efe7
8 changed files with 11 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/activities/Elsa.Activities.Http/Activities/SendHttpRequest/SendHttpRequest.cs
View file

@ -144,7 +144,7 @@ namespace Elsa.Activities.Http
if (hasContent && ReadContent)
{
var formatter = SelectContentParser(ResponseContentParserName, contentType);
ResponseContent = await formatter.ReadAsync(this, response, cancellationToken);
ResponseContent = await formatter.ReadAsync(response, this, cancellationToken);
}
var statusCode = (int)response.StatusCode;

2
src/activities/Elsa.Activities.Http/Parsers/Response/ExpandoObjectHttpResponseContentReader.cs
View file

@ -14,7 +14,7 @@ namespace Elsa.Activities.Http.Parsers.Response
public int Priority => 0;
public bool GetSupportsContentType(string contentType) => contentType.Contains("/json", StringComparison.OrdinalIgnoreCase);
public async Task<object> ReadAsync(SendHttpRequest activity, HttpResponseMessage response, CancellationToken cancellationToken)
public async Task<object> ReadAsync(HttpResponseMessage response, object context, CancellationToken cancellationToken)
{
var json = (await response.Content.ReadAsStringAsync()).Trim();

3
src/activities/Elsa.Activities.Http/Parsers/Response/FileHttpResponseContentReader.cs
View file

@ -11,12 +11,13 @@ namespace Elsa.Activities.Http.Parsers.Response
{
public string Name => "File";
public int Priority => 0;
public bool GetSupportsContentType(string contentType)
{
var types = new[] { "audio", "video", "application", "pdf" };
return types.Any(x => contentType.Contains(x, StringComparison.OrdinalIgnoreCase));
}
public async Task<object> ReadAsync(SendHttpRequest activity, HttpResponseMessage response, CancellationToken cancellationToken) => await response.Content.ReadAsByteArrayAsync();
public async Task<object> ReadAsync(HttpResponseMessage response, object context, CancellationToken cancellationToken) => await response.Content.ReadAsByteArrayAsync();
}
}

2
src/activities/Elsa.Activities.Http/Parsers/Response/JTokenHttpResponseContentReader.cs
View file

@ -13,7 +13,7 @@ namespace Elsa.Activities.Http.Parsers.Response
public int Priority => 0;
public bool GetSupportsContentType(string contentType) => contentType.Contains("/json", StringComparison.OrdinalIgnoreCase);
public async Task<object> ReadAsync(SendHttpRequest activity, HttpResponseMessage response, CancellationToken cancellationToken)
public async Task<object> ReadAsync(HttpResponseMessage response, object context, CancellationToken cancellationToken)
{
var json = (await response.Content.ReadAsStringAsync()).Trim();
return GetJTokenValue(json);

2
src/activities/Elsa.Activities.Http/Parsers/Response/JsonRawHttpResponseContentReader.cs
View file

@ -11,6 +11,6 @@ namespace Elsa.Activities.Http.Parsers.Response
public string Name => "JSON";
public int Priority => 100;
public bool GetSupportsContentType(string contentType) => contentType.Contains("/json", StringComparison.OrdinalIgnoreCase);
public async Task<object> ReadAsync(SendHttpRequest activity, HttpResponseMessage response, CancellationToken cancellationToken) => await response.Content.ReadAsStringAsync();
public async Task<object> ReadAsync(HttpResponseMessage response, object context, CancellationToken cancellationToken) => await response.Content.ReadAsStringAsync();
}
}

2
src/activities/Elsa.Activities.Http/Parsers/Response/PlainTextHttpResponseContentReader.cs
View file

@ -10,6 +10,6 @@ namespace Elsa.Activities.Http.Parsers.Response
public string Name => "Plain Text";
public int Priority => -1;
public bool GetSupportsContentType(string contentType) => true;
public async Task<object> ReadAsync(SendHttpRequest activity, HttpResponseMessage response, CancellationToken cancellationToken) => await response.Content.ReadAsStringAsync();
public async Task<object> ReadAsync(HttpResponseMessage response, object context, CancellationToken cancellationToken) => await response.Content.ReadAsStringAsync();
}
}

5
src/activities/Elsa.Activities.Http/Parsers/Response/TypedHttpResponseContentReader.cs
View file

@ -15,14 +15,15 @@ namespace Elsa.Activities.Http.Parsers.Response
public int Priority => 0;
public bool GetSupportsContentType(string contentType) => GetIsJsonContentType(contentType);
public async Task<object> ReadAsync(SendHttpRequest activity, HttpResponseMessage response, CancellationToken cancellationToken)
public async Task<object> ReadAsync(HttpResponseMessage response, object context, CancellationToken cancellationToken)
{
var activity = context as SendHttpRequest;
var contentType = response.Content.Headers.ContentType.MediaType;
if (GetIsJsonContentType(contentType))
{
var json = (await response.Content.ReadAsStringAsync()).Trim();
var targetType = activity.ResponseContentTargetType ?? typeof(ExpandoObject);
var targetType = activity?.ResponseContentTargetType ?? typeof(ExpandoObject);
return JsonConvert.DeserializeObject(json, targetType)!;
}

2
src/activities/Elsa.Activities.Http/Services/IHttpResponseContentReader.cs
View file

@ -9,6 +9,6 @@ namespace Elsa.Activities.Http.Services
string Name { get; }
int Priority { get; }
bool GetSupportsContentType(string contentType);
Task<object> ReadAsync(SendHttpRequest activity, HttpResponseMessage response, CancellationToken cancellationToken);
Task<object> ReadAsync(HttpResponseMessage response, object context, CancellationToken cancellationToken);
}
}