on.nemtina/DD.WellWorkover.Cloud
1
0
Fork 0
forked from ddrilling/AsbCloudServer
Code Pull Requests Activity

AuthController.RefreshAsync() returns full UserTokenDto

Browse Source
This commit is contained in:
ngfrolov 2022-10-24 10:36:53 +05:00
parent 25cd263598
commit 33dd020b7e
3 changed files with 60 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
AsbCloudApp/Services/IAuthService.cs
View File

@ -41,7 +41,8 @@ namespace AsbCloudApp.Services
/// </summary>
/// <param name="user"></param>
/// <returns></returns>
string Refresh(ClaimsPrincipal user);
Task<UserTokenDto?> RefreshAsync(ClaimsPrincipal identity,
CancellationToken token);
/// <summary>
/// Регистрация нового пользователя

72
AsbCloudInfrastructure/Services/AuthService.cs
View File

@ -14,8 +14,10 @@ using System.Text;
using System.Threading;
using System.Threading.Tasks;
#nullable enable
namespace AsbCloudInfrastructure.Services
{
/// <inheritdoc/>
public class AuthService : IAuthService
{
private readonly IAsbCloudDbContext db;
@ -42,29 +44,37 @@ namespace AsbCloudInfrastructure.Services
rnd = new Random((int)(DateTime.Now.Ticks % 2147480161));
}
public async Task<UserTokenDto> LoginAsync(string login, string password,
/// <inheritdoc/>
public async Task<UserTokenDto?> LoginAsync(string login, string password,
CancellationToken token)
{
var (identity, user) = await GetClaimsUserAsync(login, password, token)
.ConfigureAwait(false);
if (identity == default || user.IdState == 0)
var user = await GetUserByLoginAsync(login, token);
if (user is null)
return null;
var userDto = await userService.GetOrDefaultAsync(user.Id, token)
.ConfigureAwait(false);
if (!CheckPassword(user.PasswordHash, password))
return null;
var userTokenDto = userDto.Adapt<UserTokenDto>();
userTokenDto.Permissions = userService.GetNestedPermissions(userDto.Id);
userTokenDto.Token = MakeToken(identity.Claims);
return userTokenDto;
return await MakeUserTokenDto(user, token);
}
public string Refresh(ClaimsPrincipal user)
/// <inheritdoc/>
public async Task<UserTokenDto?> RefreshAsync(ClaimsPrincipal identity,
CancellationToken token)
{
return MakeToken(user.Claims);
var login = identity.FindFirst(ClaimsIdentity.DefaultNameClaimType)?.Value;
if (string.IsNullOrEmpty(login))
return null;
var user = await GetUserByLoginAsync(login, token);
if (user is null)
return null;
var dto = await MakeUserTokenDto(user, token);
return dto;
}
/// <inheritdoc/>
public int Register(UserRegistrationDto userDto)
{
if (userDto.Login is null || userDto.Login.Length is < 3 or > 50)
@ -123,6 +133,7 @@ namespace AsbCloudInfrastructure.Services
return 0;
}
/// <inheritdoc/>
public int ChangePassword(string userLogin, string newPassword)
{
var user = db.Users.AsNoTracking().FirstOrDefault(u => u.Login == userLogin);
@ -135,6 +146,7 @@ namespace AsbCloudInfrastructure.Services
return 0;
}
/// <inheritdoc/>
public int ChangePassword(int idUser, string newPassword)
{
var user = db.Users.FirstOrDefault(u => u.Id == idUser);
@ -147,6 +159,22 @@ namespace AsbCloudInfrastructure.Services
return 0;
}
private async Task<UserTokenDto?> MakeUserTokenDto(User user, CancellationToken token)
{
var identity = MakeClaims(user);
if (identity is null || user.IdState == 0)
return null;
var userDto = await userService.GetOrDefaultAsync(user.Id, token);
if (userDto is null)
return null;
var dto = userDto.Adapt<UserTokenDto>();
dto.Permissions = userService.GetNestedPermissions(userDto.Id);
dto.Token = MakeToken(identity.Claims);
return dto;
}
private static string MakeToken(IEnumerable<Claim> claims)
{
var now = DateTime.Now;
@ -162,8 +190,7 @@ namespace AsbCloudInfrastructure.Services
return new JwtSecurityTokenHandler().WriteToken(jwt);
}
private async Task<(ClaimsIdentity Identity, User User)> GetClaimsUserAsync(string login,
string password, CancellationToken token = default)
private async Task<User?> GetUserByLoginAsync(string login, CancellationToken token = default)
{
var user = await db.Users
.Include(e => e.Company)
@ -171,18 +198,16 @@ namespace AsbCloudInfrastructure.Services
.AsNoTracking()
.FirstOrDefaultAsync(token)
.ConfigureAwait(false);
return user;
}
if (user is null)
return default;
if (!CheckPassword(user.PasswordHash, password))
return default;
private ClaimsIdentity MakeClaims(User user)
{
var claims = new List<Claim>
{
new (claimIdUser, user.Id.ToString()),
new (ClaimsIdentity.DefaultNameClaimType, user.Login),
new (claimNameIdCompany, user.IdCompany.ToString()),
new (claimNameIdCompany, user.IdCompany?.ToString()!),
};
var roles = userService.GetRolesByIdUser(user.Id);
if (roles is not null)
@ -190,7 +215,7 @@ namespace AsbCloudInfrastructure.Services
claims.Add(new Claim(ClaimsIdentity.DefaultRoleClaimType, role.Caption));
var claimsIdentity = new ClaimsIdentity(claims, "Token", ClaimsIdentity.DefaultNameClaimType, ClaimsIdentity.DefaultRoleClaimType);
return (claimsIdentity, user);
return claimsIdentity;
}
private bool CheckPassword(string passwordHash, string password)
@ -230,3 +255,4 @@ namespace AsbCloudInfrastructure.Services
}
}
}
#nullable disable

14
AsbCloudWebApi/Controllers/AuthController.cs
View File

@ -37,8 +37,7 @@ namespace AsbCloudWebApi.Controllers
[ProducesResponseType(typeof(UserTokenDto), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> LoginAsync([FromBody] AuthDto auth, CancellationToken token = default)
{
var userToken = await authService.LoginAsync(auth.Login,
auth.Password, token).ConfigureAwait(false);
var userToken = await authService.LoginAsync(auth.Login, auth.Password, token);
if (userToken is null)
Forbid();
@ -52,10 +51,15 @@ namespace AsbCloudWebApi.Controllers
/// <returns code="200">новый токен</returns>
[Authorize]
[HttpGet("refresh")]
public IActionResult Refresh()
[ProducesResponseType(typeof(UserTokenDto), (int)System.Net.HttpStatusCode.OK)]
public async Task<IActionResult> RefreshAsync(CancellationToken token = default)
{
var newToken = authService.Refresh(User);
return Ok(newToken);
var userToken = await authService.RefreshAsync(User, token);
if (userToken is null)
Forbid();
return Ok(userToken);
}
/// <summary>