Merge pull request #74 from NetDevPack/copilot/fix-pull-request-job-failure

Fix flaky `pull-request` job by honoring `GetLastKeys` arguments

Author: brunobritodev

src/NetDevPack.Security.Jwt.Core/Jwt/JwtService.cs

@@ -61,12 +61,12 @@ public async Task<EncryptingCredentials> GetCurrentEncryptingCredentials()
 
         public Task<ReadOnlyCollection<KeyMaterial>> GetLastKeys(int? i = null)
         {
-            return _store.GetLastKeys(_options.Value.AlgorithmsToKeep, null);
+            return _store.GetLastKeys(i ?? _options.Value.AlgorithmsToKeep, null);
         }
 
         public Task<ReadOnlyCollection<KeyMaterial>> GetLastKeys(int i, JwtKeyType jwtKeyType)
         {
-            return _store.GetLastKeys(_options.Value.AlgorithmsToKeep, jwtKeyType);
+            return _store.GetLastKeys(i, jwtKeyType);
         }
 
         private async Task<bool> CheckCompatibility(KeyMaterial currentKey, JwtKeyType jwtKeyType)

tests/NetDevPack.Security.Jwt.Tests/JwtTests/JweTests.cs

@@ -17,6 +17,7 @@
 
 namespace NetDevPack.Security.Jwt.Tests.JwtTests
 {
+    [Collection(InMemoryStoreCollection.Name)]
     public class JweTests : IClassFixture<WarmupInMemoryStore>
     {
         private readonly IJwtService _jwksService;

tests/NetDevPack.Security.Jwt.Tests/JwtTests/JwtServiceTest.cs

@@ -13,6 +13,7 @@
 
 namespace NetDevPack.Security.Jwt.Tests.JwtTests
 {
+    [Collection(InMemoryStoreCollection.Name)]
     public class JwtServiceTest : IClassFixture<WarmupInMemoryStore>
     {
         private readonly IJwtService _jwksService;
@@ -80,7 +81,8 @@ public async Task ShouldGenerateFiveKeys()
                 keysGenerated.Add(sign);
             }
 
-            var current = await _jwksService.GetLastKeys(5);
+            var current = await _jwksService.GetLastKeys(5, NetDevPack.Security.Jwt.Core.Jwa.JwtKeyType.Jws);
+            current.Should().HaveCount(5);
             foreach (var securityKey in current)
             {
                 keysGenerated.Should().Contain(s => s.KeyId == securityKey.KeyId);

tests/NetDevPack.Security.Jwt.Tests/JwtTests/JwtTests.cs

@@ -14,6 +14,7 @@
 
 namespace NetDevPack.Security.Jwt.Tests.JwtTests
 {
+    [Collection(InMemoryStoreCollection.Name)]
     public class JwsTests : IClassFixture<WarmupInMemoryStore>
     {
         private readonly IJwtService _service;

tests/NetDevPack.Security.Jwt.Tests/StoreTests/GenericStoreServiceTest.cs

@@ -533,6 +533,7 @@ public async Task Should_Generate_Different_Keys_For_JWS_And_JWE_And_Retrieve_Th
         var getLastJwe =  (await _jwtService.GetLastKeys(1, JwtKeyType.Jwe)).First();
         var getLastJws =  (await _jwtService.GetLastKeys(1, JwtKeyType.Jws)).First();
 
+        getLast2DefaultVal.Should().HaveCount(2);
         jws.KeyId.Should().NotBe(jwe.KeyId);
         getLastJws.KeyId.Should().NotBe(getLastJwe.KeyId);
         defaultVal.KeyId.Should().Be(jws.KeyId);

tests/NetDevPack.Security.Jwt.Tests/StoreTests/InMemoryStoreTests.cs

@@ -3,6 +3,7 @@
 
 namespace NetDevPack.Security.Jwt.Tests.StoreTests;
 
+[Collection(InMemoryStoreCollection.Name)]
 [Trait("Category", "InMemory Tests")]
 public class InMemoryStoreTests : GenericStoreServiceTest<WarmupInMemoryStore>
 {

tests/NetDevPack.Security.Jwt.Tests/Warmups/InMemoryStoreCollection.cs

@@ -0,0 +1,9 @@
+using Xunit;
+
+namespace NetDevPack.Security.Jwt.Tests.Warmups;
+
+[CollectionDefinition(Name)]
+public class InMemoryStoreCollection
+{
+    public const string Name = "InMemory Store";
+}