Merge pull request #20 from WeihanLi/dev

1.2.0 preview 7

Author: WeihanLi

src/WeihanLi.Web.Extensions/Authorization/Jwt/JwtTokenOptions.cs

@@ -73,7 +73,7 @@ public class JwtTokenOptions
 
     internal SigningCredentials SigningCredentials { get; set; }
 
-    internal TokenValidationParameters GetTokenValidationParameters(Action<TokenValidationParameters> parametersAction = null)
+    public TokenValidationParameters GetTokenValidationParameters(Action<TokenValidationParameters> parametersAction = null)
     {
         var parameters = new TokenValidationParameters
         {

src/WeihanLi.Web.Extensions/Authorization/Jwt/JwtTokenService.cs

@@ -14,12 +14,21 @@ public class JwtTokenService : ITokenService
 {
     private readonly JwtSecurityTokenHandler _tokenHandler = new();
     private readonly JwtTokenOptions _tokenOptions;
-    private readonly Lazy<TokenValidationParameters> _lazyTokenValidationParameters;
+
+    private readonly Lazy<TokenValidationParameters> _lazyTokenValidationParameters,
+        _lazyRefreshTokenValidationParameters;
 
     public JwtTokenService(IOptions<JwtTokenOptions> tokenOptions)
     {
         _tokenOptions = tokenOptions.Value;
-        _lazyTokenValidationParameters = new(() => _tokenOptions.GetTokenValidationParameters());
+        _lazyTokenValidationParameters = new(() =>
+            _tokenOptions.GetTokenValidationParameters());
+        _lazyRefreshTokenValidationParameters = new(() =>
+            _tokenOptions.GetTokenValidationParameters(parameters =>
+            {
+                parameters.ValidAudience = GetRefreshTokenAudience();
+            })
+        );
     }
 
     public Task<TokenEntity> GenerateToken(params Claim[] claims)
@@ -32,13 +41,7 @@ public Task<TokenValidationResult> ValidateToken(string token)
 
     public virtual async Task<TokenEntity> RefreshToken(string refreshToken)
     {
-        // TODO: cache validation parameters
-        var validationParameters = _tokenOptions.GetTokenValidationParameters(parameters =>
-        {
-            parameters.ValidAudience = GetRefreshTokenAudience();
-        });
-
-        var refreshTokenValidateResult = await _tokenHandler.ValidateTokenAsync(refreshToken, validationParameters);
+        var refreshTokenValidateResult = await _tokenHandler.ValidateTokenAsync(refreshToken, _lazyRefreshTokenValidationParameters.Value);
         if (!refreshTokenValidateResult.IsValid)
         {
             throw new InvalidOperationException("Invalid RefreshToken", refreshTokenValidateResult.Exception);
@@ -54,7 +57,7 @@ protected virtual Task<string> GetRefreshToken(Claim[] claims)
             audience: GetRefreshTokenAudience(),
             claims: claims,
             notBefore: now.UtcDateTime,
-            expires: now.Add(_tokenOptions.ValidFor).UtcDateTime,
+            expires: now.Add(_tokenOptions.RefreshTokenValidFor).UtcDateTime,
             signingCredentials: _tokenOptions.SigningCredentials);
         var encodedJwt = _tokenHandler.WriteToken(jwt);
         return encodedJwt.WrapTask();