2 files changed, 27 insertions, 41 deletions
diff --git a/Timeline/Models/Http/User.cs b/Timeline/Models/Http/User.cs
deleted file mode 100644
index b3812f48..00000000
--- a/Timeline/Models/Http/User.cs
+++ /dev/null
@@ -1,41 +0,0 @@
-using System;
-using System.ComponentModel.DataAnnotations;
-using Timeline.Models.Validation;
-
-namespace Timeline.Models.Http
-{
-    [Obsolete("Remove this.")]
-    public class UserPutRequest
-    {
-        [Required]
-        public string Password { get; set; } = default!;
-        [Required]
-        public bool? Administrator { get; set; }
-    }
-
-    [Obsolete("Remove this.")]
-    public class UserPatchRequest
-    {
-        public string? Password { get; set; }
-        public bool? Administrator { get; set; }
-    }
-
-    public class ChangeUsernameRequest
-    {
-        [Required]
-        [Username]
-        public string OldUsername { get; set; } = default!;
-
-        [Required]
-        [Username]
-        public string NewUsername { get; set; } = default!;
-    }
-
-    public class ChangePasswordRequest
-    {
-        [Required]
-        public string OldPassword { get; set; } = default!;
-        [Required]
-        public string NewPassword { get; set; } = default!;
-    }
-}
diff --git a/Timeline/Models/Http/UserController.cs b/Timeline/Models/Http/UserController.cs
new file mode 100644
index 00000000..229ca1e5
--- /dev/null
+++ b/Timeline/Models/Http/UserController.cs
@@ -0,0 +1,27 @@
+using System.ComponentModel.DataAnnotations;
+using Timeline.Models.Validation;
+
+namespace Timeline.Models.Http
+{
+    public class UserPatchRequest
+    {
+        [Username]
+        public string? Username { get; set; }
+
+        [MinLength(1)]
+        public string? Password { get; set; }
+
+        [Nickname]
+        public string? Nickname { get; set; }
+
+        public bool? Administrator { get; set; }
+    }
+
+    public class ChangePasswordRequest
+    {
+        [Required(AllowEmptyStrings = false)]
+        public string OldPassword { get; set; } = default!;
+        [Required(AllowEmptyStrings = false)]
+        public string NewPassword { get; set; } = default!;
+    }
+}