4 files changed, 52 insertions, 3 deletions
diff --git a/Timeline/Controllers/Testing/TestingAuthController.cs b/Timeline/Controllers/Testing/TestingAuthController.cs
index 67b5b2ef..4d3b3ec7 100644
--- a/Timeline/Controllers/Testing/TestingAuthController.cs
+++ b/Timeline/Controllers/Testing/TestingAuthController.cs
@@ -1,6 +1,6 @@
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using Timeline.Authentication;
+using Timeline.Auth;
 
 namespace Timeline.Controllers.Testing
 {
diff --git a/Timeline/Controllers/UserAvatarController.cs b/Timeline/Controllers/UserAvatarController.cs
index 7c77897d..7625f962 100644
--- a/Timeline/Controllers/UserAvatarController.cs
+++ b/Timeline/Controllers/UserAvatarController.cs
@@ -6,7 +6,7 @@ using Microsoft.Net.Http.Headers;
 using System;
 using System.Linq;
 using System.Threading.Tasks;
-using Timeline.Authentication;
+using Timeline.Auth;
 using Timeline.Filters;
 using Timeline.Helpers;
 using Timeline.Models.Http;
diff --git a/Timeline/Controllers/UserController.cs b/Timeline/Controllers/UserController.cs
index 7b441c3a..0d950cd7 100644
--- a/Timeline/Controllers/UserController.cs
+++ b/Timeline/Controllers/UserController.cs
@@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Logging;
 using System.Globalization;
 using System.Threading.Tasks;
-using Timeline.Authentication;
+using Timeline.Auth;
 using Timeline.Helpers;
 using Timeline.Models;
 using Timeline.Models.Http;
diff --git a/Timeline/Controllers/UserDetailController.cs b/Timeline/Controllers/UserDetailController.cs
new file mode 100644
index 00000000..9de9899e
--- /dev/null
+++ b/Timeline/Controllers/UserDetailController.cs
@@ -0,0 +1,49 @@
+using Microsoft.AspNetCore.Mvc;
+using System.Threading.Tasks;
+using Timeline.Filters;
+using Timeline.Models.Validation;
+using Timeline.Services;
+using System.ComponentModel.DataAnnotations;
+using Microsoft.AspNetCore.Authorization;
+
+namespace Timeline.Controllers
+{
+    [ApiController]
+    public class UserDetailController : Controller
+    {
+        private readonly IUserDetailService _service;
+
+        public UserDetailController(IUserDetailService service)
+        {
+            _service = service;
+        }
+
+        [HttpGet("users/{username}/nickname")]
+        [CatchUserNotExistException]
+        public async Task<ActionResult<string>> GetNickname([FromRoute][Username] string username)
+        {
+            return Ok(await _service.GetNickname(username));
+        }
+
+        [HttpPut("users/{username}/nickname")]
+        [Authorize]
+        [SelfOrAdmin]
+        [CatchUserNotExistException]
+        public async Task<ActionResult> PutNickname([FromRoute][Username] string username,
+            [FromBody][StringLength(10, MinimumLength = 1)] string body)
+        {
+            await _service.SetNickname(username, body);
+            return Ok();
+        }
+
+        [HttpDelete("users/{username}/nickname")]
+        [Authorize]
+        [SelfOrAdmin]
+        [CatchUserNotExistException]
+        public async Task<ActionResult> DeleteNickname([FromRoute][Username] string username)
+        {
+            await _service.SetNickname(username, null);
+            return Ok();
+        }
+    }
+}