From 57151c879376374425adb04fb68dad2cf7930df8 Mon Sep 17 00:00:00 2001
From: 杨宇千 <crupest@outlook.com>
Date: Mon, 5 Aug 2019 18:58:56 +0800
Subject: 3 things.

1. Exchange Models and Entities namespace.
2. Fix the bug that input with missing field leads to 500.
3. Write unit tests.
---
 Timeline/Models/Http/User.cs | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 Timeline/Models/Http/User.cs

(limited to 'Timeline/Models/Http/User.cs')

diff --git a/Timeline/Models/Http/User.cs b/Timeline/Models/Http/User.cs
new file mode 100644
index 00000000..1de7fae2
--- /dev/null
+++ b/Timeline/Models/Http/User.cs
@@ -0,0 +1,26 @@
+using System.ComponentModel.DataAnnotations;
+
+namespace Timeline.Models.Http
+{
+    public class UserPutRequest
+    {
+        [Required]
+        public string Password { get; set; }
+        [Required]
+        public bool Administrator { get; set; }
+    }
+
+    public class UserPatchRequest
+    {
+        public string Password { get; set; }
+        public bool? Administrator { get; set; }
+    }
+
+    public class ChangePasswordRequest
+    {
+        [Required]
+        public string OldPassword { get; set; }
+        [Required]
+        public string NewPassword { get; set; }
+    }
+}
-- 
cgit v1.2.3


From a35030d0a379ed7ee7fdd403449f53743209059c Mon Sep 17 00:00:00 2001
From: 杨宇千 <crupest@outlook.com>
Date: Thu, 8 Aug 2019 17:13:14 +0800
Subject: 2 things.

1. Make Administrator in UserPutRequest nullable.
2. Remove default route.
---
 Timeline/Controllers/UserController.cs | 10 +---------
 Timeline/Models/Http/User.cs           |  2 +-
 Timeline/Startup.cs                    |  2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'Timeline/Models/Http/User.cs')

diff --git a/Timeline/Controllers/UserController.cs b/Timeline/Controllers/UserController.cs
index 0992946c..28d9523a 100644
--- a/Timeline/Controllers/UserController.cs
+++ b/Timeline/Controllers/UserController.cs
@@ -18,8 +18,6 @@ namespace Timeline.Controllers
         {
             public const int Get_NotExists = -1001;
 
-            public const int Put_NoPassword = -2001;
-
             public const int Patch_NotExists = -3001;
 
             public const int ChangePassword_BadOldPassword = -4001;
@@ -55,13 +53,7 @@ namespace Timeline.Controllers
         [HttpPut("user/{username}"), AdminAuthorize]
         public async Task<IActionResult> Put([FromBody] UserPutRequest request, [FromRoute] string username)
         {
-            if (request.Password == null) // This place will be refactored.
-            {
-                _logger.LogInformation("Attempt to put a user without a password. Username: {} .", username);
-                return BadRequest();
-            }
-
-            var result = await _userService.PutUser(username, request.Password, request.Administrator);
+            var result = await _userService.PutUser(username, request.Password, request.Administrator.Value);
             switch (result)
             {
                 case PutResult.Created:
diff --git a/Timeline/Models/Http/User.cs b/Timeline/Models/Http/User.cs
index 3259a448..d45543fb 100644
--- a/Timeline/Models/Http/User.cs
+++ b/Timeline/Models/Http/User.cs
@@ -7,7 +7,7 @@ namespace Timeline.Models.Http
         [Required]
         public string Password { get; set; }
         [Required]
-        public bool Administrator { get; set; }
+        public bool? Administrator { get; set; }
     }
 
     public class UserPatchRequest
diff --git a/Timeline/Startup.cs b/Timeline/Startup.cs
index a28899f4..414bc705 100644
--- a/Timeline/Startup.cs
+++ b/Timeline/Startup.cs
@@ -89,7 +89,7 @@ namespace Timeline
 
             app.UseAuthentication();
 
-            app.UseMvcWithDefaultRoute();
+            app.UseMvc();
         }
     }
 }
-- 
cgit v1.2.3