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

Refine test for archived connections in shadow relationships; introduce IsAvailableForAuthentication helper for improved connection filtering logic.

Browse source
This commit is contained in:
Sipke Schoorstra 2026-08-02 00:49:26 +02:00
parent 572cd325b5
commit a60b5a36b2
No known key found for this signature in database
GPG key ID: 5C10502B28A4268F
2 changed files with 11 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/modules/Elsa.ExternalAuthentication/Services/DefaultIdentityProviderConnectionRegistry.cs
View file

@ -90,8 +90,7 @@ public sealed class DefaultIdentityProviderConnectionRegistry(
var registry = await GetAsync(targetTenantId, cancellationToken);
var normalizedKey = ConnectionRevisionCalculator.NormalizeKey(key);
return registry.Connections.FirstOrDefault(x =>
!x.IsShadowed &&
x.Validity != ConnectionValidity.Invalid &&
IsAvailableForAuthentication(x) &&
string.Equals(ConnectionRevisionCalculator.NormalizeKey(x.Connection.Key), normalizedKey, StringComparison.Ordinal));
}
@ -104,7 +103,7 @@ public sealed class DefaultIdentityProviderConnectionRegistry(
private static IReadOnlyCollection<LoginMethod> CreateLoginMethods(IReadOnlyCollection<EffectiveIdentityProviderConnection> connections)
{
var available = connections
.Where(x => !x.IsShadowed && x.Validity != ConnectionValidity.Invalid && x.Connection.IsEnabled && !x.Connection.ArchivedAt.HasValue)
.Where(IsAvailableForAuthentication)
.ToArray();
var configuredPreferred = available
.Where(x => x.Ownership == ConnectionSourceOwnership.Configuration && x.Connection.IsPreferred)
@ -144,6 +143,11 @@ public sealed class DefaultIdentityProviderConnectionRegistry(
private static IReadOnlyList<ConnectionScope> GetApplicableScopes() => [ConnectionScope.Host];
private static bool IsInScope(IdentityProviderConnection connection, ConnectionScope scope) => string.Equals(connection.TenantId, scope.TenantId, StringComparison.Ordinal);
private static bool IsAvailableForAuthentication(EffectiveIdentityProviderConnection connection) =>
!connection.IsShadowed &&
connection.Validity != ConnectionValidity.Invalid &&
connection.Connection.IsEnabled &&
!connection.Connection.ArchivedAt.HasValue;
private static int GetOwnershipPriority(ConnectionSourceOwnership ownership) => ownership == ConnectionSourceOwnership.Configuration ? 0 : 1;
private static IdentityProviderConnectionReference ToReference(Candidate candidate) =>
new(candidate.Connection.Id, candidate.Connection.DisplayName, candidate.Source.Ownership);

6
test/unit/Elsa.ExternalAuthentication.UnitTests/Foundational/DefaultIdentityProviderConnectionRegistryTests.cs
View file

@ -49,8 +49,8 @@ public class DefaultIdentityProviderConnectionRegistryTests
[Fact]
public async Task ArchivedDatabaseOverrideDoesNotParticipateInActiveShadowRelationships()
{
var configuration = ExternalAuthenticationTestData.CreateConnection("configuration-oidc", ConnectionScope.HostTenantId, "oidc");
var archivedOverride = ExternalAuthenticationTestData.CreateConnection("database-oidc", ConnectionScope.HostTenantId, "OIDC");
var configuration = ExternalAuthenticationTestData.CreateConnection("configuration-oidc", ConnectionScope.HostTenantId, "oidc", displayOrder: 10);
var archivedOverride = ExternalAuthenticationTestData.CreateConnection("database-oidc", ConnectionScope.HostTenantId, "OIDC", displayOrder: 0);
archivedOverride.OverridesConfigurationConnection = true;
archivedOverride.ArchivedAt = DateTimeOffset.UtcNow;
var registry = CreateRegistry(
@ -58,9 +58,11 @@ public class DefaultIdentityProviderConnectionRegistryTests
new TestConnectionSource("configuration", ConnectionSourceOwnership.Configuration, [(ConnectionScope.Host, [configuration])]));
var result = await registry.GetAsync("tenant-a");
var resolved = await registry.FindByKeyAsync("tenant-a", "oidc");
var effective = Assert.Single(result.Connections, x => !x.Connection.ArchivedAt.HasValue && !x.IsShadowed);
Assert.Equal("configuration-oidc", effective.Connection.Id);
Assert.Equal("configuration-oidc", Assert.IsType<EffectiveIdentityProviderConnection>(resolved).Connection.Id);
Assert.Empty(effective.Shadows);
var archived = Assert.Single(result.Connections, x => x.Connection.Id == "database-oidc");
Assert.True(archived.Connection.ArchivedAt.HasValue);