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

Merge remote-tracking branch 'origin/v3' into v3

Browse source
This commit is contained in:
Sipke Schoorstra 2023-03-08 15:52:01 +01:00
parent 64f5a9b38c 4e6a4031ab
commit 0eab217f01
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/modules/Elsa.Http/Middleware/WorkflowsMiddleware.cs
View file

@ -115,14 +115,14 @@ public class WorkflowsMiddleware
if (await HandleMultipleWorkflowsFoundAsync(httpContext, workflowMatches, cancellationToken))
return;
if (await HandleWorkflowFaultAsync(httpContext, workflowMatches.Single(), cancellationToken))
return;
if (await AuthorizeAsync(httpContext, workflowMatches.Single(), bookmarkPayload, cancellationToken))
return;
var executionResult = await _workflowRuntime.ExecuteWorkflowAsync(workflowMatches.Single(), input, cancellationToken);
if (await HandleWorkflowFaultAsync(httpContext, executionResult, cancellationToken))
return;
// Process the trigger result by resuming each HTTP bookmark, if any.
await _httpBookmarkProcessor.ProcessBookmarks(new List<WorkflowExecutionResult> { executionResult }, correlationId, input, cancellationToken);
}
@ -199,9 +199,9 @@ public class WorkflowsMiddleware
return true;
}
private async Task<bool> HandleWorkflowFaultAsync(HttpContext httpContext, WorkflowMatch workflowMatch, CancellationToken cancellationToken)
private async Task<bool> HandleWorkflowFaultAsync(HttpContext httpContext, WorkflowExecutionResult workflowExecutionResult, CancellationToken cancellationToken)
{
var instanceFilter = new WorkflowInstanceFilter { Id = workflowMatch.WorkflowInstanceId };
var instanceFilter = new WorkflowInstanceFilter { Id = workflowExecutionResult.InstanceId };
var workflowInstance = await _workflowInstanceStore.FindAsync(instanceFilter, cancellationToken);
if (workflowInstance is not null
@ -222,19 +222,19 @@ public class WorkflowsMiddleware
CancellationToken cancellationToken)
{
var payload = await GetBookmarkPayloadAsync(pendingWorkflowMatch, bookmarkPayload, cancellationToken);
if (!(payload.Authorize ?? false))
return false;
var authorized = await _httpEndpointAuthorizationHandler.AuthorizeAsync(new AuthorizeHttpEndpointContext(httpContext, pendingWorkflowMatch.WorkflowInstanceId, payload.Policy));
if (!authorized)
if (!authorized)
httpContext.Response.StatusCode = (int)HttpStatusCode.Unauthorized;
return !authorized;
}
private async Task<HttpEndpointBookmarkPayload> GetBookmarkPayloadAsync(WorkflowMatch workflowMatch,HttpEndpointBookmarkPayload bookmarkPayload, CancellationToken cancellationToken)
private async Task<HttpEndpointBookmarkPayload> GetBookmarkPayloadAsync(WorkflowMatch workflowMatch, HttpEndpointBookmarkPayload bookmarkPayload, CancellationToken cancellationToken)
{
var hash = _hasher.Hash(_activityTypeName, bookmarkPayload);