From 2cd0af76e36a6cf28b8a19cd970f4fbd57231f85 Mon Sep 17 00:00:00 2001
From: DarthArgus <darg.us@yandex.com>
Date: Sun, 1 Jan 2017 06:23:47 +0000
Subject: [PATCH] getting closer, but no cigar

---
 .../src/shared/ClientConnection.cpp           | 31 +++++++------------
 .../src/shared/ConnectionServer.cpp           |  5 ---
 .../LoginServer/src/shared/LoginServer.cpp    |  5 ---
 .../LoginServer/src/shared/PurgeManager.cpp   |  5 +--
 4 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp
index 421baed9..5dd3e235 100755
--- a/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp
+++ b/engine/server/application/ConnectionServer/src/shared/ClientConnection.cpp
@@ -312,6 +312,7 @@ void ClientConnection::handleClientIdMessage(const ClientIdMsg &msg) {
 
     DEBUG_FATAL(m_hasSelectedCharacter, ("Trying to validate a client who already has a character selected.\n"));
     bool result = false;
+    StationId apiSuid = 0;
     char sessionId[apiSessionIdWidth];
 
     m_gameBitsToClear = msg.getGameBitsToClear();
@@ -341,7 +342,7 @@ void ClientConnection::handleClientIdMessage(const ClientIdMsg &msg) {
 
                 if (status) {
                     printf("\tStatus ok....\n");
-                    StationId apiSuid = api.getNullableValue<int>("user_id");
+                    apiSuid = api.getNullableValue<int>("user_id");
                     int expired = api.getNullableValue<int>("expired");
                     std::string apiUser = api.getString("user_name");
                     std::string apiIP = api.getString("ip");
@@ -363,6 +364,7 @@ void ClientConnection::handleClientIdMessage(const ClientIdMsg &msg) {
                 printf("\tNo api submit :(\n");
             }
         } else { // assume local testing
+		printf("something isn't right or we're just testing...\n");
             result = ConnectionServer::decryptToken(token, m_suid, m_isSecure, m_accountName);
         }
 
@@ -405,29 +407,18 @@ void ClientConnection::handleClientIdMessage(const ClientIdMsg &msg) {
             return;
         }
 
-        if (ConfigConnectionServer::getValidateStationKey()) {
-            SessionApiClient *session = ConnectionServer::getSessionApiClient();
-            NOT_NULL(session);
-            if (session) {
-                session->validateClient(this, sessionId);
-            } else {
-                ConnectionServer::dropClient(this, "SessionApiClient is not available!");
-                disconnect();
-            }
-        } else {
-            if (!m_suid) {
-                m_suid = atoi(m_accountName.c_str());
-                if (m_suid == 0) {
-
+        if (!m_suid && !ConfigConnectionServer::getValidateStationKey()) {
+		m_suid = atoi(m_accountName.c_str());
+        	if (m_suid == 0) {
                     std::hash<std::string> h;
                     m_suid = h(m_accountName.c_str());
                 }
-            }
-            onValidateClient(m_suid, m_accountName, m_isSecure, nullptr,
-                             ConfigConnectionServer::getDefaultGameFeatures(),
-                             ConfigConnectionServer::getDefaultSubscriptionFeatures(), 0, 0, 0, 0,
-                             ConfigConnectionServer::getFakeBuddyPoints());
         }
+
+        onValidateClient(m_suid, m_accountName, m_isSecure, nullptr,
+                         ConfigConnectionServer::getDefaultGameFeatures(),
+                         ConfigConnectionServer::getDefaultSubscriptionFeatures(), 0, 0, 0, 0,
+                         ConfigConnectionServer::getFakeBuddyPoints());
     } else {
         // They sent us a token that was no good -- either a hack attempt, or
         // possibly it was just too old.
diff --git a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp
index 6eb0c07d..18a42389 100755
--- a/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp
+++ b/engine/server/application/ConnectionServer/src/shared/ConnectionServer.cpp
@@ -119,11 +119,6 @@ ConnectionServer::ConnectionServer() :
 
 	Address a("", ConfigConnectionServer::getPingPort());
 	IGNORE_RETURN(pingSocket->bind(a));
-
-	if (ConfigConnectionServer::getValidateStationKey())
-	{
-		installSessionValidation();
-	}
 }
 
 //-----------------------------------------------------------------------
diff --git a/engine/server/application/LoginServer/src/shared/LoginServer.cpp b/engine/server/application/LoginServer/src/shared/LoginServer.cpp
index 9ac8266d..afa12138 100755
--- a/engine/server/application/LoginServer/src/shared/LoginServer.cpp
+++ b/engine/server/application/LoginServer/src/shared/LoginServer.cpp
@@ -201,11 +201,6 @@ LoginServer::LoginServer() :
 	connectToMessage("FeatureIdTransactionRequest");
 	connectToMessage("FeatureIdTransactionSyncUpdate");
 	keyServer = new KeyServer;
-
-	/*if (ConfigLoginServer::getValidateStationKey() || ConfigLoginServer::getDoSessionLogin())
-	{
-		installSessionValidation();
-	}*/
 }
 
 //-----------------------------------------------------------------------
diff --git a/engine/server/application/LoginServer/src/shared/PurgeManager.cpp b/engine/server/application/LoginServer/src/shared/PurgeManager.cpp
index 2d649c52..043d468f 100755
--- a/engine/server/application/LoginServer/src/shared/PurgeManager.cpp
+++ b/engine/server/application/LoginServer/src/shared/PurgeManager.cpp
@@ -120,10 +120,7 @@ void PurgeManager::onGetAccountForPurge(StationId account, int purgePhase)
 		PurgeRecord record(account, static_cast<PurgePhase>(purgePhase));
 		m_purgeRecords.insert(std::make_pair(account,record));
 	
-		if (ConfigLoginServer::getValidateStationKey())
-			NON_NULL(LoginServer::getInstance().getSessionApiClient())->checkStatusForPurge(account);
-		else
-			onCheckStatusForPurge(account, false);
+		onCheckStatusForPurge(account, false);
 	}
 }