fix not returning error from Login, remove old code

BeamMP · Feb 9, 2024 · a8ef0fb · a8ef0fb
1 parent d3f5473
commit a8ef0fb
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/Network/Core.cpp b/src/Network/Core.cpp
@@ -14,6 +14,7 @@
 #include <ws2tcpip.h>
 #include "Startup.h"
 #include "Logger.h"
+#include <nlohmann/json.hpp>
 #include <charconv>
 #include <thread>
 #include <set>
@@ -138,7 +139,6 @@ void Parse(std::string Data,SOCKET CSocket){
                     Auth["role"] = UserRole;
                 }
                 Data = Auth.dump();
-                Data = "N{\"Auth\":"+std::to_string(LoginAuth)+",\"username\":\"" + Username + "\",\"role\":\"" + UserRole + "\"}";
             }else{
                 Data = "N" + Login(Data.substr(Data.find(':') + 1));
             }

diff --git a/src/Security/Login.cpp b/src/Security/Login.cpp
@@ -89,7 +89,7 @@ std::string Login(const std::string& fields){
         }
         return GetFail("Invalid message parsing!");
     } catch (const std::exception& e) {
-        error(e.what());
+        return GetFail(e.what());
     }
 }