From 88174fda38c716ef96946e3bde5620add9dd0ade Mon Sep 17 00:00:00 2001 From: Young Date: Thu, 10 Oct 2024 10:44:48 +0800 Subject: [PATCH] renamed class name --- src/Infrastructure/Extensions/AuthorizeSetup.cs | 2 +- src/Infrastructure/Security/ITokenBuilder.cs | 14 +++++++------- .../{PermissionOptions.cs => JwtOptions.cs} | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) rename src/Infrastructure/Security/{PermissionOptions.cs => JwtOptions.cs} (92%) diff --git a/src/Infrastructure/Extensions/AuthorizeSetup.cs b/src/Infrastructure/Extensions/AuthorizeSetup.cs index 6534a4f..61dce58 100644 --- a/src/Infrastructure/Extensions/AuthorizeSetup.cs +++ b/src/Infrastructure/Extensions/AuthorizeSetup.cs @@ -23,7 +23,7 @@ public static class AuthorizeSetup var securityKey = new SymmetricSecurityKey(buffer); var signingCredentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256); - services.AddSingleton(new PermissionOptions( + services.AddSingleton(new JwtOptions( audienceOptions.Issuer, audienceOptions.Audience, audienceOptions.Expiration, diff --git a/src/Infrastructure/Security/ITokenBuilder.cs b/src/Infrastructure/Security/ITokenBuilder.cs index 550aee9..b809158 100644 --- a/src/Infrastructure/Security/ITokenBuilder.cs +++ b/src/Infrastructure/Security/ITokenBuilder.cs @@ -18,7 +18,7 @@ public interface ITokenBuilder } public class TokenBuilder( - PermissionOptions permissionOptions, + JwtOptions jwtOptions, JwtSecurityTokenHandler jwtSecurityTokenHandler, IEncryptionService encryptionService) : ITokenBuilder @@ -34,7 +34,7 @@ public class TokenBuilder( new(JwtRegisteredClaimNames.Iat, EpochTime.GetIntDate(DateTime.Now).ToString(CultureInfo.InvariantCulture), ClaimValueTypes.Integer64), - new(JwtRegisteredClaimNames.Exp, permissionOptions.Expiration.ToString()) + new(JwtRegisteredClaimNames.Exp, jwtOptions.Expiration.ToString()) }; claims.AddRange(userContext.RoleIds.Select(rId => new Claim(ClaimTypes.Role, rId))); return claims; @@ -58,14 +58,14 @@ public class TokenBuilder( public TokenInfo GenerateJwtTokenInfo(IReadOnlyCollection claims) { var jwtToken = new JwtSecurityToken( - issuer: permissionOptions.Issuer, - audience: permissionOptions.Audience, + issuer: jwtOptions.Issuer, + audience: jwtOptions.Audience, claims: claims, notBefore: DateTime.Now, - expires: DateTime.Now.AddSeconds(permissionOptions.Expiration), - signingCredentials: permissionOptions.SigningCredentials); + expires: DateTime.Now.AddSeconds(jwtOptions.Expiration), + signingCredentials: jwtOptions.SigningCredentials); var token = jwtSecurityTokenHandler.WriteToken(jwtToken); - return new TokenInfo(encryptionService.Encrypt(token), permissionOptions.Expiration, + return new TokenInfo(encryptionService.Encrypt(token), jwtOptions.Expiration, JwtBearerDefaults.AuthenticationScheme); } } \ No newline at end of file diff --git a/src/Infrastructure/Security/PermissionOptions.cs b/src/Infrastructure/Security/JwtOptions.cs similarity index 92% rename from src/Infrastructure/Security/PermissionOptions.cs rename to src/Infrastructure/Security/JwtOptions.cs index f2ca1a9..92609a1 100644 --- a/src/Infrastructure/Security/PermissionOptions.cs +++ b/src/Infrastructure/Security/JwtOptions.cs @@ -2,7 +2,7 @@ using Microsoft.IdentityModel.Tokens; namespace Infrastructure.Security; -public class PermissionOptions( +public class JwtOptions( string issuer, string audience, long expiration,