Add requested changes

project-fika · Sep 8, 2024 · 43d4817 · 43d4817
1 parent d7e02fd
commit 43d4817
Show file tree

Hide file tree

Showing 4 changed files with 54 additions and 7 deletions.
diff --git a/Fuyu.Backend.Core/DTO/Accounts/Account.cs b/Fuyu.Backend.Core/DTO/Accounts/Account.cs
@@ -17,5 +17,8 @@ public class Account
 
         [DataMember]
         public Dictionary<string, int?> Games;
+
+        [DataMember]
+        public bool IsBanned;
     }
 }
diff --git a/Fuyu.Backend.Core/DTO/Accounts/ELoginStatus.cs b/Fuyu.Backend.Core/DTO/Accounts/ELoginStatus.cs
@@ -0,0 +1,10 @@
+namespace Fuyu.Backend.Core.DTO.Accounts
+{
+    public enum ELoginStatus
+    {
+        AccountBanned,
+        AccountNotFound,
+        SessionAlreadyExists,
+        Success
+    }
+}
diff --git a/Fuyu.Backend.Core/DTO/Response/AccountLoginResponse.cs b/Fuyu.Backend.Core/DTO/Response/AccountLoginResponse.cs
@@ -1,10 +1,14 @@
 using System.Runtime.Serialization;
+using Fuyu.Backend.Core.DTO.Accounts;
 
 namespace Fuyu.Backend.Core.DTO.Responses
 {
     [DataContract]
     public class AccountLoginResponse
     {
+        [DataMember]
+        public ELoginStatus Status;
+
         [DataMember]
         public string SessionId;
     }

diff --git a/Fuyu.Backend.Core/Services/AccountService.cs b/Fuyu.Backend.Core/Services/AccountService.cs
@@ -4,6 +4,7 @@
 using Fuyu.Common.Hashing;
 using Fuyu.Common.Serialization;
 using Fuyu.Backend.Core.DTO.Accounts;
+using Fuyu.Backend.Core.DTO.Responses;
 
 namespace Fuyu.Backend.Core.Services
 {
@@ -41,15 +42,19 @@ public static int AccountExists(string username)
             }
         }
 
-        public static string LoginAccount(string username, string password)
+        public static AccountLoginResponse LoginAccount(string username, string password)
         {
             // find account
             var accountId = AccountExists(username);
 
             if (accountId == -1)
             {
                 // account doesn't exist
-                return string.Empty;
+                return new AccountLoginResponse()
+                {
+                    Status = ELoginStatus.AccountNotFound,
+                    SessionId = string.Empty
+                };
             }
 
             // validate password
@@ -58,7 +63,22 @@ public static string LoginAccount(string username, string password)
             if (account.Password != password)
             {
                 // password is wrong
-                return string.Empty;
+                return new AccountLoginResponse()
+                {
+                    Status = ELoginStatus.AccountNotFound,
+                    SessionId = string.Empty
+                };
+            }
+
+            // validate status
+            if (account.IsBanned)
+            {
+                // account is banned
+                return new AccountLoginResponse()
+                {
+                    Status = ELoginStatus.AccountBanned,
+                    SessionId = string.Empty
+                };
             }
 
             // find active account session
@@ -68,8 +88,11 @@ public static string LoginAccount(string username, string password)
             {
                 if (kvp.Value == accountId)
                 {
-                    // session already exists
-                    return kvp.Key;
+                    return new AccountLoginResponse()
+                    {
+                        Status = ELoginStatus.SessionAlreadyExists,
+                        SessionId = kvp.Key
+                    };
                 }
             }
 
@@ -78,8 +101,14 @@ public static string LoginAccount(string username, string password)
             //       decided to generate a new MongoId for each login.
             // -- seionmoya, 2024/09/02
             var sessionId = new MongoId(accountId).ToString();
+
             CoreOrm.SetOrAddSession(sessionId, accountId);
-            return sessionId.ToString();
+
+            return new AccountLoginResponse()
+            {
+                Status = ELoginStatus.Success,
+                SessionId = sessionId.ToString()
+            };
         }
 
         private static int GetNewAccountId()
@@ -150,7 +179,8 @@ public static ERegisterStatus RegisterAccount(string username, string password)
                 {
                     { "eft",    null },
                     { "arena",  null }
-                }
+                },
+                IsBanned = false
             };
 
             CoreOrm.SetOrAddAccount(account);