From d079886c455a50c86d4df8575110217d2236fb10 Mon Sep 17 00:00:00 2001
From: Lucca Santangelo <luccasant95@gmail.com>
Date: Mon, 26 Oct 2020 22:29:11 -0300
Subject: [PATCH] refresh token
---
Tsi1.Api/Tsi1.Api/Controllers/UserController.cs | 8 +-------
Tsi1.Api/Tsi1.BusinessLayer/Dtos/RefreshTokenDto.cs | 12 ++++++++++++
Tsi1.Api/Tsi1.BusinessLayer/Services/UserService.cs | 2 ++
3 files changed, 15 insertions(+), 7 deletions(-)
create mode 100644 Tsi1.Api/Tsi1.BusinessLayer/Dtos/RefreshTokenDto.cs
diff --git a/Tsi1.Api/Tsi1.Api/Controllers/UserController.cs b/Tsi1.Api/Tsi1.Api/Controllers/UserController.cs
index 11bb6a7..1fbbe5c 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 0000000..4280d62
--- /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 3aa39cc..35b14f2 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
};
}
--
GitLab