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

Split import endpoints

Browse source 
This fixes an issue where the import of JSON content returns 415.
This commit is contained in:
Sipke Schoorstra 2023-11-24 21:54:08 +01:00
parent c08388ec07
commit 48e9963d6e
3 changed files with 134 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/clients/Elsa.Api.Client/Resources/WorkflowDefinitions/Contracts/IWorkflowDefinitionsApi.cs
View file

@ -174,7 +174,7 @@ public interface IWorkflowDefinitionsApi
/// </summary>
/// <param name="files">The files to import.</param>
/// <param name="cancellationToken">The cancellation token.</param>
[Post("/workflow-definitions/import")]
[Post("/workflow-definitions/import-files")]
[Multipart]
Task<ImportFilesResponse> ImportFilesAsync([AliasAs("files")] List<StreamPart> files, CancellationToken cancellationToken = default);

77
src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/Import/Endpoint.cs
View file

@ -39,84 +39,29 @@ internal class Import : ElsaEndpoint<WorkflowDefinitionModel>
Routes("workflow-definitions/import", "workflow-definitions/{definitionId}/import");
Verbs(FastEndpoints.Http.POST, FastEndpoints.Http.PUT);
ConfigurePermissions("write:workflow-definitions");
AllowFileUploads();
}
/// <inheritdoc />
public override async Task HandleAsync(WorkflowDefinitionModel model, CancellationToken cancellationToken)
{
if (Files.Any())
{
var count = await ImportFilesAsync(Files, cancellationToken);
if (!ValidationFailed)
await SendOkAsync(new { Count = count }, cancellationToken);
}
else
{
var definitionId = model.DefinitionId;
var isNew = string.IsNullOrWhiteSpace(definitionId);
var result = await ImportSingleWorkflowDefinitionAsync(model, cancellationToken);
var definition = result.WorkflowDefinition;
var updatedModel = await _workflowDefinitionMapper.MapAsync(definition, cancellationToken);
var definitionId = model.DefinitionId;
var isNew = string.IsNullOrWhiteSpace(definitionId);
var result = await ImportSingleWorkflowDefinitionAsync(model, cancellationToken);
var definition = result.WorkflowDefinition;
var updatedModel = await _workflowDefinitionMapper.MapAsync(definition, cancellationToken);
if (result.Succeeded)
{
if (isNew)
await SendCreatedAtAsync<GetByDefinitionId.GetByDefinitionId>(new { DefinitionId = definitionId }, updatedModel, cancellation: cancellationToken);
else
await SendOkAsync(updatedModel, cancellationToken);
}
if (result.Succeeded)
{
if (isNew)
await SendCreatedAtAsync<GetByDefinitionId.GetByDefinitionId>(new { DefinitionId = definitionId }, updatedModel, cancellation: cancellationToken);
else
await SendOkAsync(updatedModel, cancellationToken);
}
if (ValidationFailed)
await SendErrorsAsync(400, cancellationToken);
}
private async Task<int> ImportFilesAsync(IFormFileCollection files, CancellationToken cancellationToken)
{
var count = 0;
foreach (var file in files)
{
var fileStream = file.OpenReadStream();
// Check if the file is a JSON file or a ZIP file.
var isJsonFile = file.ContentType == "application/json";
// If the file is a JSON file, read it.
if (isJsonFile)
{
await ImportJsonStreamAsync(fileStream, cancellationToken);
count++;
}
else
{
// If the file is a ZIP file, extract the JSON files and read them.
var zipArchive = new ZipArchive(fileStream, ZipArchiveMode.Read);
foreach (var entry in zipArchive.Entries)
{
if (!entry.FullName.EndsWith(".json", StringComparison.OrdinalIgnoreCase))
continue;
var jsonStream = entry.Open();
await ImportJsonStreamAsync(jsonStream, cancellationToken);
count++;
}
}
}
return count;
}
private async Task ImportJsonStreamAsync(Stream jsonStream, CancellationToken cancellationToken)
{
var json = await new StreamReader(jsonStream).ReadToEndAsync();
var model = _apiSerializer.Deserialize<WorkflowDefinitionModel>(json);
await ImportSingleWorkflowDefinitionAsync(model, cancellationToken);
}
private async Task<ImportWorkflowResult> ImportSingleWorkflowDefinitionAsync(WorkflowDefinitionModel model, CancellationToken cancellationToken)
{
// Import workflow

122
src/modules/Elsa.Workflows.Api/Endpoints/WorkflowDefinitions/ImportFiles/Endpoint.cs Normal file
View file

@ -0,0 +1,122 @@
using System.IO.Compression;
using Elsa.Abstractions;
using Elsa.Workflows.Core.Contracts;
using Elsa.Workflows.Management.Contracts;
using Elsa.Workflows.Management.Mappers;
using Elsa.Workflows.Management.Models;
using JetBrains.Annotations;
using Microsoft.AspNetCore.Http;
namespace Elsa.Workflows.Api.Endpoints.WorkflowDefinitions.ImportFiles;
/// <summary>
/// Imports JSON and/or ZIP files containing a workflow definitions.
/// </summary>
[PublicAPI]
internal class ImportFiles : ElsaEndpoint<WorkflowDefinitionModel>
{
private readonly IWorkflowDefinitionService _workflowDefinitionService;
private readonly IWorkflowDefinitionImporter _workflowDefinitionImporter;
private readonly WorkflowDefinitionMapper _workflowDefinitionMapper;
private readonly IApiSerializer _apiSerializer;
/// <inheritdoc />
public ImportFiles(
IWorkflowDefinitionService workflowDefinitionService,
IWorkflowDefinitionImporter workflowDefinitionImporter,
WorkflowDefinitionMapper workflowDefinitionMapper,
IApiSerializer apiSerializer)
{
_workflowDefinitionService = workflowDefinitionService;
_workflowDefinitionImporter = workflowDefinitionImporter;
_workflowDefinitionMapper = workflowDefinitionMapper;
_apiSerializer = apiSerializer;
}
/// <inheritdoc />
public override void Configure()
{
Post("workflow-definitions/import-files");
ConfigurePermissions("write:workflow-definitions");
AllowFileUploads();
}
/// <inheritdoc />
public override async Task HandleAsync(WorkflowDefinitionModel model, CancellationToken cancellationToken)
{
if (Files.Any())
{
var count = await ImportFilesAsync(Files, cancellationToken);
if (!ValidationFailed)
await SendOkAsync(new { Count = count }, cancellationToken);
}
if (ValidationFailed)
await SendErrorsAsync(400, cancellationToken);
}
private async Task<int> ImportFilesAsync(IFormFileCollection files, CancellationToken cancellationToken)
{
var count = 0;
foreach (var file in files)
{
var fileStream = file.OpenReadStream();
// Check if the file is a JSON file or a ZIP file.
var isJsonFile = file.ContentType == "application/json";
// If the file is a JSON file, read it.
if (isJsonFile)
{
await ImportJsonStreamAsync(fileStream, cancellationToken);
count++;
}
else
{
// If the file is a ZIP file, extract the JSON files and read them.
var zipArchive = new ZipArchive(fileStream, ZipArchiveMode.Read);
foreach (var entry in zipArchive.Entries)
{
if (!entry.FullName.EndsWith(".json", StringComparison.OrdinalIgnoreCase))
continue;
var jsonStream = entry.Open();
await ImportJsonStreamAsync(jsonStream, cancellationToken);
count++;
}
}
}
return count;
}
private async Task ImportJsonStreamAsync(Stream jsonStream, CancellationToken cancellationToken)
{
var json = await new StreamReader(jsonStream).ReadToEndAsync();
var model = _apiSerializer.Deserialize<WorkflowDefinitionModel>(json);
await ImportSingleWorkflowDefinitionAsync(model, cancellationToken);
}
private async Task<ImportWorkflowResult> ImportSingleWorkflowDefinitionAsync(WorkflowDefinitionModel model, CancellationToken cancellationToken)
{
// Import workflow
var saveWorkflowRequest = new SaveWorkflowDefinitionRequest
{
Model = model,
Publish = false,
};
var result = await _workflowDefinitionImporter.ImportAsync(saveWorkflowRequest, cancellationToken);
if (result.Succeeded)
return result;
foreach (var validationError in result.ValidationErrors)
AddError(validationError.Message);
return result;
}
}