Add database connection.

3 files changed, 56 insertions, 40 deletions

diff --git a/Timeline/Entities/Token.cs b/Timeline/Entities/Token.cs
deleted file mode 100644
index ce5b92ff..00000000
--- a/Timeline/Entities/Token.cs
+++ /dev/null
@@ -1,26 +0,0 @@
-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 TokenValidationRequest
-    {
-        public string Token { get; set; }
-    }
-
-    public class TokenValidationResponse
-    {
-        public bool IsValid { get; set; }
-        public UserInfo UserInfo { get; set; }
-    }
-}
diff --git a/Timeline/Entities/User.cs b/Timeline/Entities/User.cs
index c77e895d..1cb5a894 100644
--- a/Timeline/Entities/User.cs
+++ b/Timeline/Entities/User.cs
@@ -1,25 +1,41 @@
-namespace Timeline.Entities
+namespace Timeline.Entities
 {
-    public class User
+    public class CreateTokenRequest
     {
-        public int Id { get; set; }
         public string Username { get; set; }
         public string Password { get; set; }
-        public string[] Roles { get; set; }
+    }
 
-        public UserInfo GetUserInfo()
-        {
-            return new UserInfo
-            {
-                Username = Username,
-                Roles = Roles
-            };
-        }
+    public class CreateTokenResponse
+    {
+        public bool Success { get; set; }
+        public string Token { get; set; }
+        public UserInfo UserInfo { get; set; }
     }
 
-    public class UserInfo
+    public class TokenValidationRequest
+    {
+        public string Token { get; set; }
+    }
+
+    public class TokenValidationResponse
+    {
+        public bool IsValid { get; set; }
+        public UserInfo UserInfo { get; set; }
+    }
+
+    public class CreateUserRequest
     {
         public string Username { get; set; }
-        public string[] Roles { get; set; }
+        public string Password { get; set; }
+        public string[] Roles { get; set; } 
+    }
+
+    public class CreateUserResponse
+    {
+        public const int SuccessCode = 0;
+        public const int AlreadyExistsCode = 1;
+
+        public int ReturnCode { get; set; }
     }
 }
diff --git a/Timeline/Entities/UserInfo.cs b/Timeline/Entities/UserInfo.cs
new file mode 100644
index 00000000..d9c5acad
--- /dev/null
+++ b/Timeline/Entities/UserInfo.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Linq;
+using Timeline.Models;
+
+namespace Timeline.Entities
+{
+    public class UserInfo
+    {
+        public UserInfo()
+        {
+
+        }
+
+        public UserInfo(User user)
+        {
+            if (user == null)
+                throw new ArgumentNullException(nameof(user));
+
+            Username = user.Name;
+            Roles = user.RoleString.Split(',').Select(s => s.Trim()).ToArray();
+        }
+
+        public string Username { get; set; }
+        public string[] Roles { get; set; }
+    }
+}