aboutsummaryrefslogtreecommitdiff
path: root/Timeline/Controllers
diff options
context:
space:
mode:
Diffstat (limited to 'Timeline/Controllers')
-rw-r--r--Timeline/Controllers/AdminUserController.cs83
-rw-r--r--Timeline/Controllers/TokenController.cs74
-rw-r--r--Timeline/Controllers/UserController.cs93
3 files changed, 124 insertions, 126 deletions
diff --git a/Timeline/Controllers/AdminUserController.cs b/Timeline/Controllers/AdminUserController.cs
deleted file mode 100644
index 7cc8c150..00000000
--- a/Timeline/Controllers/AdminUserController.cs
+++ /dev/null
@@ -1,83 +0,0 @@
-using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Mvc;
-using System;
-using System.Threading.Tasks;
-using Timeline.Entities;
-using Timeline.Services;
-
-namespace Timeline.Controllers
-{
- [Route("admin")]
- [Authorize(Roles = "admin")]
- public class AdminUserController : Controller
- {
- private readonly IUserService _userService;
-
- public AdminUserController(IUserService userService)
- {
- _userService = userService;
- }
-
- [HttpGet("users")]
- public async Task<ActionResult<UserInfo[]>> List()
- {
- return Ok(await _userService.ListUsers());
- }
-
- [HttpGet("user/{username}")]
- public async Task<IActionResult> Get([FromRoute] string username)
- {
- var user = await _userService.GetUser(username);
- if (user == null)
- {
- return NotFound();
- }
- return Ok(user);
- }
-
- [HttpPut("user/{username}")]
- public async Task<IActionResult> Put([FromBody] AdminUserEntityRequest request, [FromRoute] string username)
- {
- var result = await _userService.PutUser(username, request.Password, request.Roles);
- switch (result)
- {
- case PutUserResult.Created:
- return CreatedAtAction("Get", new { username }, AdminUserPutResponse.Created);
- case PutUserResult.Modified:
- return Ok(AdminUserPutResponse.Modified);
- default:
- throw new Exception("Unreachable code.");
- }
- }
-
- [HttpPatch("user/{username}")]
- public async Task<IActionResult> Patch([FromBody] AdminUserEntityRequest request, [FromRoute] string username)
- {
- var result = await _userService.PatchUser(username, request.Password, request.Roles);
- switch (result)
- {
- case PatchUserResult.Success:
- return Ok();
- case PatchUserResult.NotExists:
- return NotFound();
- default:
- throw new Exception("Unreachable code.");
- }
- }
-
- [HttpDelete("user/{username}")]
- public async Task<ActionResult<AdminUserDeleteResponse>> Delete([FromRoute] string username)
- {
- var result = await _userService.DeleteUser(username);
- switch (result)
- {
- case DeleteUserResult.Success:
- return Ok(AdminUserDeleteResponse.Success);
- case DeleteUserResult.NotExists:
- return Ok(AdminUserDeleteResponse.NotExists);
- default:
- throw new Exception("Uncreachable code.");
- }
- }
- }
-}
diff --git a/Timeline/Controllers/TokenController.cs b/Timeline/Controllers/TokenController.cs
new file mode 100644
index 00000000..463fb83c
--- /dev/null
+++ b/Timeline/Controllers/TokenController.cs
@@ -0,0 +1,74 @@
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using System.Threading.Tasks;
+using Timeline.Entities;
+using Timeline.Services;
+
+namespace Timeline.Controllers
+{
+ [Route("token")]
+ public class TokenController : Controller
+ {
+ private static class LoggingEventIds
+ {
+ public const int LogInSucceeded = 4000;
+ public const int LogInFailed = 4001;
+ }
+
+ private readonly IUserService _userService;
+ private readonly ILogger<TokenController> _logger;
+
+ public TokenController(IUserService userService, ILogger<TokenController> logger)
+ {
+ _userService = userService;
+ _logger = logger;
+ }
+
+ [HttpPost("create")]
+ [AllowAnonymous]
+ public async Task<ActionResult<CreateTokenResponse>> Create([FromBody] CreateTokenRequest request)
+ {
+ var result = await _userService.CreateToken(request.Username, request.Password);
+
+ if (result == null)
+ {
+ _logger.LogInformation(LoggingEventIds.LogInFailed, "Attemp to login with username: {} and password: {} failed.", request.Username, request.Password);
+ return Ok(new CreateTokenResponse
+ {
+ Success = false
+ });
+ }
+
+ _logger.LogInformation(LoggingEventIds.LogInSucceeded, "Login with username: {} succeeded.", request.Username);
+
+ return Ok(new CreateTokenResponse
+ {
+ Success = true,
+ Token = result.Token,
+ UserInfo = result.UserInfo
+ });
+ }
+
+ [HttpPost("verify")]
+ [AllowAnonymous]
+ public async Task<ActionResult<VerifyTokenResponse>> Verify([FromBody] VerifyTokenRequest request)
+ {
+ var result = await _userService.VerifyToken(request.Token);
+
+ if (result == null)
+ {
+ return Ok(new VerifyTokenResponse
+ {
+ IsValid = false,
+ });
+ }
+
+ return Ok(new VerifyTokenResponse
+ {
+ IsValid = true,
+ UserInfo = result
+ });
+ }
+ }
+}
diff --git a/Timeline/Controllers/UserController.cs b/Timeline/Controllers/UserController.cs
index 285e0146..ab7e1b99 100644
--- a/Timeline/Controllers/UserController.cs
+++ b/Timeline/Controllers/UserController.cs
@@ -1,74 +1,81 @@
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Logging;
+using System;
using System.Threading.Tasks;
using Timeline.Entities;
using Timeline.Services;
namespace Timeline.Controllers
{
- [Route("[controller]")]
public class UserController : Controller
{
- private static class LoggingEventIds
- {
- public const int LogInSucceeded = 4000;
- public const int LogInFailed = 4001;
- }
-
private readonly IUserService _userService;
- private readonly ILogger<UserController> _logger;
- public UserController(IUserService userService, ILogger<UserController> logger)
+ public UserController(IUserService userService)
{
_userService = userService;
- _logger = logger;
}
- [HttpPost("[action]")]
- [AllowAnonymous]
- public async Task<ActionResult<CreateTokenResponse>> CreateToken([FromBody] CreateTokenRequest request)
+ [HttpGet("users"), Authorize(Roles = "admin")]
+ public async Task<ActionResult<UserInfo[]>> List()
{
- var result = await _userService.CreateToken(request.Username, request.Password);
+ return Ok(await _userService.ListUsers());
+ }
- if (result == null)
+ [HttpGet("user/{username}"), Authorize]
+ public async Task<IActionResult> Get([FromRoute] string username)
+ {
+ var user = await _userService.GetUser(username);
+ if (user == null)
{
- _logger.LogInformation(LoggingEventIds.LogInFailed, "Attemp to login with username: {} and password: {} failed.", request.Username, request.Password);
- return Ok(new CreateTokenResponse
- {
- Success = false
- });
+ return NotFound();
}
+ return Ok(user);
+ }
- _logger.LogInformation(LoggingEventIds.LogInSucceeded, "Login with username: {} succeeded.", request.Username);
-
- return Ok(new CreateTokenResponse
+ [HttpPut("user/{username}"), Authorize(Roles = "admin")]
+ public async Task<IActionResult> Put([FromBody] UserModifyRequest request, [FromRoute] string username)
+ {
+ var result = await _userService.PutUser(username, request.Password, request.Roles);
+ switch (result)
{
- Success = true,
- Token = result.Token,
- UserInfo = result.UserInfo
- });
+ case PutUserResult.Created:
+ return CreatedAtAction("Get", new { username }, UserPutResponse.Created);
+ case PutUserResult.Modified:
+ return Ok(UserPutResponse.Modified);
+ default:
+ throw new Exception("Unreachable code.");
+ }
}
- [HttpPost("[action]")]
- [AllowAnonymous]
- public async Task<ActionResult<VerifyTokenResponse>> VerifyToken([FromBody] VerifyTokenRequest request)
+ [HttpPatch("user/{username}"), Authorize(Roles = "admin")]
+ public async Task<IActionResult> Patch([FromBody] UserModifyRequest request, [FromRoute] string username)
{
- var result = await _userService.VerifyToken(request.Token);
-
- if (result == null)
+ var result = await _userService.PatchUser(username, request.Password, request.Roles);
+ switch (result)
{
- return Ok(new VerifyTokenResponse
- {
- IsValid = false,
- });
+ case PatchUserResult.Success:
+ return Ok();
+ case PatchUserResult.NotExists:
+ return NotFound();
+ default:
+ throw new Exception("Unreachable code.");
}
+ }
- return Ok(new VerifyTokenResponse
+ [HttpDelete("user/{username}"), Authorize(Roles = "admin")]
+ public async Task<ActionResult<UserDeleteResponse>> Delete([FromRoute] string username)
+ {
+ var result = await _userService.DeleteUser(username);
+ switch (result)
{
- IsValid = true,
- UserInfo = result
- });
+ case DeleteUserResult.Success:
+ return Ok(UserDeleteResponse.Success);
+ case DeleteUserResult.NotExists:
+ return Ok(UserDeleteResponse.NotExists);
+ default:
+ throw new Exception("Uncreachable code.");
+ }
}
}
}
generated by cgit v1.2.3 (git 2.46.0) at 2025-09-28 21:33:04 +0000