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

Refine test to ensure archived connections do not participate as active shadows; update shadow relationship management to exclude archived entries.

Browse source
This commit is contained in:
Sipke Schoorstra 2026-07-31 23:07:08 +02:00
parent 14f373528d
commit 9f09aca3f6
No known key found for this signature in database
GPG key ID: 5C10502B28A4268F
2 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -51,14 +51,15 @@ public sealed class DefaultIdentityProviderConnectionRegistry(
var shadowedReferences = hasInheritedScopeCollision
? []
: candidatesForKey
.Where(candidate => !ReferenceEquals(candidate, preferred))
.Where(candidate => !ReferenceEquals(candidate, preferred) && !candidate.Connection.ArchivedAt.HasValue)
.Select(ToReference)
.ToArray();
for (var index = 0; index < candidatesForKey.Length; index++)
{
var candidate = candidatesForKey[index];
var isShadowed = !hasInheritedScopeCollision && !ReferenceEquals(candidate, preferred);
var isArchived = candidate.Connection.ArchivedAt.HasValue;
var isShadowed = !isArchived && !hasInheritedScopeCollision && !ReferenceEquals(candidate, preferred);
connections.Add(new EffectiveIdentityProviderConnection(
candidate.Connection,
candidate.Source.Ownership,
@ -68,7 +69,7 @@ public sealed class DefaultIdentityProviderConnectionRegistry(
candidate.Source.Name)
{
ShadowedBy = isShadowed ? preferredReference : null,
Shadows = isShadowed ? [] : shadowedReferences
Shadows = isShadowed || isArchived ? [] : shadowedReferences
});
}
}

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

@ -47,7 +47,7 @@ public class DefaultIdentityProviderConnectionRegistryTests
}
[Fact]
public async Task ArchivedDatabaseOverrideDoesNotAppearInTheEffectiveConnectionShadows()
public async Task ArchivedDatabaseOverrideDoesNotParticipateInActiveShadowRelationships()
{
var configuration = ExternalAuthenticationTestData.CreateConnection("configuration-oidc", ConnectionScope.HostTenantId, "oidc");
var archivedOverride = ExternalAuthenticationTestData.CreateConnection("database-oidc", ConnectionScope.HostTenantId, "OIDC");
@ -59,10 +59,14 @@ public class DefaultIdentityProviderConnectionRegistryTests
var result = await registry.GetAsync("tenant-a");
var effective = Assert.Single(result.Connections, x => !x.IsShadowed);
var effective = Assert.Single(result.Connections, x => !x.Connection.ArchivedAt.HasValue && !x.IsShadowed);
Assert.Equal("configuration-oidc", effective.Connection.Id);
Assert.Empty(effective.Shadows);
Assert.Contains(result.Connections, x => x.Connection.Id == "database-oidc" && x.Connection.ArchivedAt.HasValue);
var archived = Assert.Single(result.Connections, x => x.Connection.Id == "database-oidc");
Assert.True(archived.Connection.ArchivedAt.HasValue);
Assert.False(archived.IsShadowed);
Assert.Null(archived.ShadowedBy);
Assert.Empty(archived.Shadows);
}
[Fact]