2 files changed, 39 insertions, 13 deletions
diff --git a/Timeline/Controllers/UserController.cs b/Timeline/Controllers/UserController.cs
index 9d6970e7..1ffed22b 100644
--- a/Timeline/Controllers/UserController.cs
+++ b/Timeline/Controllers/UserController.cs
@@ -1,6 +1,9 @@
 using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http.Internal;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
+using System.IO;
+using Timeline.Entities;
 using Timeline.Services;
 
 namespace Timeline.Controllers
@@ -20,10 +23,15 @@ namespace Timeline.Controllers
             public string Password { get; set; }
         }
 
-        public class LoginInfo
+        public class CreateTokenResult
+        {
+            public string Token { get; set; }
+            public UserInfo UserInfo { get; set; }
+        }
+
+        public class TokenValidationRequest
         {
             public string Token { get; set; }
-            public string[] Roles { get; set; }
         }
 
         private readonly IUserService _userService;
@@ -39,7 +47,7 @@ namespace Timeline.Controllers
 
         [HttpPost("[action]")]
         [AllowAnonymous]
-        public ActionResult<LoginInfo> LogIn([FromBody] UserCredentials credentials)
+        public ActionResult<CreateTokenResult> CreateToken([FromBody] UserCredentials credentials)
         {
             var user = _userService.Authenticate(credentials.Username, credentials.Password);
 
@@ -50,13 +58,31 @@ namespace Timeline.Controllers
 
             _logger.LogInformation(LoggingEventIds.LogInSucceeded, "Login with username: {} succeeded.", credentials.Username);
 
-            var result = new LoginInfo
+            var result = new CreateTokenResult
             {
                 Token = _jwtService.GenerateJwtToken(user),
-                Roles = user.Roles
+                UserInfo = user.GetUserInfo()
             };
 
             return Ok(result);
         }
+
+        [HttpPost("[action]")]
+        [Consumes("text/plain")]
+        [AllowAnonymous]
+        public ActionResult<TokenValidationResult> ValidateToken([FromBody] string token)
+        {
+            var result = _jwtService.ValidateJwtToken(token);
+            return Ok(result);
+        }
+
+        [HttpPost("[action]")]
+        [Consumes("application/json")]
+        [AllowAnonymous]
+        public ActionResult<TokenValidationResult> ValidateToken([FromBody] TokenValidationRequest request)
+        {
+            var result = _jwtService.ValidateJwtToken(request.Token);
+            return Ok(result);
+        }
     }
 }
diff --git a/Timeline/Controllers/TestController.cs b/Timeline/Controllers/UserTestController.cs
index 1563830c..7fb6850b 100644
--- a/Timeline/Controllers/TestController.cs
+++ b/Timeline/Controllers/UserTestController.cs
@@ -7,28 +7,28 @@ using Microsoft.AspNetCore.Mvc;
 
 namespace Timeline.Controllers
 {
-    [Route("api/[controller]")]
-    public class TestController : Controller
+    [Route("api/test/User")]
+    public class UserTestController : Controller
     {
         [HttpGet("[action]")]
         [Authorize]
-        public string Action1()
+        public ActionResult NeedAuthorize()
         {
-            return "test";
+            return Ok();
         }
 
         [HttpGet("[action]")]
         [Authorize(Roles = "User,Admin")]
-        public string Action2()
+        public ActionResult BothUserAndAdmin()
         {
-            return "test";
+            return Ok();
         }
 
         [HttpGet("[action]")]
         [Authorize(Roles = "Admin")]
-        public string Action3()
+        public ActionResult OnlyAdmin()
         {
-            return "test";
+            return Ok();
         }
     }
 }