2 files changed, 2 insertions, 51 deletions
diff --git a/Timeline/Controllers/TokenController.cs b/Timeline/Controllers/TokenController.cs
index a96b6fa9..9724c1a6 100644
--- a/Timeline/Controllers/TokenController.cs
+++ b/Timeline/Controllers/TokenController.cs
@@ -20,9 +20,9 @@ namespace Timeline.Controllers
         private readonly ILogger<TokenController> _logger;
         private readonly IClock _clock;
 
-        private static User CreateUserFromUserInfo(UserInfo userInfo)
+        private static Models.Http.User CreateUserFromUserInfo(Models.User userInfo)
         {
-            return new User
+            return new Models.Http.User
             {
                 Username = userInfo.Username,
                 Administrator = userInfo.Administrator
diff --git a/Timeline/Controllers/UserDetailController.cs b/Timeline/Controllers/UserDetailController.cs
deleted file mode 100644
index 9de9899e..00000000
--- a/Timeline/Controllers/UserDetailController.cs
+++ /dev/null
@@ -1,49 +0,0 @@
-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();
-        }
-    }
-}