Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Generate New Key #50

Merged
merged 2 commits into from
Dec 1, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions src/NetDevPack.Security.Jwt.Core/Interfaces/IJwtService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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{}
9 changes: 9 additions & 0 deletions src/NetDevPack.Security.Jwt.Core/Jwt/JwtService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
14 changes: 14 additions & 0 deletions tests/NetDevPack.Security.Jwt.Tests/JwtTests/JwtServiceTest.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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()
{
Expand Down
Loading