Skip to content
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
58 changes: 45 additions & 13 deletions src/MiniJwt.Core/Services/MiniJwtService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -8,10 +8,11 @@
using System.Globalization;
using Microsoft.Extensions.Logging;
using MiniJwt.Core.Models;
using System.Collections.Concurrent;

namespace MiniJwt.Core.Services;

public class MiniJwtService : IMiniJwtService, IDisposable

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 9.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 10.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 6.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 7.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 9.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 6.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 8.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 10.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 8.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 7.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 8.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 9.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 6.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 10.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'

Check warning on line 15 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 7.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService'
{
private readonly ILogger _logger;
private readonly JwtSecurityTokenHandler _tokenHandler;
Expand All @@ -25,7 +26,22 @@

private const int MinimumKeyLengthBytes = 32; // 256 bits for HS256

// Reflection cache: stores property metadata for each type to avoid repeated reflection operations
private static readonly ConcurrentDictionary<Type, PropertyClaimInfo[]> _reflectionCache = new();

private sealed class PropertyClaimInfo
{
public PropertyInfo Property { get; }
public string ClaimType { get; }

public PropertyClaimInfo(PropertyInfo property, string claimType)
{
Property = property;
ClaimType = claimType;
}
}

public MiniJwtService(IOptionsMonitor<MiniJwtOptions> optionsMonitor, ILogger<MiniJwtService> logger, JwtSecurityTokenHandler tokenHandler)

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 9.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 10.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 6.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 7.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 9.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 6.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 8.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 10.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 8.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 7.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 8.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 9.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 6.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 10.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'

Check warning on line 44 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 7.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.MiniJwtService(IOptionsMonitor<MiniJwtOptions>, ILogger<MiniJwtService>, JwtSecurityTokenHandler)'
{
_logger = logger ?? throw new ArgumentNullException(nameof(logger));
_tokenHandler = tokenHandler ?? throw new ArgumentNullException(nameof(tokenHandler));
Expand Down Expand Up @@ -78,6 +94,26 @@
};
}

private static PropertyClaimInfo[] GetOrComputePropertyClaimInfos(Type type)
{
return _reflectionCache.GetOrAdd(type, t =>
{
var props = t.GetProperties(BindingFlags.Instance | BindingFlags.Public);
var claimInfos = new List<PropertyClaimInfo>(props.Length);

foreach (var prop in props)
{
var attr = prop.GetCustomAttribute<MiniJwtClaimAttribute>();
if (attr is not null)
{
claimInfos.Add(new PropertyClaimInfo(prop, attr.ClaimType));
}
}

return claimInfos.ToArray();
});
}

/// <inheritdoc/>
public string? GenerateToken<T>(T payload)
{
Expand All @@ -95,16 +131,14 @@
return null;
}

var props = typeof(T).GetProperties(BindingFlags.Instance | BindingFlags.Public);
var claims = new List<Claim>(props.Length + 1);
var propertyClaimInfos = GetOrComputePropertyClaimInfos(typeof(T));
var claims = new List<Claim>(propertyClaimInfos.Length + 1);

foreach (var prop in props)
foreach (var info in propertyClaimInfos)
{
var attr = prop.GetCustomAttribute<MiniJwtClaimAttribute>();
if (attr is null) continue;
var raw = prop.GetValue(payload);
var raw = info.Property.GetValue(payload);
if (raw is null) continue;
claims.Add(new Claim(attr.ClaimType, raw.ToString() ?? string.Empty));
claims.Add(new Claim(info.ClaimType, raw.ToString() ?? string.Empty));
}

claims.Add(new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()));
Expand Down Expand Up @@ -184,15 +218,13 @@
if (principal == null) return default;

var result = new T();
var props = typeof(T).GetProperties(BindingFlags.Instance | BindingFlags.Public);
var propertyClaimInfos = GetOrComputePropertyClaimInfos(typeof(T));

