Add Route for Refreshing Token
Co-authored-by: Reimar <mail@reim.ar>
This commit is contained in:
parent
b6f8d96afe
commit
4bae192d18
@ -8,6 +8,7 @@ using System.Configuration;
|
||||
using System.IdentityModel.Tokens.Jwt;
|
||||
using System.Security.Claims;
|
||||
using System.Text;
|
||||
using Helpers;
|
||||
|
||||
namespace API.Application.Users.Commands
|
||||
{
|
||||
@ -15,11 +16,13 @@ namespace API.Application.Users.Commands
|
||||
{
|
||||
private readonly IUserRepository _repository;
|
||||
private readonly IConfiguration _configuration;
|
||||
private readonly TokenHelper _tokenHelper;
|
||||
|
||||
public LoginUser(IUserRepository repository, IConfiguration configuration)
|
||||
public LoginUser(IUserRepository repository, IConfiguration configuration, TokenHelper tokenHelper)
|
||||
{
|
||||
_repository = repository;
|
||||
_configuration = configuration;
|
||||
_tokenHelper = tokenHelper;
|
||||
}
|
||||
|
||||
public async Task<IActionResult> Handle(LoginDTO loginDTO)
|
||||
@ -29,33 +32,10 @@ namespace API.Application.Users.Commands
|
||||
{
|
||||
return new UnauthorizedObjectResult(new { message = "Invalid email or password." });
|
||||
}
|
||||
var jwtToken = GenerateJwtToken(user);
|
||||
var jwtToken = _tokenHelper.GenerateJwtToken(user);
|
||||
|
||||
return new OkObjectResult(new { token = jwtToken, id = user.Id});
|
||||
|
||||
}
|
||||
|
||||
private string GenerateJwtToken(User user)
|
||||
{
|
||||
var claims = new[]
|
||||
{
|
||||
new Claim(JwtRegisteredClaimNames.Sub, user.Id),
|
||||
new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
|
||||
new Claim(ClaimTypes.Name, user.Username)
|
||||
};
|
||||
|
||||
var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes
|
||||
(_configuration["JwtSettings:Key"]));
|
||||
var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
|
||||
|
||||
var token = new JwtSecurityToken(
|
||||
_configuration["JwtSettings:Issuer"],
|
||||
_configuration["JwtSettings:Audience"],
|
||||
claims,
|
||||
expires: DateTime.Now.AddMinutes(30),
|
||||
signingCredentials: creds);
|
||||
|
||||
return new JwtSecurityTokenHandler().WriteToken(token);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -9,6 +9,9 @@ using System.IdentityModel.Tokens.Jwt;
|
||||
using System.Security.Claims;
|
||||
using System.Text;
|
||||
using System.Text.RegularExpressions;
|
||||
using Helpers;
|
||||
using Microsoft.AspNetCore.Identity;
|
||||
using API.Persistence.Repositories;
|
||||
|
||||
namespace API.Controllers
|
||||
{
|
||||
@ -22,6 +25,8 @@ namespace API.Controllers
|
||||
private readonly UpdateUser _updateUser;
|
||||
private readonly DeleteUser _deleteUser;
|
||||
private readonly LoginUser _loginUser;
|
||||
private readonly TokenHelper _tokenHelper;
|
||||
private readonly IUserRepository _repository;
|
||||
|
||||
public UsersController(
|
||||
QueryAllUsers queryAllUsers,
|
||||
@ -29,7 +34,9 @@ namespace API.Controllers
|
||||
CreateUser createUser,
|
||||
UpdateUser updateUser,
|
||||
DeleteUser deleteUser,
|
||||
LoginUser loginUser)
|
||||
LoginUser loginUser,
|
||||
TokenHelper tokenHelper,
|
||||
IUserRepository repository)
|
||||
{
|
||||
_queryAllUsers = queryAllUsers;
|
||||
_queryUserById = queryUserById;
|
||||
@ -37,6 +44,8 @@ namespace API.Controllers
|
||||
_updateUser = updateUser;
|
||||
_deleteUser = deleteUser;
|
||||
_loginUser = loginUser;
|
||||
_tokenHelper = tokenHelper;
|
||||
_repository = repository;
|
||||
}
|
||||
|
||||
[HttpPost("login")]
|
||||
@ -79,5 +88,15 @@ namespace API.Controllers
|
||||
{
|
||||
return await _deleteUser.Handle(id);
|
||||
}
|
||||
|
||||
[Authorize]
|
||||
[HttpPost("/RefreshToken")]
|
||||
public async Task<IActionResult> RefreshToken()
|
||||
{
|
||||
var userId = User.FindFirstValue(ClaimTypes.NameIdentifier);
|
||||
var user = await _repository.QueryUserByIdAsync(userId);
|
||||
return new OkObjectResult(_tokenHelper.GenerateJwtToken(user));
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
44
API/Helpers/TokenHelper.cs
Normal file
44
API/Helpers/TokenHelper.cs
Normal file
@ -0,0 +1,44 @@
|
||||
using API.Models;
|
||||
using API.Persistence.Repositories;
|
||||
using Microsoft.AspNetCore.Mvc;
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
using Microsoft.VisualStudio.Web.CodeGenerators.Mvc.Templates.BlazorIdentity.Pages;
|
||||
using System.Configuration;
|
||||
using System.IdentityModel.Tokens.Jwt;
|
||||
using System.Security.Claims;
|
||||
using System.Text;
|
||||
using Helpers;
|
||||
|
||||
namespace Helpers;
|
||||
|
||||
public class TokenHelper
|
||||
{
|
||||
private readonly IConfiguration _configuration;
|
||||
|
||||
public TokenHelper(IConfiguration configuration)
|
||||
{
|
||||
_configuration = configuration;
|
||||
}
|
||||
|
||||
public string GenerateJwtToken(User user)
|
||||
{
|
||||
var claims = new[]
|
||||
{
|
||||
new Claim(JwtRegisteredClaimNames.Sub, user.Id),
|
||||
new Claim(JwtRegisteredClaimNames.Jti, Guid.NewGuid().ToString()),
|
||||
new Claim(ClaimTypes.Name, user.Username)
|
||||
};
|
||||
|
||||
var key = new SymmetricSecurityKey(Encoding.UTF8.GetBytes(_configuration["JwtSettings:Key"]));
|
||||
var creds = new SigningCredentials(key, SecurityAlgorithms.HmacSha256);
|
||||
var token = new JwtSecurityToken(
|
||||
_configuration["JwtSettings:Issuer"],
|
||||
_configuration["JwtSettings:Audience"],
|
||||
claims,
|
||||
expires: DateTime.Now.AddMinutes(30),
|
||||
signingCredentials: creds);
|
||||
|
||||
return new JwtSecurityTokenHandler().WriteToken(token);
|
||||
}
|
||||
}
|
@ -6,6 +6,7 @@ using Microsoft.EntityFrameworkCore;
|
||||
using Microsoft.IdentityModel.Tokens;
|
||||
using Microsoft.OpenApi.Models;
|
||||
using System.Text;
|
||||
using Helpers;
|
||||
|
||||
namespace API
|
||||
{
|
||||
@ -32,6 +33,8 @@ namespace API
|
||||
builder.Services.AddEndpointsApiExplorer();
|
||||
builder.Services.AddSwaggerGen();
|
||||
|
||||
builder.Services.AddSingleton<TokenHelper>();
|
||||
|
||||
builder.Services.AddScoped<QueryAllUsers>();
|
||||
builder.Services.AddScoped<QueryUserById>();
|
||||
builder.Services.AddScoped<CreateUser>();
|
||||
|
Loading…
Reference in New Issue
Block a user