diff --git a/Tsi1.Api/Tsi1.Api/Controllers/UserController.cs b/Tsi1.Api/Tsi1.Api/Controllers/UserController.cs index 11bb6a7cd802555d29bda2710d556137f6f3dc04..1fbbe5ca1f7cdb42755c0717dbfc42a9035983aa 100644 --- a/Tsi1.Api/Tsi1.Api/Controllers/UserController.cs +++ b/Tsi1.Api/Tsi1.Api/Controllers/UserController.cs @@ -90,9 +90,6 @@ namespace Tsi1.Api.Controllers { try { - var username = HttpContext.User.Claims.FirstOrDefault(x => x.Type == "Username").Value; - var id = int.Parse(HttpContext.User.Claims.FirstOrDefault(x => x.Type == "Id").Value); - if (string.IsNullOrWhiteSpace(request.RefreshToken)) { return Unauthorized(); @@ -101,11 +98,8 @@ namespace Tsi1.Api.Controllers var accessToken = await HttpContext.GetTokenAsync("Bearer", "access_token"); var jwtResult = _jwtAuthManager.Refresh(request.RefreshToken, accessToken, DateTime.Now); - return Ok(new LoginResult + return Ok(new RefreshTokenDto { - Id = id, - UserName = username, - Role = User.FindFirst(ClaimTypes.Role)?.Value ?? string.Empty, AccessToken = jwtResult.AccessToken, RefreshToken = jwtResult.RefreshToken.TokenString }); diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Dtos/RefreshTokenDto.cs b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/RefreshTokenDto.cs new file mode 100644 index 0000000000000000000000000000000000000000..4280d62a62d34c8f14a615e01107fa53f1980e97 --- /dev/null +++ b/Tsi1.Api/Tsi1.BusinessLayer/Dtos/RefreshTokenDto.cs @@ -0,0 +1,12 @@ +using System; +using System.Collections.Generic; +using System.Text; + +namespace Tsi1.BusinessLayer.Dtos +{ + public class RefreshTokenDto + { + public string AccessToken { get; set; } + public string RefreshToken { get; set; } + } +} diff --git a/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs b/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs index 3aa39cc07fc53d7fae54d12517381a2e411e7f53..35b14f29c797130271be0d4adacb9190d0ffbc70 100644 --- a/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs +++ b/Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs @@ -65,6 +65,7 @@ namespace Tsi1.BusinessLayer.Services { IdentityCard = dto.IdentityCard, Age = dto.Age, + TenantId = tenantId }; } @@ -73,6 +74,7 @@ namespace Tsi1.BusinessLayer.Services user.Professor = new Professor() { IdentityCard = dto.IdentityCard, + TenantId = tenantId }; }