chore: merge

feat: Generate New Key
NetDevPack · Dec 1, 2023 · 8dc8e12 · 8dc8e12
2 parents 0830430 + e809cd9
commit 8dc8e12
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 0 deletions.
diff --git a/src/NetDevPack.Security.Jwt.Core/Interfaces/IJwtService.cs b/src/NetDevPack.Security.Jwt.Core/Interfaces/IJwtService.cs
@@ -17,6 +17,7 @@ public interface IJwtService
     Task<EncryptingCredentials> GetCurrentEncryptingCredentials();
     Task<ReadOnlyCollection<KeyMaterial>> GetLastKeys(int? i = null);
     Task RevokeKey(string keyId, string reason = null);
+    Task<SecurityKey> GenerateNewKey();
 }
 [Obsolete("Deprecate, use IJwtServiceInstead")]
 public interface IJsonWebKeySetService : IJwtService{}
diff --git a/src/NetDevPack.Security.Jwt.Core/Jwt/JwtService.cs b/src/NetDevPack.Security.Jwt.Core/Jwt/JwtService.cs
@@ -79,6 +79,15 @@ public async Task RevokeKey(string keyId, string reason = null)
 
             await _store.Revoke(key, reason);
         }
+
+        public async Task<SecurityKey> GenerateNewKey()
+        {
+            var oldCurrent = await _store.GetCurrent();
+            await _store.Revoke(oldCurrent);
+            return await GenerateKey();
+
+        }
+
         private bool NeedsUpdate(KeyMaterial current)
         {
             return current == null || current.IsExpired(_options.Value.DaysUntilExpire) || current.IsRevoked;

diff --git a/tests/NetDevPack.Security.Jwt.Tests/JwtTests/JwtServiceTest.cs b/tests/NetDevPack.Security.Jwt.Tests/JwtTests/JwtServiceTest.cs
@@ -23,6 +23,20 @@ public JwtServiceTest(WarmupInMemoryStore warmup)
         }
 
 
+
+        [Fact]
+        public async Task Should_Create_New_Key()
+        {
+            var currentKey = await _jwksService.GetCurrentSigningCredentials();
+
+            var newKey = await _jwksService.GenerateNewKey();
+
+            newKey.KeyId.Should().NotBe(currentKey.Kid);
+            var newCurrentKey = await _jwksService.GetCurrentSigningCredentials();
+
+            newKey.KeyId.Should().Be(newCurrentKey.Kid);
+        }
+
         [Fact]
         public async Task ShouldGenerateDefaultSigning()
         {