renamed class name

master
Young 7 months ago
parent 44de02d436
commit 88174fda38

@ -23,7 +23,7 @@ public static class AuthorizeSetup
var securityKey = new SymmetricSecurityKey(buffer); var securityKey = new SymmetricSecurityKey(buffer);
var signingCredentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256); var signingCredentials = new SigningCredentials(securityKey, SecurityAlgorithms.HmacSha256);
services.AddSingleton(new PermissionOptions( services.AddSingleton(new JwtOptions(
audienceOptions.Issuer, audienceOptions.Issuer,
audienceOptions.Audience, audienceOptions.Audience,
audienceOptions.Expiration, audienceOptions.Expiration,

@ -18,7 +18,7 @@ public interface ITokenBuilder
} }
public class TokenBuilder( public class TokenBuilder(
PermissionOptions permissionOptions, JwtOptions jwtOptions,
JwtSecurityTokenHandler jwtSecurityTokenHandler, JwtSecurityTokenHandler jwtSecurityTokenHandler,
IEncryptionService encryptionService) IEncryptionService encryptionService)
: ITokenBuilder : ITokenBuilder
@ -34,7 +34,7 @@ public class TokenBuilder(
new(JwtRegisteredClaimNames.Iat, new(JwtRegisteredClaimNames.Iat,
EpochTime.GetIntDate(DateTime.Now).ToString(CultureInfo.InvariantCulture), EpochTime.GetIntDate(DateTime.Now).ToString(CultureInfo.InvariantCulture),
ClaimValueTypes.Integer64), 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))); claims.AddRange(userContext.RoleIds.Select(rId => new Claim(ClaimTypes.Role, rId)));
return claims; return claims;
@ -58,14 +58,14 @@ public class TokenBuilder(
public TokenInfo GenerateJwtTokenInfo(IReadOnlyCollection<Claim> claims) public TokenInfo GenerateJwtTokenInfo(IReadOnlyCollection<Claim> claims)
{ {
var jwtToken = new JwtSecurityToken( var jwtToken = new JwtSecurityToken(
issuer: permissionOptions.Issuer, issuer: jwtOptions.Issuer,
audience: permissionOptions.Audience, audience: jwtOptions.Audience,
claims: claims, claims: claims,
notBefore: DateTime.Now, notBefore: DateTime.Now,
expires: DateTime.Now.AddSeconds(permissionOptions.Expiration), expires: DateTime.Now.AddSeconds(jwtOptions.Expiration),
signingCredentials: permissionOptions.SigningCredentials); signingCredentials: jwtOptions.SigningCredentials);
var token = jwtSecurityTokenHandler.WriteToken(jwtToken); var token = jwtSecurityTokenHandler.WriteToken(jwtToken);
return new TokenInfo(encryptionService.Encrypt(token), permissionOptions.Expiration, return new TokenInfo(encryptionService.Encrypt(token), jwtOptions.Expiration,
JwtBearerDefaults.AuthenticationScheme); JwtBearerDefaults.AuthenticationScheme);
} }
} }

@ -2,7 +2,7 @@ using Microsoft.IdentityModel.Tokens;
namespace Infrastructure.Security; namespace Infrastructure.Security;
public class PermissionOptions( public class JwtOptions(
string issuer, string issuer,
string audience, string audience,
long expiration, long expiration,
Loading…
Cancel
Save