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

Use shared secret name normalization

Browse source
This commit is contained in:
Sipke Schoorstra 2026-06-01 22:28:38 +02:00
parent e293a99aba
commit 69d9661fc0
No known key found for this signature in database
GPG key ID: 5C10502B28A4268F
2 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/modules/Elsa.Secrets.Persistence.EFCore/Repositories/EFCoreSecretRepository.cs
View file

@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore;
namespace Elsa.Secrets.Persistence.EFCore.Repositories;
public class EFCoreSecretRepository(Store<SecretsElsaDbContext, Secret> store) : ISecretRepository
public class EFCoreSecretRepository(Store<SecretsElsaDbContext, Secret> store, ISecretNameValidator secretNameValidator) : ISecretRepository
{
public async Task<Secret?> GetAsync(string normalizedName, CancellationToken cancellationToken = default)
{
@ -29,7 +29,7 @@ public class EFCoreSecretRepository(Store<SecretsElsaDbContext, Secret> store) :
public async Task AddAsync(Secret secret, CancellationToken cancellationToken = default)
{
await using var dbContext = await store.CreateDbContextAsync(cancellationToken);
var normalizedName = NormalizeName(secret.Name);
var normalizedName = secretNameValidator.Normalize(secret.Name);
if (await ExistsByNormalizedNameAsync(dbContext, normalizedName, cancellationToken))
throw new InvalidOperationException($"A secret named '{secret.Name}' already exists.");
@ -105,9 +105,9 @@ public class EFCoreSecretRepository(Store<SecretsElsaDbContext, Secret> store) :
target.Versions = source.Versions.ToList();
}
private static Task<Secret?> FindByNameAsync(SecretsElsaDbContext dbContext, string name, CancellationToken cancellationToken)
private Task<Secret?> FindByNameAsync(SecretsElsaDbContext dbContext, string name, CancellationToken cancellationToken)
{
var normalizedName = NormalizeName(name);
var normalizedName = secretNameValidator.Normalize(name);
return dbContext.Secrets.FirstOrDefaultAsync(x => EF.Property<string>(x, SecretShadowPropertyNames.NormalizedName) == normalizedName, cancellationToken);
}
@ -150,13 +150,11 @@ public class EFCoreSecretRepository(Store<SecretsElsaDbContext, Secret> store) :
private async Task<bool> IsNameConflictAsync(string name, CancellationToken cancellationToken)
{
await using var dbContext = await store.CreateDbContextAsync(cancellationToken);
return await ExistsByNormalizedNameAsync(dbContext, NormalizeName(name), cancellationToken);
return await ExistsByNormalizedNameAsync(dbContext, secretNameValidator.Normalize(name), cancellationToken);
}
private static void SetNormalizedName(SecretsElsaDbContext dbContext, Secret secret)
private void SetNormalizedName(SecretsElsaDbContext dbContext, Secret secret)
{
dbContext.Entry(secret).Property(SecretShadowPropertyNames.NormalizedName).CurrentValue = NormalizeName(secret.Name);
dbContext.Entry(secret).Property(SecretShadowPropertyNames.NormalizedName).CurrentValue = secretNameValidator.Normalize(secret.Name);
}
private static string NormalizeName(string name) => name.Trim().ToLowerInvariant();
}

3
test/unit/Elsa.Secrets.UnitTests/EFCoreSecretRepositoryTests.cs
View file

@ -1,9 +1,11 @@
using Elsa.Persistence.EFCore;
using Elsa.Persistence.EFCore.Extensions;
using Elsa.Secrets.Contracts;
using Elsa.Secrets.Models;
using Elsa.Secrets.Persistence.EFCore;
using Elsa.Secrets.Persistence.EFCore.Repositories;
using Elsa.Secrets.Persistence.EFCore.Sqlite.Extensions;
using Elsa.Secrets.Services;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.DependencyInjection;
using Xunit;
@ -21,6 +23,7 @@ public class EFCoreSecretRepositoryTests : IAsyncLifetime
var connectionString = $"Data Source={_databasePath}";
services.AddSqliteEntityModelCreatingHandlers();
services.AddDbContextFactory<SecretsElsaDbContext>(builder => builder.UseElsaSqlite(typeof(SqliteSecretsPersistenceFeatureExtensions).Assembly, connectionString));
services.AddSingleton<ISecretNameValidator, DefaultSecretNameValidator>();
services.AddScoped<Store<SecretsElsaDbContext, Secret>>();
services.AddScoped<EFCoreSecretRepository>();
_serviceProvider = services.BuildServiceProvider();