Allow ordinary user to patch his password.

4 files changed, 55 insertions, 43 deletions

diff --git a/Timeline/Entities/AdminUser.cs b/Timeline/Entities/AdminUser.cs
deleted file mode 100644
index eb126165..00000000
--- a/Timeline/Entities/AdminUser.cs
+++ /dev/null
@@ -1,30 +0,0 @@
-namespace Timeline.Entities
-{
-    public class UserModifyRequest
-    {
-        public string Password { get; set; }
-        public string[] Roles { get; set; }
-    }
-
-    public class UserPutResponse
-    {
-        public const int CreatedCode = 0;
-        public const int ModifiedCode = 1;
-
-        public static UserPutResponse Created { get; } = new UserPutResponse { ReturnCode = CreatedCode };
-        public static UserPutResponse Modified { get; } = new UserPutResponse { ReturnCode = ModifiedCode };
-
-        public int ReturnCode { get; set; }
-    }
-
-    public class UserDeleteResponse
-    {
-        public const int SuccessCode = 0;
-        public const int NotExistsCode = 1;
-
-        public static UserDeleteResponse Success { get; } = new UserDeleteResponse { ReturnCode = SuccessCode };
-        public static UserDeleteResponse NotExists { get; } = new UserDeleteResponse { ReturnCode = NotExistsCode };
-
-        public int ReturnCode { get; set; }
-    }
-}
diff --git a/Timeline/Entities/Common.cs b/Timeline/Entities/Common.cs
new file mode 100644
index 00000000..235a2a20
--- /dev/null
+++ b/Timeline/Entities/Common.cs
@@ -0,0 +1,12 @@
+namespace Timeline.Entities
+{
+    public class MessageResponse
+    {
+        public MessageResponse(string message)
+        {
+            Message = message;
+        }
+
+        public string Message { get; set; }
+    }
+}
diff --git a/Timeline/Entities/Token.cs b/Timeline/Entities/Token.cs
new file mode 100644
index 00000000..1b5a469d
--- /dev/null
+++ b/Timeline/Entities/Token.cs
@@ -0,0 +1,26 @@
+namespace Timeline.Entities
+{
+    public class CreateTokenRequest
+    {
+        public string Username { get; set; }
+        public string Password { get; set; }
+    }
+
+    public class CreateTokenResponse
+    {
+        public bool Success { get; set; }
+        public string Token { get; set; }
+        public UserInfo UserInfo { get; set; }
+    }
+
+    public class VerifyTokenRequest
+    {
+        public string Token { get; set; }
+    }
+
+    public class VerifyTokenResponse
+    {
+        public bool IsValid { get; set; }
+        public UserInfo UserInfo { get; set; }
+    }
+}
diff --git a/Timeline/Entities/User.cs b/Timeline/Entities/User.cs
index 1b5a469d..eb126165 100644
--- a/Timeline/Entities/User.cs
+++ b/Timeline/Entities/User.cs
@@ -1,26 +1,30 @@
 namespace Timeline.Entities
 {
-    public class CreateTokenRequest
+    public class UserModifyRequest
     {
-        public string Username { get; set; }
         public string Password { get; set; }
+        public string[] Roles { get; set; }
     }
 
-    public class CreateTokenResponse
+    public class UserPutResponse
     {
-        public bool Success { get; set; }
-        public string Token { get; set; }
-        public UserInfo UserInfo { get; set; }
-    }
+        public const int CreatedCode = 0;
+        public const int ModifiedCode = 1;
 
-    public class VerifyTokenRequest
-    {
-        public string Token { get; set; }
+        public static UserPutResponse Created { get; } = new UserPutResponse { ReturnCode = CreatedCode };
+        public static UserPutResponse Modified { get; } = new UserPutResponse { ReturnCode = ModifiedCode };
+
+        public int ReturnCode { get; set; }
     }
 
-    public class VerifyTokenResponse
+    public class UserDeleteResponse
     {
-        public bool IsValid { get; set; }
-        public UserInfo UserInfo { get; set; }
+        public const int SuccessCode = 0;
+        public const int NotExistsCode = 1;
+
+        public static UserDeleteResponse Success { get; } = new UserDeleteResponse { ReturnCode = SuccessCode };
+        public static UserDeleteResponse NotExists { get; } = new UserDeleteResponse { ReturnCode = NotExistsCode };
+
+        public int ReturnCode { get; set; }
     }
 }