From 7e69eae6a58345a85bb38dc611a541809c6f19d0 Mon Sep 17 00:00:00 2001 From: DarthArgus Date: Sat, 14 Jul 2018 23:19:35 +0000 Subject: [PATCH] oop --- .../LoginServer/src/shared/ClientConnection.cpp | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp index 42fedbbe..c9a2b47a 100755 --- a/engine/server/application/LoginServer/src/shared/ClientConnection.cpp +++ b/engine/server/application/LoginServer/src/shared/ClientConnection.cpp @@ -182,9 +182,15 @@ void ClientConnection::validateClient(const std::string &id, const std::string & std::ostringstream postBuf; postBuf << "user_name=" << id << "&user_password=" << key << "&stationID=" << user_id << "&ip=" << getRemoteAddress(); + std::string postData = postBuf.str(); - if (webAPI::setData(std::string(postBuf.str())) && webAPI::submit(1,1,1)) { - std::string response = webAPI::getRaw(); + bool done = api.setData(postData); + if (done) { + done = api.submit(1,1,1); + } + + if (done) { + std::string response = api.getRaw(); if (response == "success") { authOK = true; @@ -193,7 +199,7 @@ void ClientConnection::validateClient(const std::string &id, const std::string & this->send(err, true); } } else { - ErrorMessage err("Failed to contact auth provider", response); + ErrorMessage err("Failed to contact auth provider", "Please contact a server admin"); this->send(err, true); } } else { @@ -211,7 +217,7 @@ void ClientConnection::validateClient(const std::string &id, const std::string & authOK = true; parentAccount = api.getString("mainAccount"); - childAccounts = api.getStringMap64("subAccounts"); + childAccounts = api.getStringMap("subAccounts"); if (!ConfigLoginServer::getUseOldSuidGenerator()) { user_id = static_cast(api.getNullableValue("user_id"));