diff --git a/Directory.Packages.props b/Directory.Packages.props index 4d2ec3adf..835238bbc 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,8 +4,8 @@ false - 3.6.0-preview.1170 - 9.0.7 + 3.6.0-preview.1175 + 9.0.8 9.7.0 @@ -17,13 +17,13 @@ - + - + @@ -42,14 +42,14 @@ - - - + + + - + @@ -61,8 +61,8 @@ - - + + @@ -130,8 +130,8 @@ - - + + @@ -156,194 +156,22 @@ - - + + - - - - + + + + - + - - true - true - - - 3.6.0-preview.1170 - 9.0.7 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/build/_build.csproj b/build/_build.csproj index 0e27141ab..c004aa8d9 100644 --- a/build/_build.csproj +++ b/build/_build.csproj @@ -24,7 +24,7 @@ - + diff --git a/src/modules/Elsa.Expressions.JavaScript/Endpoints/TypeDefinitions/Endpoint.cs b/src/modules/Elsa.Expressions.JavaScript/Endpoints/TypeDefinitions/Endpoint.cs index 66f61eaf2..0b98d2a17 100644 --- a/src/modules/Elsa.Expressions.JavaScript/Endpoints/TypeDefinitions/Endpoint.cs +++ b/src/modules/Elsa.Expressions.JavaScript/Endpoints/TypeDefinitions/Endpoint.cs @@ -40,7 +40,7 @@ internal class Get : ElsaEndpoint if (workflowGraph == null) { AddError($"Workflow definition {request.WorkflowDefinitionId} not found"); - await SendErrorsAsync(cancellation: cancellationToken); + await Send.ErrorsAsync(cancellation: cancellationToken); return; } @@ -49,7 +49,7 @@ internal class Get : ElsaEndpoint var fileName = $"elsa.{request.WorkflowDefinitionId}.d.ts"; var data = Encoding.UTF8.GetBytes(typeDefinitions); - await SendBytesAsync(data, fileName, "application/x-typescript", cancellation: cancellationToken); + await Send.BytesAsync(data, fileName, "application/x-typescript", cancellation: cancellationToken); } private async Task GetWorkflowGraphAsync(string workflowDefinitionId, CancellationToken cancellationToken) diff --git a/src/modules/Elsa.Identity/Endpoints/Applications/Create/Endpoint.cs b/src/modules/Elsa.Identity/Endpoints/Applications/Create/Endpoint.cs index f9dfee11c..e4f28069a 100644 --- a/src/modules/Elsa.Identity/Endpoints/Applications/Create/Endpoint.cs +++ b/src/modules/Elsa.Identity/Endpoints/Applications/Create/Endpoint.cs @@ -82,6 +82,6 @@ internal class Create : ElsaEndpoint hashedClientSecret.EncodeSecret(), hashedClientSecret.EncodeSalt()); - await SendOkAsync(response, cancellationToken); + await Send.OkAsync(response, cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Identity/Endpoints/Roles/Create/Endpoint.cs b/src/modules/Elsa.Identity/Endpoints/Roles/Create/Endpoint.cs index bf68297e9..0b4d68f97 100644 --- a/src/modules/Elsa.Identity/Endpoints/Roles/Create/Endpoint.cs +++ b/src/modules/Elsa.Identity/Endpoints/Roles/Create/Endpoint.cs @@ -60,6 +60,6 @@ internal class Create : ElsaEndpoint role.Name, role.Permissions); - await SendOkAsync(response, cancellationToken); + await Send.OkAsync(response, cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Identity/Endpoints/Users/Create/Endpoint.cs b/src/modules/Elsa.Identity/Endpoints/Users/Create/Endpoint.cs index 2c6beea49..52d216620 100644 --- a/src/modules/Elsa.Identity/Endpoints/Users/Create/Endpoint.cs +++ b/src/modules/Elsa.Identity/Endpoints/Users/Create/Endpoint.cs @@ -67,6 +67,6 @@ internal class Create : ElsaEndpoint hashedPassword.EncodeSecret(), hashedPassword.EncodeSalt()); - await SendOkAsync(response, cancellationToken); + await Send.OkAsync(response, cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Resilience/Endpoints/Retries/List/Endpoint.cs b/src/modules/Elsa.Resilience/Endpoints/Retries/List/Endpoint.cs index 98de4938a..e1d2fbdf0 100644 --- a/src/modules/Elsa.Resilience/Endpoints/Retries/List/Endpoint.cs +++ b/src/modules/Elsa.Resilience/Endpoints/Retries/List/Endpoint.cs @@ -23,12 +23,12 @@ public class Endpoint(IRetryAttemptReader reader) : ElsaEndpointWithoutRequest if (string.IsNullOrWhiteSpace(activityInstanceId)) { AddError("ActivityInstanceId is required."); - await SendErrorsAsync(cancellation: ct); + await Send.ErrorsAsync(cancellation: ct); return; } var page = await reader.ReadAttemptsAsync(activityInstanceId, pageArgs, ct); var response = new PagedListResponse(page); - await SendOkAsync(response, ct); + await Send.OkAsync(response, ct); } } \ No newline at end of file diff --git a/src/modules/Elsa.Resilience/Endpoints/SimulateResponse/Endpoint.cs b/src/modules/Elsa.Resilience/Endpoints/SimulateResponse/Endpoint.cs index 17f9fd0b3..39594d27f 100644 --- a/src/modules/Elsa.Resilience/Endpoints/SimulateResponse/Endpoint.cs +++ b/src/modules/Elsa.Resilience/Endpoints/SimulateResponse/Endpoint.cs @@ -43,7 +43,7 @@ public class SimulateResponseEndpoint(IMemoryCache memoryCache) : EndpointWithou }); } - await SendAsync(new(message), currentCode, ct); + await Send.ResponseAsync(new(message), currentCode, ct); } private int[] GetCodes() diff --git a/src/modules/Elsa.Tenants/Endpoints/Tenants/Add/Endpoint.cs b/src/modules/Elsa.Tenants/Endpoints/Tenants/Add/Endpoint.cs index 8a029bdcb..ff4f3a3ea 100644 --- a/src/modules/Elsa.Tenants/Endpoints/Tenants/Add/Endpoint.cs +++ b/src/modules/Elsa.Tenants/Endpoints/Tenants/Add/Endpoint.cs @@ -25,7 +25,7 @@ public class Endpoint(ITenantService tenantService, IIdentityGenerator identityG }; await tenantStore.AddAsync(tenant, ct); await tenantService.RefreshAsync(ct); - await SendOkAsync(tenant, ct); + await Send.OkAsync(tenant, ct); } } diff --git a/src/modules/Elsa.Tenants/Endpoints/Tenants/Delete/Endpoint.cs b/src/modules/Elsa.Tenants/Endpoints/Tenants/Delete/Endpoint.cs index 96ea75a32..b98d90b00 100644 --- a/src/modules/Elsa.Tenants/Endpoints/Tenants/Delete/Endpoint.cs +++ b/src/modules/Elsa.Tenants/Endpoints/Tenants/Delete/Endpoint.cs @@ -18,11 +18,11 @@ public class Endpoint(ITenantService tenantService, ITenantStore store) : ElsaEn if (!found) { - await SendNotFoundAsync(ct); + await Send.NotFoundAsync(ct); return; } await tenantService.RefreshAsync(ct); - await SendOkAsync(ct); + await Send.OkAsync(ct); } } \ No newline at end of file diff --git a/src/modules/Elsa.Tenants/Endpoints/Tenants/Get/Endpoint.cs b/src/modules/Elsa.Tenants/Endpoints/Tenants/Get/Endpoint.cs index ba8b0dc16..c4243c23c 100644 --- a/src/modules/Elsa.Tenants/Endpoints/Tenants/Get/Endpoint.cs +++ b/src/modules/Elsa.Tenants/Endpoints/Tenants/Get/Endpoint.cs @@ -19,10 +19,10 @@ public class Endpoint(ITenantService tenantService) : ElsaEndpointWithoutRequest if (tenant == null) { - await SendNotFoundAsync(ct); + await Send.NotFoundAsync(ct); return; } - await SendOkAsync(tenant, ct); + await Send.OkAsync(tenant, ct); } } \ No newline at end of file diff --git a/src/modules/Elsa.Tenants/Endpoints/Tenants/List/Endpoint.cs b/src/modules/Elsa.Tenants/Endpoints/Tenants/List/Endpoint.cs index 489a581c6..6ad4c4ad4 100644 --- a/src/modules/Elsa.Tenants/Endpoints/Tenants/List/Endpoint.cs +++ b/src/modules/Elsa.Tenants/Endpoints/Tenants/List/Endpoint.cs @@ -20,6 +20,6 @@ public class Endpoint(ITenantService tenantService) : ElsaEndpointWithoutRequest var tenants = await tenantService.ListAsync(ct); var response = new ListResponse(tenants.ToList()); var json = JsonSerializer.Serialize(response, SerializerOptions.ConfigurationJsonSerializerOptions); - await SendStringAsync(json, contentType: MediaTypeNames.Application.Json, cancellation: ct); + await Send.StringAsync(json, contentType: MediaTypeNames.Application.Json, cancellation: ct); } } \ No newline at end of file diff --git a/src/modules/Elsa.Tenants/Endpoints/Tenants/Refresh/Endpoint.cs b/src/modules/Elsa.Tenants/Endpoints/Tenants/Refresh/Endpoint.cs index aa7a3494e..62a7ed27f 100644 --- a/src/modules/Elsa.Tenants/Endpoints/Tenants/Refresh/Endpoint.cs +++ b/src/modules/Elsa.Tenants/Endpoints/Tenants/Refresh/Endpoint.cs @@ -14,6 +14,6 @@ public class Endpoint(ITenantService tenantService) : ElsaEndpointWithoutRequest public override async Task HandleAsync(CancellationToken ct) { await tenantService.RefreshAsync(ct); - await SendOkAsync(ct); + await Send.OkAsync(ct); } } \ No newline at end of file diff --git a/src/modules/Elsa.Tenants/Endpoints/Tenants/Update/Endpoint.cs b/src/modules/Elsa.Tenants/Endpoints/Tenants/Update/Endpoint.cs index 255eeba88..577293c1d 100644 --- a/src/modules/Elsa.Tenants/Endpoints/Tenants/Update/Endpoint.cs +++ b/src/modules/Elsa.Tenants/Endpoints/Tenants/Update/Endpoint.cs @@ -21,7 +21,7 @@ public class Endpoint(ITenantService tenantService, ITenantStore tenantStore) : if (tenant == null) { - await SendNotFoundAsync(ct); + await Send.NotFoundAsync(ct); return; } @@ -30,7 +30,7 @@ public class Endpoint(ITenantService tenantService, ITenantStore tenantStore) : tenant.Configuration = Serializers.DeserializeConfiguration(req.Configuration); await tenantStore.UpdateAsync(tenant, ct); await tenantService.RefreshAsync(ct); - await SendOkAsync(tenant, ct); + await Send.OkAsync(tenant, ct); } } diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/ActivityDescriptorOptions/Get/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/ActivityDescriptorOptions/Get/Endpoint.cs index 3bc6cb92b..0122e5086 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/ActivityDescriptorOptions/Get/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/ActivityDescriptorOptions/Get/Endpoint.cs @@ -30,18 +30,18 @@ internal class Get : ElsaEndpoint { var descriptor = request.Version == null ? await _registryLookup.FindAsync(request.ActivityTypeName) : await _registryLookup.FindAsync(request.ActivityTypeName, request.Version.Value); if (descriptor == null) - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); var propertyDescriptor = descriptor!.Inputs.FirstOrDefault(x => x.Name == request.PropertyName); if(propertyDescriptor == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } var inputOptions = await _optionsResolver.GetUIPropertiesAsync(propertyDescriptor.PropertyInfo!, request.Context, cancellationToken); - await SendOkAsync(new Response(inputOptions), cancellationToken); + await Send.OkAsync(new Response(inputOptions), cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/ActivityDescriptors/Get/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/ActivityDescriptors/Get/Endpoint.cs index d70f3a7d2..fa85a2eea 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/ActivityDescriptors/Get/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/ActivityDescriptors/Get/Endpoint.cs @@ -28,8 +28,8 @@ internal class Get : ElsaEndpoint var descriptor = request.Version == null ? await _registryLookup.FindAsync(request.TypeName) : await _registryLookup.FindAsync(request.TypeName, request.Version.Value); if (descriptor == null) - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); else - await SendOkAsync(descriptor, cancellationToken); + await Send.OkAsync(descriptor, cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/ActivityExecutions/Get/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/ActivityExecutions/Get/Endpoint.cs index 40d13fda0..829720b25 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/ActivityExecutions/Get/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/ActivityExecutions/Get/Endpoint.cs @@ -32,10 +32,10 @@ internal class Endpoint(IActivityExecutionStore store) : ElsaEndpointWithoutRequ if (record == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } - await SendOkAsync(record, cancellationToken); + await Send.OkAsync(record, cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/Bookmarks/Resume/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/Bookmarks/Resume/Endpoint.cs index 95ddfabd8..832b60f59 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/Bookmarks/Resume/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/Bookmarks/Resume/Endpoint.cs @@ -33,14 +33,14 @@ internal class Resume(ITokenService tokenService, IBookmarkQueue bookmarkQueue, if (ValidationFailed) { - await SendErrorsAsync(cancellation: cancellationToken); + await Send.ErrorsAsync(cancellation: cancellationToken); return; } await ResumeBookmarkedWorkflowAsync(payload, input, cancellationToken); if (!HttpContext.Response.HasStarted) - await SendOkAsync(cancellationToken); + await Send.OkAsync(cancellationToken); } private IDictionary? GetInputFromQueryString() diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/Events/TriggerAuthenticated/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/Events/TriggerAuthenticated/Endpoint.cs index f0b9cc41a..84de22dce 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/Events/TriggerAuthenticated/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/Events/TriggerAuthenticated/Endpoint.cs @@ -39,14 +39,14 @@ internal class Trigger : ElsaEndpoint if (workflowExecutionMode == WorkflowExecutionMode.Asynchronous) { await _eventPublisher.PublishAsync(eventName, correlationId, workflowInstanceId, activityInstanceId, input, true, cancellationToken); - await SendOkAsync(cancellationToken); + await Send.OkAsync(cancellationToken); } else { await _eventPublisher.PublishAsync(eventName, correlationId, workflowInstanceId, activityInstanceId, input, false, cancellationToken); if (!HttpContext.Response.HasStarted) - await SendOkAsync(cancellationToken); + await Send.OkAsync(cancellationToken); } } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/Events/TriggerPublic/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/Events/TriggerPublic/Endpoint.cs index 0f3e50a40..d175b7f03 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/Events/TriggerPublic/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/Events/TriggerPublic/Endpoint.cs @@ -36,7 +36,7 @@ internal class Trigger : ElsaEndpointWithoutRequest if (!_tokenService.TryDecryptToken(token, out var payload)) { AddError("Invalid token."); - await SendErrorsAsync(cancellation: cancellationToken); + await Send.ErrorsAsync(cancellation: cancellationToken); return; } @@ -45,6 +45,6 @@ internal class Trigger : ElsaEndpointWithoutRequest await _eventPublisher.PublishAsync(eventName, workflowInstanceId: workflowInstanceId, cancellationToken: cancellationToken); if (!HttpContext.Response.HasStarted) - await SendOkAsync(cancellationToken); + await Send.OkAsync(cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/Features/Get/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/Features/Get/Endpoint.cs index 72efe3552..f0f1c0cf1 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/Features/Get/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/Features/Get/Endpoint.cs @@ -34,10 +34,10 @@ internal class Get : ElsaEndpointWithoutRequest if (descriptor == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } - await SendOkAsync(descriptor, cancellationToken); + await Send.OkAsync(descriptor, cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/Package/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/Package/Endpoint.cs index 0f1a21d26..bb831e914 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/Package/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/Package/Endpoint.cs @@ -22,7 +22,7 @@ internal class Version : EndpointWithoutRequest var versionAttribute = assembly.GetCustomAttribute(); var version = RemoveAutoGeneratedPostfix(versionAttribute); - await SendOkAsync(new Response(version), cancellationToken); + await Send.OkAsync(new Response(version), cancellationToken); } private static string RemoveAutoGeneratedPostfix(AssemblyInformationalVersionAttribute? versionAttribute) => diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/Scripting/ExpressionDescriptors/List/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/Scripting/ExpressionDescriptors/List/Endpoint.cs index c0aed0303..0368fd5a7 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/Scripting/ExpressionDescriptors/List/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/Scripting/ExpressionDescriptors/List/Endpoint.cs @@ -25,7 +25,7 @@ internal class List(IExpressionDescriptorRegistry expressionDescriptorRegistry) var descriptors = expressionDescriptorRegistry.ListAll().ToList(); var models = Map(descriptors).ToList(); var response = new ListResponse(models); - return SendOkAsync(response, cancellationToken); + return Send.OkAsync(response, cancellationToken); } private static IEnumerable Map(List descriptors) => descriptors.Select(Map); diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/Tasks/Complete/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/Tasks/Complete/Endpoint.cs index 82a7ed29b..37cb30879 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/Tasks/Complete/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/Tasks/Complete/Endpoint.cs @@ -28,6 +28,6 @@ public class Complete : ElsaEndpoint public override async Task HandleAsync(Request request, CancellationToken cancellationToken) { await _taskReporter.ReportCompletionAsync(request.TaskId, request.Result, cancellationToken); - if (!HttpContext.Response.HasStarted) await SendOkAsync(cancellationToken); + if (!HttpContext.Response.HasStarted) await Send.OkAsync(cancellationToken); } } diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/Tests/Activities/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/Tests/Activities/Endpoint.cs index 49494c043..2740bb03a 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/Tests/Activities/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/Tests/Activities/Endpoint.cs @@ -37,7 +37,7 @@ internal class Endpoint( if (workflowGraph == null) { AddError("Workflow definition not found."); - await SendErrorsAsync(cancellation: cancellationToken); + await Send.ErrorsAsync(cancellation: cancellationToken); return; } @@ -46,7 +46,7 @@ internal class Endpoint( if (activity == null) { AddError("Activity not found."); - await SendErrorsAsync(cancellation: cancellationToken); + await Send.ErrorsAsync(cancellation: cancellationToken); return; } @@ -63,7 +63,7 @@ internal class Endpoint( Status = record.Status }; - await SendOkAsync(response, cancellationToken); + await Send.OkAsync(response, cancellationToken); } } diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkDelete/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkDelete/Endpoint.cs index 1da5ff771..d5c7d33d7 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkDelete/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkDelete/Endpoint.cs @@ -23,7 +23,7 @@ internal class BulkDelete(IWorkflowDefinitionManager workflowDefinitionManager, if (!authorizationResult.Succeeded) { - await SendForbiddenAsync(cancellationToken); + await Send.ForbiddenAsync(cancellationToken); return null!; } diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkDeleteVersions/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkDeleteVersions/Endpoint.cs index 11648b4ef..6afd592ba 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkDeleteVersions/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkDeleteVersions/Endpoint.cs @@ -23,7 +23,7 @@ internal class BulkDeleteVersions(IWorkflowDefinitionManager workflowDefinitionM if (!authorizationResult.Succeeded) { - await SendForbiddenAsync(cancellationToken); + await Send.ForbiddenAsync(cancellationToken); return null!; } diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkDispatch/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkDispatch/Endpoint.cs index 53eb2ba68..be7740423 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkDispatch/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkDispatch/Endpoint.cs @@ -26,7 +26,7 @@ internal class Endpoint(IWorkflowDefinitionService workflowDefinitionService, IW if (workflowGraph == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } @@ -48,6 +48,6 @@ internal class Endpoint(IWorkflowDefinitionService workflowDefinitionService, IW instanceIds.Add(instanceId); } - await SendOkAsync(new Response(instanceIds), cancellationToken); + await Send.OkAsync(new Response(instanceIds), cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkPublish/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkPublish/Endpoint.cs index 309ff4c9d..753cb237a 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkPublish/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkPublish/Endpoint.cs @@ -25,7 +25,7 @@ internal class BulkPublish(IWorkflowDefinitionStore store, IWorkflowDefinitionPu if (!authorizationResult.Succeeded) { - await SendForbiddenAsync(cancellationToken); + await Send.ForbiddenAsync(cancellationToken); return null!; } diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkRetract/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkRetract/Endpoint.cs index e57162059..d200d2d2f 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkRetract/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/BulkRetract/Endpoint.cs @@ -25,7 +25,7 @@ internal class BulkRetract(IWorkflowDefinitionStore store, IWorkflowDefinitionPu if (!authorizationResult.Succeeded) { - await SendForbiddenAsync(cancellationToken); + await Send.ForbiddenAsync(cancellationToken); return null!; } diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Count/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Count/Endpoint.cs index 8c99d08c7..cfdf2f28a 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Count/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Count/Endpoint.cs @@ -20,6 +20,6 @@ internal class Count(IWorkflowDefinitionStore store) : ElsaEndpointWithoutReques { var count = await store.CountDistinctAsync(cancellationToken); var response = new Response(count); - await SendOkAsync(response, cancellationToken); + await Send.OkAsync(response, cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Delete/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Delete/Endpoint.cs index a3c5bfde3..4fe973751 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Delete/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Delete/Endpoint.cs @@ -29,7 +29,7 @@ internal class Delete(IWorkflowDefinitionManager workflowDefinitionManager, IAut if (definition == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } @@ -37,15 +37,15 @@ internal class Delete(IWorkflowDefinitionManager workflowDefinitionManager, IAut if (!authorizationResult.Succeeded) { - await SendForbiddenAsync(cancellationToken); + await Send.ForbiddenAsync(cancellationToken); return; } var result = await workflowDefinitionManager.DeleteByDefinitionIdAsync(request.DefinitionId, cancellationToken); if (result == 0) - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); else - await SendNoContentAsync(cancellationToken); + await Send.NoContentAsync(cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/DeleteVersion/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/DeleteVersion/Endpoint.cs index c29dc96f7..c1d9e81a3 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/DeleteVersion/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/DeleteVersion/Endpoint.cs @@ -23,15 +23,15 @@ internal class DeleteVersion(IWorkflowDefinitionManager workflowDefinitionManage if (!authorizationResult.Succeeded) { - await SendForbiddenAsync(cancellationToken); + await Send.ForbiddenAsync(cancellationToken); return; } var deleted = await workflowDefinitionManager.DeleteByIdAsync(request.Id, cancellationToken); if (!deleted) - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); else - await SendNoContentAsync(cancellationToken); + await Send.NoContentAsync(cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Dispatch/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Dispatch/Endpoint.cs index fb805465e..bce302489 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Dispatch/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Dispatch/Endpoint.cs @@ -24,7 +24,7 @@ internal class Endpoint(IWorkflowDefinitionService workflowDefinitionService, IW if(workflowGraph == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } @@ -33,7 +33,7 @@ internal class Endpoint(IWorkflowDefinitionService workflowDefinitionService, IW if(input != null && input is not IDictionary) { AddError("Input must be a dictionary."); - await SendErrorsAsync(cancellation: cancellationToken); + await Send.ErrorsAsync(cancellation: cancellationToken); return; } @@ -57,10 +57,10 @@ internal class Endpoint(IWorkflowDefinitionService workflowDefinitionService, IW { var fault = result.Fault!; AddError(fault.Message, fault.Code); - await SendErrorsAsync(cancellation: cancellationToken); + await Send.ErrorsAsync(cancellation: cancellationToken); return; } - await SendOkAsync(new Response(instanceId), cancellationToken); + await Send.OkAsync(new Response(instanceId), cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Execute/EndpointBase.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Execute/EndpointBase.cs index 399fd4096..70432fd97 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Execute/EndpointBase.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Execute/EndpointBase.cs @@ -35,7 +35,7 @@ internal abstract class EndpointBase( if (workflowGraph == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } @@ -57,7 +57,7 @@ internal abstract class EndpointBase( if (startResponse.CannotStart) { - await SendOkAsync(cancellationToken); + await Send.OkAsync(cancellationToken); return; } @@ -89,7 +89,7 @@ internal abstract class EndpointBase( if (HttpContext.Response.StatusCode == StatusCodes.Status200OK) { var workflowState = await workflowClient.ExportStateAsync(cancellationToken); - await SendOkAsync(new(workflowState), cancellationToken); + await Send.OkAsync(new(workflowState), cancellationToken); } } } diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Export/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Export/Endpoint.cs index eedd35128..4f876a7ce 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Export/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Export/Endpoint.cs @@ -61,7 +61,7 @@ internal class Export : ElsaEndpoint if (!definitions.Any()) { - await SendNoContentAsync(cancellationToken); + await Send.NoContentAsync(cancellationToken); return; } @@ -82,7 +82,7 @@ internal class Export : ElsaEndpoint // Send the zip file to the client: zipStream.Position = 0; - await SendBytesAsync(zipStream.ToArray(), "workflow-definitions.zip", cancellation: cancellationToken); + await Send.BytesAsync(zipStream.ToArray(), "workflow-definitions.zip", cancellation: cancellationToken); } private async Task DownloadSingleWorkflowAsync(string definitionId, string? versionOptions, CancellationToken cancellationToken) @@ -96,7 +96,7 @@ internal class Export : ElsaEndpoint if (definition == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } @@ -104,7 +104,7 @@ internal class Export : ElsaEndpoint var binaryJson = await SerializeWorkflowDefinitionAsync(model, cancellationToken); var fileName = GetFileName(model); - await SendBytesAsync(binaryJson, fileName, cancellation: cancellationToken); + await Send.BytesAsync(binaryJson, fileName, cancellation: cancellationToken); } private string GetFileName(WorkflowDefinitionModel definition) diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/GetByDefinitionId/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/GetByDefinitionId/Endpoint.cs index 4b2fbe9e7..813ca17e7 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/GetByDefinitionId/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/GetByDefinitionId/Endpoint.cs @@ -23,11 +23,11 @@ internal class GetByDefinitionId(IWorkflowDefinitionStore store, IWorkflowDefini if (definition == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } var model = await linker.MapAsync(definition, cancellationToken); - await SendOkAsync(model, cancellationToken); + await Send.OkAsync(model, cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/GetById/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/GetById/Endpoint.cs index 24cf2baf4..956d4bbc5 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/GetById/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/GetById/Endpoint.cs @@ -27,11 +27,11 @@ internal class GetById(IWorkflowDefinitionStore store, IWorkflowDefinitionLinker if (definition == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } var model = await linker.MapAsync(definition, cancellationToken); - await SendOkAsync(model, cancellationToken); + await Send.OkAsync(model, cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/GetManyById/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/GetManyById/Endpoint.cs index 75899b710..cecee5a2a 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/GetManyById/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/GetManyById/Endpoint.cs @@ -26,6 +26,6 @@ internal class GetManyById(IWorkflowDefinitionStore store, IWorkflowDefinitionLi var definitions = (await store.FindManyAsync(filter, cancellationToken)).ToList(); var models = await linker.MapAsync(definitions, cancellationToken); var response = new ListResponse(models); - await SendOkAsync(response, cancellationToken); + await Send.OkAsync(response, cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Graph/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Graph/Endpoint.cs index 5462fb2fc..da7fc9682 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Graph/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Graph/Endpoint.cs @@ -23,7 +23,7 @@ internal class Graph(IWorkflowDefinitionService workflowDefinitionService, IApiS if (workflowGraph == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Graph/Segments/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Graph/Segments/Endpoint.cs index c4d6a3e74..2f21e0813 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Graph/Segments/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Graph/Segments/Endpoint.cs @@ -26,7 +26,7 @@ internal class Nodes(IWorkflowDefinitionService workflowDefinitionService, IApiS if (workflowGraph?.Root == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } @@ -35,7 +35,7 @@ internal class Nodes(IWorkflowDefinitionService workflowDefinitionService, IApiS if (!workflowGraph.NodeIdLookup.TryGetValue(nodeId, out var childNode)) { AddError("Unknown node ID"); - await SendErrorsAsync(cancellation: cancellationToken); + await Send.ErrorsAsync(cancellation: cancellationToken); return; } diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Import/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Import/Endpoint.cs index 72e792c17..e6ab1387e 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Import/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Import/Endpoint.cs @@ -49,7 +49,7 @@ internal class Import : ElsaEndpoint if (!authorizationResult.Succeeded) { - await SendForbiddenAsync(cancellationToken); + await Send.ForbiddenAsync(cancellationToken); return; } @@ -58,13 +58,13 @@ internal class Import : ElsaEndpoint if (result.Succeeded) { if (isNew) - await SendCreatedAtAsync(new { DefinitionId = definitionId }, updatedModel, cancellation: cancellationToken); + await Send.CreatedAtAsync(new { DefinitionId = definitionId }, updatedModel, cancellation: cancellationToken); else - await SendOkAsync(updatedModel, cancellationToken); + await Send.OkAsync(updatedModel, cancellationToken); } if (ValidationFailed) - await SendErrorsAsync(400, cancellationToken); + await Send.ErrorsAsync(400, cancellationToken); } private async Task ImportSingleWorkflowDefinitionAsync(WorkflowDefinitionModel model, CancellationToken cancellationToken) diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/ImportFiles/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/ImportFiles/Endpoint.cs index f0d0eee81..c848f305e 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/ImportFiles/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/ImportFiles/Endpoint.cs @@ -53,7 +53,7 @@ internal class ImportFiles : ElsaEndpoint if (!authorizationResult.Succeeded) { - await SendForbiddenAsync(cancellationToken); + await Send.ForbiddenAsync(cancellationToken); return; } @@ -62,11 +62,11 @@ internal class ImportFiles : ElsaEndpoint var count = await ImportFilesAsync(Files, cancellationToken); if (!ValidationFailed) - await SendOkAsync(new { Count = count }, cancellationToken); + await Send.OkAsync(new { Count = count }, cancellationToken); } if (ValidationFailed) - await SendErrorsAsync(400, cancellationToken); + await Send.ErrorsAsync(400, cancellationToken); } private async Task ImportFilesAsync(IFormFileCollection files, CancellationToken cancellationToken) diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/IsNameUnique/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/IsNameUnique/Endpoint.cs index 4c76d0b49..ca6dc1234 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/IsNameUnique/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/IsNameUnique/Endpoint.cs @@ -21,6 +21,6 @@ internal class IsNameUnique(IWorkflowDefinitionStore store) : ElsaEndpoint RefreshWorkflowDefinitionsAsync(ICollection? definitionIds, CancellationToken cancellationToken) diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Reload/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Reload/Endpoint.cs index fafb82df9..a13278e3c 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Reload/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Reload/Endpoint.cs @@ -18,7 +18,7 @@ internal class Reload(IWorkflowDefinitionsReloader workflowDefinitionsReloader) public override async Task HandleAsync(CancellationToken cancellationToken) { await ReloadWorkflowDefinitionsAsync(cancellationToken); - await SendOkAsync(cancellationToken); + await Send.OkAsync(cancellationToken); } private async Task ReloadWorkflowDefinitionsAsync(CancellationToken cancellationToken) diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Retract/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Retract/Endpoint.cs index 7a52e7506..02f1a4961 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Retract/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Retract/Endpoint.cs @@ -32,7 +32,7 @@ internal class Retract(IWorkflowDefinitionStore store, IWorkflowDefinitionPublis if (definition == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } @@ -40,19 +40,19 @@ internal class Retract(IWorkflowDefinitionStore store, IWorkflowDefinitionPublis if (!authorizationResult.Succeeded) { - await SendForbiddenAsync(cancellationToken); + await Send.ForbiddenAsync(cancellationToken); return; } if (!definition.IsPublished) { AddError($"Workflow with id {request.DefinitionId} is not published"); - await SendErrorsAsync(cancellation: cancellationToken); + await Send.ErrorsAsync(cancellation: cancellationToken); return; } await workflowDefinitionPublisher.RetractAsync(definition, cancellationToken); var response = await linker.MapAsync(definition, cancellationToken); - await SendOkAsync(response, cancellationToken); + await Send.OkAsync(response, cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/UpdateReferences/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/UpdateReferences/Endpoint.cs index a510186c7..e2e742cac 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/UpdateReferences/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/UpdateReferences/Endpoint.cs @@ -32,7 +32,7 @@ internal class UpdateReferences(IWorkflowReferenceUpdater workflowReferenceUpdat if (definition == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } @@ -40,13 +40,13 @@ internal class UpdateReferences(IWorkflowReferenceUpdater workflowReferenceUpdat if (!authorizationResult.Succeeded) { - await SendForbiddenAsync(cancellationToken); + await Send.ForbiddenAsync(cancellationToken); return; } var result = await workflowReferenceUpdater.UpdateWorkflowReferencesAsync(definition, cancellationToken); var affectedWorkflows = result.UpdatedWorkflows; var response = new Response(affectedWorkflows.Select(w => w.Name ?? w.DefinitionId)); - await SendOkAsync(response, cancellationToken); + await Send.OkAsync(response, cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Version/Delete.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Version/Delete.cs index b6a4d0930..a4a53f139 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Version/Delete.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Version/Delete.cs @@ -38,7 +38,7 @@ public class DeleteVersion(IWorkflowDefinitionManager workflowDefinitionManager, if (definition == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } @@ -46,7 +46,7 @@ public class DeleteVersion(IWorkflowDefinitionManager workflowDefinitionManager, if (!authorizationResult.Succeeded) { - await SendForbiddenAsync(cancellationToken); + await Send.ForbiddenAsync(cancellationToken); return; } @@ -54,10 +54,10 @@ public class DeleteVersion(IWorkflowDefinitionManager workflowDefinitionManager, if (!result) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } - await SendOkAsync(cancellationToken); + await Send.OkAsync(cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Version/List.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Version/List.cs index cd119aede..c7336a9a8 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Version/List.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Version/List.cs @@ -32,10 +32,10 @@ internal class ListVersions(IWorkflowDefinitionStore store) : ElsaEndpointWithou if (!definitions.Any()) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } - await SendAsync(definitions, StatusCodes.Status200OK, cancellationToken); + await Send.OkAsync(definitions, cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Version/Revert.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Version/Revert.cs index 4dcd78dc9..60c5b0ce5 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Version/Revert.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Version/Revert.cs @@ -35,7 +35,7 @@ internal class RevertVersion(IWorkflowDefinitionManager workflowDefinitionManage if (definition == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } @@ -43,14 +43,14 @@ internal class RevertVersion(IWorkflowDefinitionManager workflowDefinitionManage if (!authorizationResult.Succeeded) { - await SendForbiddenAsync(cancellationToken); + await Send.ForbiddenAsync(cancellationToken); return; } var newDefinition = await workflowDefinitionManager.RevertVersionAsync(definitionId, version, cancellationToken); var newDefinitionSummary = WorkflowDefinitionSummary.FromDefinition(newDefinition); - await SendCreatedAtAsync("GetWorkflowDefinitionById", new + await Send.CreatedAtAsync("GetWorkflowDefinitionById", new { id = newDefinition.Id }, newDefinitionSummary, cancellation: cancellationToken); diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Cancel/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Cancel/Endpoint.cs index 978e95e6b..af51bcc28 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Cancel/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Cancel/Endpoint.cs @@ -21,6 +21,6 @@ internal class Cancel(IWorkflowCancellationService workflowCancellationService) { await workflowCancellationService.CancelWorkflowAsync(request.Id, cancellationToken); - await SendOkAsync(cancellationToken); + await Send.OkAsync(cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Delete/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Delete/Endpoint.cs index 96e7e7b3c..075756859 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Delete/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Delete/Endpoint.cs @@ -20,8 +20,8 @@ internal class Delete(IWorkflowInstanceManager store) : ElsaEndpoint var deleted = await store.DeleteAsync(filter, cancellationToken); if (deleted) - await SendNoContentAsync(cancellationToken); + await Send.NoContentAsync(cancellationToken); else - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); } } \ No newline at end of file diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/ExecutionState/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/ExecutionState/Endpoint.cs index 3e57ead37..37fb7fc94 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/ExecutionState/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/ExecutionState/Endpoint.cs @@ -25,7 +25,7 @@ internal class ExecutionState(IWorkflowInstanceStore store) : ElsaEndpoint if (!instances.Any()) { - await SendNoContentAsync(cancellationToken); + await Send.NoContentAsync(cancellationToken); return; } @@ -94,7 +94,7 @@ internal class Export : ElsaEndpointWithMapper // Send the zip file to the client: zipStream.Position = 0; - await SendBytesAsync(zipStream.ToArray(), "workflow-instances.zip", cancellation: cancellationToken); + await Send.BytesAsync(zipStream.ToArray(), "workflow-instances.zip", cancellation: cancellationToken); } private async Task DownloadSingleInstanceAsync(Request request, string id, CancellationToken cancellationToken) @@ -103,7 +103,7 @@ internal class Export : ElsaEndpointWithMapper if (instance == null) { - await SendNotFoundAsync(cancellationToken); + await Send.NotFoundAsync(cancellationToken); return; } @@ -111,7 +111,7 @@ internal class Export : ElsaEndpointWithMapper var binaryJson = SerializeWorkflowInstance(model); var fileName = GetFileName(instance.WorkflowState); - await SendBytesAsync(binaryJson, fileName, cancellation: cancellationToken); + await Send.BytesAsync(binaryJson, fileName, cancellation: cancellationToken); } private async Task CreateExportModelAsync(Request request, WorkflowInstance instance, CancellationToken cancellationToken) diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Get/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Get/Endpoint.cs index 9ec2b8e43..f1b86a61c 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Get/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Get/Endpoint.cs @@ -21,8 +21,8 @@ internal class Get(IWorkflowInstanceStore store) : ElsaEndpoint var count = await ImportFilesAsync(Files, cancellationToken); var response = new Response { Imported = count }; - await SendOkAsync(response, cancellationToken); + await Send.OkAsync(response, cancellationToken); } private async Task ImportFilesAsync(IFormFileCollection files, CancellationToken cancellationToken) diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Journal/GetLastEntry/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Journal/GetLastEntry/Endpoint.cs index 0c7378351..7b622adba 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Journal/GetLastEntry/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Journal/GetLastEntry/Endpoint.cs @@ -40,10 +40,10 @@ public class Get(IWorkflowExecutionLogStore store) : ElsaEndpoint ParseEnumStrings(IEnumerable strings) where TEnum : struct diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Variables/List/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Variables/List/Endpoint.cs index c753b5564..7292cde7e 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Variables/List/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Variables/List/Endpoint.cs @@ -23,14 +23,14 @@ internal class List(IWorkflowInstanceVariableManager workflowInstanceVariableMan if (string.IsNullOrWhiteSpace(workflowInstanceId)) { AddError("The workflow instance ID is required."); - await SendErrorsAsync(StatusCodes.Status400BadRequest, cancellationToken); + await Send.ErrorsAsync(StatusCodes.Status400BadRequest, cancellationToken); return; } var variables = await workflowInstanceVariableManager.GetVariablesAsync(workflowInstanceId, ["LargeData"],cancellationToken).ToList(); var variableModels = variables.Select(x => new ResolvedVariableModel(x.Variable.Id, x.Variable.Name, x.Value)).ToList(); var response = new ListResponse(variableModels); - await SendOkAsync(response, cancellationToken); + await Send.OkAsync(response, cancellationToken); } } diff --git a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Variables/Post/Endpoint.cs b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Variables/Post/Endpoint.cs index 66683aa15..71115061f 100644 --- a/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Variables/Post/Endpoint.cs +++ b/src/modules/Elsa.Workflows.Api/Endpoints/WorkflowInstances/Variables/Post/Endpoint.cs @@ -23,14 +23,14 @@ internal class List(IWorkflowInstanceVariableManager workflowInstanceVariableMan if (string.IsNullOrWhiteSpace(workflowInstanceId)) { AddError("The workflow instance ID is required."); - await SendErrorsAsync(StatusCodes.Status400BadRequest, cancellationToken); + await Send.ErrorsAsync(StatusCodes.Status400BadRequest, cancellationToken); return; } var resolvedVariables = await workflowInstanceVariableManager.SetVariablesAsync(workflowInstanceId, request.Variables, cancellationToken).ToList(); var variableModels = resolvedVariables.Select(x => new ResolvedVariableModel(x.Variable.Id, x.Variable.Name, x.Value)).ToList(); var response = new ListResponse(variableModels); - await SendOkAsync(response, cancellationToken); + await Send.OkAsync(response, cancellationToken); } }