From 4a4ab723057480a717d8126e30d124037a0ebc83 Mon Sep 17 00:00:00 2001 From: Jimmy Vo Date: Mon, 27 Apr 2026 11:44:33 -0400 Subject: [PATCH 1/5] [PM-32100] Implement Multi-Provider Ability Lookup --- .../ExtendedProviderAbilityCacheService.cs | 18 ++++++++++-- .../IProviderAbilityCacheService.cs | 3 +- .../FeatureRoutedCacheService.cs | 5 ++++ .../FeatureRoutedCacheServiceTests.cs | 29 +++++++++++++++++++ 4 files changed, 52 insertions(+), 3 deletions(-) diff --git a/src/Core/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheService.cs b/src/Core/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheService.cs index 036320961b56..a48e7f42905f 100644 --- a/src/Core/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheService.cs +++ b/src/Core/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheService.cs @@ -13,14 +13,28 @@ public class ExtendedProviderAbilityCacheService( { public const string CacheName = "ProviderAbilities"; - public async Task GetProviderAbilityAsync(Guid providerId) + public async Task GetProviderAbilityAsync(Guid providerId, CancellationToken cancellationToken = default) { return await cache.GetOrSetAsync( $"{providerId}", - async _ => await providerRepository.GetAbilityAsync(providerId) + async (_, _) => await providerRepository.GetAbilityAsync(providerId), + token: cancellationToken ); } + public async Task> GetProviderAbilitiesAsync(IEnumerable providerIds, CancellationToken cancellationToken = default) + { + var tasks = providerIds + .Distinct() + .Select(async providerId => (providerId, ability: await GetProviderAbilityAsync(providerId, cancellationToken))); + + var results = await Task.WhenAll(tasks); + + return results + .Where(result => result.ability != null) + .ToDictionary(result => result.providerId, result => result.ability!); + } + public async Task UpsertProviderAbilityAsync(Provider provider) { await cache.SetAsync($"{provider.Id}", new ProviderAbility(provider)); diff --git a/src/Core/AdminConsole/AbilitiesCache/IProviderAbilityCacheService.cs b/src/Core/AdminConsole/AbilitiesCache/IProviderAbilityCacheService.cs index 71e5bb572c2e..a838406bf518 100644 --- a/src/Core/AdminConsole/AbilitiesCache/IProviderAbilityCacheService.cs +++ b/src/Core/AdminConsole/AbilitiesCache/IProviderAbilityCacheService.cs @@ -5,7 +5,8 @@ namespace Bit.Core.AdminConsole.AbilitiesCache; public interface IProviderAbilityCacheService { - Task GetProviderAbilityAsync(Guid providerId); + Task GetProviderAbilityAsync(Guid providerId, CancellationToken cancellationToken = default); + Task> GetProviderAbilitiesAsync(IEnumerable providerIds, CancellationToken cancellationToken = default); Task UpsertProviderAbilityAsync(Provider provider); Task DeleteProviderAbilityAsync(Guid providerId); } diff --git a/src/Core/Services/Implementations/FeatureRoutedCacheService.cs b/src/Core/Services/Implementations/FeatureRoutedCacheService.cs index 609d3b4b1660..2e0385f5835d 100644 --- a/src/Core/Services/Implementations/FeatureRoutedCacheService.cs +++ b/src/Core/Services/Implementations/FeatureRoutedCacheService.cs @@ -37,6 +37,11 @@ public Task> GetProviderAbilitiesAsync() => public async Task> GetProviderAbilitiesAsync(IEnumerable providerIds) { + if (featureService.IsEnabled(FeatureFlagKeys.ProviderAbilityExtendedCache)) + { + return await providerAbilityCacheService.GetProviderAbilitiesAsync(providerIds); + } + var allProviderAbilities = await inMemoryApplicationCacheService.GetProviderAbilitiesAsync(); return providerIds .Distinct() diff --git a/test/Core.Test/Services/Implementations/FeatureRoutedCacheServiceTests.cs b/test/Core.Test/Services/Implementations/FeatureRoutedCacheServiceTests.cs index 5e01ed5b18e4..ad1e527fbf49 100644 --- a/test/Core.Test/Services/Implementations/FeatureRoutedCacheServiceTests.cs +++ b/test/Core.Test/Services/Implementations/FeatureRoutedCacheServiceTests.cs @@ -314,6 +314,35 @@ public async Task GetProviderAbilitiesAsync_WhenDuplicateIdsProvided_DoesNotThro Assert.Equal(ability, result[ability.Id]); } + [Theory, BitAutoData] + public async Task GetProviderAbilitiesAsync_WhenFlagOn_ReturnsFromExtendedCacheService( + SutProvider sutProvider, + ProviderAbility ability) + { + // Arrange + var providerIds = new[] { ability.Id }; + var expectedResult = new Dictionary { [ability.Id] = ability }; + sutProvider.GetDependency() + .IsEnabled(FeatureFlagKeys.ProviderAbilityExtendedCache) + .Returns(true); + sutProvider.GetDependency() + .GetProviderAbilitiesAsync(providerIds) + .Returns(expectedResult); + + // Act + var result = await sutProvider.Sut.GetProviderAbilitiesAsync(providerIds); + + // Assert + Assert.Single(result); + Assert.Equal(ability, result[ability.Id]); + await sutProvider.GetDependency() + .Received(1) + .GetProviderAbilitiesAsync(providerIds); + await sutProvider.GetDependency() + .DidNotReceiveWithAnyArgs() + .GetProviderAbilitiesAsync(); + } + [Theory, BitAutoData] public async Task GetOrganizationAbilitiesAsync_WhenFlagOff_ReturnsFromInMemoryService( SutProvider sutProvider, From 6b88bac66849286e96a02fc04f8c67db2b3aa308 Mon Sep 17 00:00:00 2001 From: Jimmy Vo Date: Wed, 29 Apr 2026 12:02:36 -0400 Subject: [PATCH 2/5] [PM-32100] Add unit tests --- ...xtendedProviderAbilityCacheServiceTests.cs | 127 ++++++++++++++++++ 1 file changed, 127 insertions(+) create mode 100644 test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs diff --git a/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs b/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs new file mode 100644 index 000000000000..86655d2a10c3 --- /dev/null +++ b/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs @@ -0,0 +1,127 @@ +using Bit.Core.AdminConsole.AbilitiesCache; +using Bit.Core.AdminConsole.Models.Data.Provider; +using Bit.Core.AdminConsole.Repositories; +using Bit.Test.Common.AutoFixture; +using Bit.Test.Common.AutoFixture.Attributes; +using NSubstitute; +using Xunit; +using ZiggyCreatures.Caching.Fusion; + +namespace Bit.Core.Test.AdminConsole.AbilitiesCache; + +[SutProviderCustomize] +public class ExtendedProviderAbilityCacheServiceTests +{ + [Theory, BitAutoData] + public async Task GetProviderAbilitiesAsync_ReturnsAbilitiesForAllIds( + SutProvider sutProvider, + ProviderAbility ability1, + ProviderAbility ability2) + { + // Arrange + SetupCacheReturns(sutProvider, ability1, ability2); + + // Act + var result = await sutProvider.Sut.GetProviderAbilitiesAsync([ability1.Id, ability2.Id]); + + // Assert + Assert.Equal(2, result.Count); + Assert.Equal(ability1, result[ability1.Id]); + Assert.Equal(ability2, result[ability2.Id]); + } + + [Theory, BitAutoData] + public async Task GetProviderAbilitiesAsync_WhenProviderNotFound_ExcludesNullAbilities( + SutProvider sutProvider, + ProviderAbility ability, + Guid missingProviderId) + { + // Arrange + SetupCacheReturns(sutProvider, ability); + sutProvider.GetDependency() + .GetOrSetAsync( + $"{missingProviderId}", + Arg.Any, CancellationToken, Task>>(), + token: Arg.Any()) + .Returns((ProviderAbility?)null); + + // Act + var result = await sutProvider.Sut.GetProviderAbilitiesAsync([ability.Id, missingProviderId]); + + // Assert + Assert.Single(result); + Assert.Equal(ability, result[ability.Id]); + } + + [Theory, BitAutoData] + public async Task GetProviderAbilitiesAsync_WhenDuplicateIdsProvided_DoesNotThrowAndReturnsSingleEntry( + SutProvider sutProvider, + ProviderAbility ability) + { + // Arrange + SetupCacheReturns(sutProvider, ability); + + // Act + var result = await sutProvider.Sut.GetProviderAbilitiesAsync([ability.Id, ability.Id, ability.Id]); + + // Assert + Assert.Single(result); + Assert.Equal(ability, result[ability.Id]); + await sutProvider.GetDependency() + .Received(1) + .GetOrSetAsync( + $"{ability.Id}", + Arg.Any, CancellationToken, Task>>(), + token: Arg.Any()); + } + + [Theory, BitAutoData] + public async Task GetProviderAbilitiesAsync_WhenEmptyList_ReturnsEmptyDictionary( + SutProvider sutProvider) + { + // Act + var result = await sutProvider.Sut.GetProviderAbilitiesAsync([]); + + // Assert + Assert.Empty(result); + await sutProvider.GetDependency() + .DidNotReceiveWithAnyArgs() + .GetAbilityAsync(default); + } + + [Theory, BitAutoData] + public async Task GetProviderAbilitiesAsync_WhenAllProvidersNotFound_ReturnsEmptyDictionary( + SutProvider sutProvider, + Guid missingId1, + Guid missingId2) + { + // Arrange + sutProvider.GetDependency() + .GetOrSetAsync( + Arg.Any(), + Arg.Any, CancellationToken, Task>>(), + token: Arg.Any()) + .Returns((ProviderAbility?)null); + + // Act + var result = await sutProvider.Sut.GetProviderAbilitiesAsync([missingId1, missingId2]); + + // Assert + Assert.Empty(result); + } + + private static void SetupCacheReturns( + SutProvider sutProvider, + params ProviderAbility[] abilities) + { + foreach (var ability in abilities) + { + sutProvider.GetDependency() + .GetOrSetAsync( + $"{ability.Id}", + Arg.Any, CancellationToken, Task>>(), + token: Arg.Any()) + .Returns(ability); + } + } +} From 487d87cddda92e6a2e49419cd4d169463fe5d696 Mon Sep 17 00:00:00 2001 From: Jimmy Vo Date: Thu, 30 Apr 2026 10:20:39 -0400 Subject: [PATCH 3/5] [PM-32100] Address code review feedback --- ...ExtendedProviderAbilityCacheServiceTests.cs | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs b/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs index 86655d2a10c3..d1c04f709d04 100644 --- a/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs +++ b/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs @@ -13,21 +13,25 @@ namespace Bit.Core.Test.AdminConsole.AbilitiesCache; public class ExtendedProviderAbilityCacheServiceTests { [Theory, BitAutoData] - public async Task GetProviderAbilitiesAsync_ReturnsAbilitiesForAllIds( + public async Task GetProviderAbilitiesAsync_ReturnsAvailableAbilitiesForAllIds( SutProvider sutProvider, - ProviderAbility ability1, - ProviderAbility ability2) + ProviderAbility existAbility1, + ProviderAbility existAbility2, + ProviderAbility nonExistAbility1, + ProviderAbility nonExistAbility2) { // Arrange - SetupCacheReturns(sutProvider, ability1, ability2); + SetupCacheReturns(sutProvider, existAbility1, existAbility2, nonExistAbility1, nonExistAbility2); // Act - var result = await sutProvider.Sut.GetProviderAbilitiesAsync([ability1.Id, ability2.Id]); + var result = await sutProvider.Sut.GetProviderAbilitiesAsync([existAbility1.Id, existAbility2.Id, nonExistAbility1.Id, nonExistAbility2.Id]); // Assert Assert.Equal(2, result.Count); - Assert.Equal(ability1, result[ability1.Id]); - Assert.Equal(ability2, result[ability2.Id]); + Assert.Equal(existAbility1, result[existAbility1.Id]); + Assert.Equal(existAbility2, result[existAbility2.Id]); + Assert.DoesNotContain(nonExistAbility1.Id, result.Keys); + Assert.DoesNotContain(nonExistAbility2.Id, result.Keys); } [Theory, BitAutoData] From 1d030474ee4abff81563403d91831a1347433a6a Mon Sep 17 00:00:00 2001 From: Jimmy Vo Date: Fri, 1 May 2026 09:58:51 -0400 Subject: [PATCH 4/5] [PM-32100] Fix test and address code review --- .../AbilitiesCache/ExtendedProviderAbilityCacheService.cs | 6 +++--- .../ExtendedProviderAbilityCacheServiceTests.cs | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Core/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheService.cs b/src/Core/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheService.cs index a48e7f42905f..39e259300474 100644 --- a/src/Core/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheService.cs +++ b/src/Core/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheService.cs @@ -26,13 +26,13 @@ public async Task> GetProviderAbilitiesAsync(I { var tasks = providerIds .Distinct() - .Select(async providerId => (providerId, ability: await GetProviderAbilityAsync(providerId, cancellationToken))); + .Select(providerId => GetProviderAbilityAsync(providerId, cancellationToken)); var results = await Task.WhenAll(tasks); return results - .Where(result => result.ability != null) - .ToDictionary(result => result.providerId, result => result.ability!); + .Where(ability => ability != null) + .ToDictionary(ability => ability!.Id, ability => ability!); } public async Task UpsertProviderAbilityAsync(Provider provider) diff --git a/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs b/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs index d1c04f709d04..0cc4c3f744ca 100644 --- a/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs +++ b/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs @@ -21,7 +21,7 @@ public async Task GetProviderAbilitiesAsync_ReturnsAvailableAbilitiesForAllIds( ProviderAbility nonExistAbility2) { // Arrange - SetupCacheReturns(sutProvider, existAbility1, existAbility2, nonExistAbility1, nonExistAbility2); + SetupCacheReturns(sutProvider, existAbility1, existAbility2); // Act var result = await sutProvider.Sut.GetProviderAbilitiesAsync([existAbility1.Id, existAbility2.Id, nonExistAbility1.Id, nonExistAbility2.Id]); From 25e9a806df5f3747beab615912005a0a9e2b5f46 Mon Sep 17 00:00:00 2001 From: Jimmy Vo Date: Fri, 1 May 2026 10:14:35 -0400 Subject: [PATCH 5/5] [PM-32100] Fix test arrangement --- ...xtendedProviderAbilityCacheServiceTests.cs | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs b/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs index 0cc4c3f744ca..164872f4b484 100644 --- a/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs +++ b/test/Core.Test/AdminConsole/AbilitiesCache/ExtendedProviderAbilityCacheServiceTests.cs @@ -13,25 +13,25 @@ namespace Bit.Core.Test.AdminConsole.AbilitiesCache; public class ExtendedProviderAbilityCacheServiceTests { [Theory, BitAutoData] - public async Task GetProviderAbilitiesAsync_ReturnsAvailableAbilitiesForAllIds( + public async Task GetProviderAbilitiesAsync_ReturnsAvailableAbilitiesForRequestedIds( SutProvider sutProvider, - ProviderAbility existAbility1, - ProviderAbility existAbility2, - ProviderAbility nonExistAbility1, - ProviderAbility nonExistAbility2) + ProviderAbility requestedAbility1, + ProviderAbility requestedAbility2, + ProviderAbility nonRequestedAbility, + ProviderAbility nonExistAbility) { // Arrange - SetupCacheReturns(sutProvider, existAbility1, existAbility2); + SetupCacheReturns(sutProvider, requestedAbility1, requestedAbility2, nonRequestedAbility); // Act - var result = await sutProvider.Sut.GetProviderAbilitiesAsync([existAbility1.Id, existAbility2.Id, nonExistAbility1.Id, nonExistAbility2.Id]); + var result = await sutProvider.Sut.GetProviderAbilitiesAsync([requestedAbility1.Id, requestedAbility2.Id, nonExistAbility.Id]); // Assert Assert.Equal(2, result.Count); - Assert.Equal(existAbility1, result[existAbility1.Id]); - Assert.Equal(existAbility2, result[existAbility2.Id]); - Assert.DoesNotContain(nonExistAbility1.Id, result.Keys); - Assert.DoesNotContain(nonExistAbility2.Id, result.Keys); + Assert.Equal(requestedAbility1, result[requestedAbility1.Id]); + Assert.Equal(requestedAbility2, result[requestedAbility2.Id]); + Assert.DoesNotContain(nonRequestedAbility.Id, result.Keys); + Assert.DoesNotContain(nonExistAbility.Id, result.Keys); } [Theory, BitAutoData]