foreach (var prop in props)
foreach (var info in propertyClaimInfos)
{
var attr = prop.GetCustomAttribute<MiniJwtClaimAttribute>();
if (attr == null) continue;
var claim = principal.Claims.FirstOrDefault(c => c.Type == attr.ClaimType);
var claim = principal.Claims.FirstOrDefault(c => c.Type == info.ClaimType);
if (claim == null) continue;
TrySetProperty(result, prop, claim.Value);
TrySetProperty(result, info.Property, claim.Value);
}

return result;
Expand Down Expand Up @@ -234,7 +266,7 @@
}
}

public void Dispose()

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 9.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 10.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 6.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 7.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 9.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 6.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 8.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (ubuntu-latest, 10.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 8.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (macos-latest, 7.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 8.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 9.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 6.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 10.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'

Check warning on line 269 in src/MiniJwt.Core/Services/MiniJwtService.cs

View workflow job for this annotation

GitHub Actions / build-and-test (windows-latest, 7.0.x)

Missing XML comment for publicly visible type or member 'MiniJwtService.Dispose()'
{
_optionsChangeRegistration?.Dispose();
}
Expand Down
77 changes: 77 additions & 0 deletions src/MiniJwt.Tests/MiniJwtTests.ReflectionCache.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,77 @@
using System;
using System.Linq;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using MiniJwt.Core.Attributes;
using MiniJwt.Core.Models;
using MiniJwt.Core.Services;
using Xunit;

namespace MiniJwt.Tests;

public partial class MiniJwtTests
{
private class CacheTestPayload
{
[MiniJwtClaim("test_id")]
public int Id { get; set; }

[MiniJwtClaim("test_name")]
public string? Name { get; set; }
}

[Fact]
public void ReflectionCache_ShouldReuseMetadata_AcrossMultipleGenerateTokenCalls()
{
// Arrange
var svc = CreateService();
var payload1 = new CacheTestPayload { Id = 1, Name = "First" };
var payload2 = new CacheTestPayload { Id = 2, Name = "Second" };

// Act - Generate multiple tokens with the same type
var token1 = svc.GenerateToken(payload1);
var token2 = svc.GenerateToken(payload2);

// Assert - Both tokens should be generated successfully
Assert.NotNull(token1);
Assert.NotNull(token2);

// Validate that both tokens deserialize correctly (proving cache is working)
var deserialized1 = svc.ValidateAndDeserialize<CacheTestPayload>(token1);
var deserialized2 = svc.ValidateAndDeserialize<CacheTestPayload>(token2);

Assert.NotNull(deserialized1);
Assert.NotNull(deserialized2);
Assert.Equal(payload1.Id, deserialized1.Id);
Assert.Equal(payload1.Name, deserialized1.Name);
Assert.Equal(payload2.Id, deserialized2.Id);
Assert.Equal(payload2.Name, deserialized2.Name);
}

[Fact]
public void ReflectionCache_ShouldWorkWithDifferentTypes()
{
// Arrange
var svc = CreateService();
var testUser = new TestUser { Id = 1, Email = "test@test.com", Name = "User" };
var cachePayload = new CacheTestPayload { Id = 2, Name = "Payload" };

// Act - Generate tokens for different types
var userToken = svc.GenerateToken(testUser);
var payloadToken = svc.GenerateToken(cachePayload);

// Assert - Both should work correctly
Assert.NotNull(userToken);
Assert.NotNull(payloadToken);

var deserializedUser = svc.ValidateAndDeserialize<TestUser>(userToken);
var deserializedPayload = svc.ValidateAndDeserialize<CacheTestPayload>(payloadToken);

Assert.NotNull(deserializedUser);
Assert.NotNull(deserializedPayload);
Assert.Equal(testUser.Id, deserializedUser.Id);
Assert.Equal(testUser.Email, deserializedUser.Email);
Assert.Equal(cachePayload.Id, deserializedPayload.Id);
Assert.Equal(cachePayload.Name, deserializedPayload.Name);
}
}
Loading