1 files changed, 122 insertions, 113 deletions

diff --git a/src/server/bnetserver/Server/Session.cpp b/src/server/bnetserver/Server/Session.cpp
index bb0a92740e0..4c6e179896f 100644
--- a/src/server/bnetserver/Server/Session.cpp
+++ b/src/server/bnetserver/Server/Session.cpp
@@ -36,8 +36,37 @@ Battlenet::Session::ModuleHandler const Battlenet::Session::ModuleHandlers[MODUL
     &Battlenet::Session::HandleResumeModule,
 };
 
-Battlenet::Session::Session(tcp::socket&& socket) : Socket(std::move(socket)), _accountId(0), _accountName(), _locale(),
-    _os(), _build(0), _gameAccountId(0), _gameAccountName(), _accountSecurityLevel(SEC_PLAYER), I(), s(), v(), b(), B(), K(),
+void Battlenet::AccountInfo::LoadResult(Field* fields)
+{
+    // ba.id, ba.email, ba.locked, ba.lock_country, ba.last_ip, ba.failed_logins, bab.unbandate > UNIX_TIMESTAMP() OR bab.unbandate = bab.bandate, bab.unbandate = bab.bandate FROM battlenet_accounts ba LEFT JOIN battlenet_account_bans bab WHERE email = ?
+    Id = fields[0].GetUInt32();
+    Login = fields[1].GetString();
+    IsLockedToIP = fields[2].GetBool();
+    LockCountry = fields[3].GetString();
+    LastIP = fields[4].GetString();
+    FailedLogins = fields[5].GetUInt32();
+    IsBanned = fields[6].GetUInt64() != 0;
+    IsPermanenetlyBanned = fields[7].GetUInt64() != 0;
+}
+
+void Battlenet::GameAccountInfo::LoadResult(Field* fields)
+{
+    // a.id, a.username, ab.unbandate > UNIX_TIMESTAMP() OR ab.unbandate = ab.bandate, ab.unbandate = ab.bandate, aa.gmlevel
+    Id = fields[0].GetUInt32();
+    Name = fields[1].GetString();
+    IsBanned = fields[2].GetUInt64() != 0;
+    IsPermanenetlyBanned = fields[3].GetUInt64() != 0;
+    SecurityLevel = AccountTypes(fields[4].GetUInt8());
+
+    std::size_t hashPos = Name.find('#');
+    if (hashPos != std::string::npos)
+        DisplayName = std::string("WoW") + Name.substr(hashPos + 1);
+    else
+        DisplayName = Name;
+}
+
+Battlenet::Session::Session(tcp::socket&& socket) : Socket(std::move(socket)), _accountInfo(new AccountInfo()), _gameAccountInfo(nullptr), _locale(),
+    _os(), _build(0), I(), s(), v(), b(), B(), K(),
     _reconnectProof(), _crypt(), _authed(false), _subscribedToRealmListUpdates(false), _toonOnline(false)
 {
     static uint8 const N_Bytes[] =
@@ -63,6 +92,7 @@ Battlenet::Session::Session(tcp::socket&& socket) : Socket(std::move(socket)), _
 
 Battlenet::Session::~Session()
 {
+    delete _accountInfo;
     sSessionMgr.RemoveSession(this);
 }
 
@@ -83,7 +113,7 @@ void Battlenet::Session::_SetVSFields(std::string const& pstr)
     PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_VS_FIELDS);
     stmt->setString(0, v.AsHexStr());
     stmt->setString(1, s.AsHexStr());
-    stmt->setString(2, _accountName);
+    stmt->setString(2, _accountInfo->Login);
 
     LoginDatabase.Execute(stmt);
 }
@@ -170,13 +200,13 @@ void Battlenet::Session::HandleLogonRequest(Authentication::LogonRequest3 const&
             _build = component.Build;
     }
 
-    _accountName = logonRequest.Login;
+    std::string login = logonRequest.Login;
     _locale = logonRequest.Locale;
     _os = logonRequest.Platform;
 
-    Utf8ToUpperOnlyLatin(_accountName);
+    Utf8ToUpperOnlyLatin(login);
     stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_BNET_ACCOUNT_INFO);
-    stmt->setString(0, _accountName);
+    stmt->setString(0, login);
 
     PreparedQueryResult result = LoginDatabase.Query(stmt);
     if (!result)
@@ -189,15 +219,14 @@ void Battlenet::Session::HandleLogonRequest(Authentication::LogonRequest3 const&
     }
 
     Field* fields = result->Fetch();
-
-    _accountId = fields[1].GetUInt32();
+    _accountInfo->LoadResult(fields);
 
     // If the IP is 'locked', check that the player comes indeed from the correct IP address
-    if (fields[2].GetUInt8() == 1)                  // if ip is locked
+    if (_accountInfo->IsLockedToIP)
     {
-        TC_LOG_DEBUG("session", "[Battlenet::LogonRequest] Account '%s' is locked to IP - '%s' is logging in from '%s'", _accountName.c_str(), fields[4].GetCString(), ip_address.c_str());
+        TC_LOG_DEBUG("session", "[Battlenet::LogonRequest] Account '%s' is locked to IP - '%s' is logging in from '%s'", _accountInfo->Login.c_str(), _accountInfo->LastIP.c_str(), ip_address.c_str());
 
-        if (strcmp(fields[4].GetCString(), ip_address.c_str()) != 0)
+        if (_accountInfo->LastIP != ip_address)
         {
             Authentication::LogonResponse* logonResponse = new Authentication::LogonResponse();
             logonResponse->SetAuthResult(AUTH_ACCOUNT_LOCKED);
@@ -207,11 +236,10 @@ void Battlenet::Session::HandleLogonRequest(Authentication::LogonRequest3 const&
     }
     else
     {
-        TC_LOG_DEBUG("session", "[Battlenet::LogonRequest] Account '%s' is not locked to ip", _accountName.c_str());
-        std::string accountCountry = fields[3].GetString();
-        if (accountCountry.empty() || accountCountry == "00")
-            TC_LOG_DEBUG("session", "[Battlenet::LogonRequest] Account '%s' is not locked to country", _accountName.c_str());
-        else if (!accountCountry.empty())
+        TC_LOG_DEBUG("session", "[Battlenet::LogonRequest] Account '%s' is not locked to ip", _accountInfo->Login.c_str());
+        if (_accountInfo->LockCountry.empty() || _accountInfo->LockCountry == "00")
+            TC_LOG_DEBUG("session", "[Battlenet::LogonRequest] Account '%s' is not locked to country", _accountInfo->Login.c_str());
+        else if (!_accountInfo->LockCountry.empty())
         {
             uint32 ip = inet_addr(ip_address.c_str());
             EndianConvertReverse(ip);
@@ -221,8 +249,8 @@ void Battlenet::Session::HandleLogonRequest(Authentication::LogonRequest3 const&
             if (PreparedQueryResult sessionCountryQuery = LoginDatabase.Query(stmt))
             {
                 std::string loginCountry = (*sessionCountryQuery)[0].GetString();
-                TC_LOG_DEBUG("session", "[Battlenet::LogonRequest] Account '%s' is locked to country: '%s' Player country is '%s'", _accountName.c_str(), accountCountry.c_str(), loginCountry.c_str());
-                if (loginCountry != accountCountry)
+                TC_LOG_DEBUG("session", "[Battlenet::LogonRequest] Account '%s' is locked to country: '%s' Player country is '%s'", _accountInfo->Login.c_str(), _accountInfo->LockCountry.c_str(), loginCountry.c_str());
+                if (loginCountry != _accountInfo->LockCountry)
                 {
                     Authentication::LogonResponse* logonResponse = new Authentication::LogonResponse();
                     logonResponse->SetAuthResult(AUTH_ACCOUNT_LOCKED);
@@ -233,22 +261,15 @@ void Battlenet::Session::HandleLogonRequest(Authentication::LogonRequest3 const&
         }
     }
 
-    //set expired bans to inactive
-    LoginDatabase.DirectExecute(LoginDatabase.GetPreparedStatement(LOGIN_DEL_BNET_EXPIRED_BANS));
-
     // If the account is banned, reject the logon attempt
-    stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_BNET_ACTIVE_ACCOUNT_BAN);
-    stmt->setUInt32(0, _accountId);
-    PreparedQueryResult banresult = LoginDatabase.Query(stmt);
-    if (banresult)
+    if (_accountInfo->IsBanned)
     {
-        Field* fields = banresult->Fetch();
-        if (fields[0].GetUInt32() == fields[1].GetUInt32())
+        if (_accountInfo->IsPermanenetlyBanned)
         {
             Authentication::LogonResponse* logonResponse = new Authentication::LogonResponse();
             logonResponse->SetAuthResult(LOGIN_BANNED);
             AsyncWrite(logonResponse);
-            TC_LOG_DEBUG("session", "'%s:%d' [Battlenet::LogonRequest] Banned account %s tried to login!", ip_address.c_str(), GetRemotePort(), _accountName.c_str());
+            TC_LOG_DEBUG("session", "'%s:%d' [Battlenet::LogonRequest] Banned account %s tried to login!", ip_address.c_str(), GetRemotePort(), _accountInfo->Login.c_str());
             return;
         }
         else
@@ -256,13 +277,13 @@ void Battlenet::Session::HandleLogonRequest(Authentication::LogonRequest3 const&
             Authentication::LogonResponse* logonResponse = new Authentication::LogonResponse();
             logonResponse->SetAuthResult(LOGIN_SUSPENDED);
             AsyncWrite(logonResponse);
-            TC_LOG_DEBUG("session", "'%s:%d' [Battlenet::LogonRequest] Temporarily banned account %s tried to login!", ip_address.c_str(), GetRemotePort(), _accountName.c_str());
+            TC_LOG_DEBUG("session", "'%s:%d' [Battlenet::LogonRequest] Temporarily banned account %s tried to login!", ip_address.c_str(), GetRemotePort(), _accountInfo->Login.c_str());
             return;
         }
     }
 
     SHA256Hash sha;
-    sha.UpdateData(_accountName);
+    sha.UpdateData(_accountInfo->Login);
     sha.Finalize();
 
     I.SetBinary(sha.GetDigest(), sha.GetLength());
@@ -270,10 +291,10 @@ void Battlenet::Session::HandleLogonRequest(Authentication::LogonRequest3 const&
     ModuleInfo* password = sModuleMgr->CreateModule(_os, "Password");
     ModuleInfo* thumbprint = sModuleMgr->CreateModule(_os, "Thumbprint");
 
-    std::string pStr = fields[0].GetString();
+    std::string pStr = fields[8].GetString();
 
-    std::string databaseV = fields[5].GetString();
-    std::string databaseS = fields[6].GetString();
+    std::string databaseV = fields[9].GetString();
+    std::string databaseS = fields[10].GetString();
 
     if (databaseV.size() != size_t(BufferSizes::SRP_6_V) * 2 || databaseS.size() != size_t(BufferSizes::SRP_6_S) * 2)
         _SetVSFields(pStr);
@@ -311,16 +332,16 @@ void Battlenet::Session::HandleLogonRequest(Authentication::LogonRequest3 const&
 
 void Battlenet::Session::HandleResumeRequest(Authentication::ResumeRequest const& resumeRequest)
 {
-    _accountName = resumeRequest.Login;
+    std::string login = resumeRequest.Login;
     _locale = resumeRequest.Locale;
     _os = resumeRequest.Platform;
     auto baseComponent = std::find_if(resumeRequest.Components.begin(), resumeRequest.Components.end(), [](Component const& c) { return c.Program == "base"; });
     if (baseComponent != resumeRequest.Components.end())
         _build = baseComponent->Build;
 
-    Utf8ToUpperOnlyLatin(_accountName);
+    Utf8ToUpperOnlyLatin(login);
     PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_BNET_RECONNECT_INFO);
-    stmt->setString(0, _accountName);
+    stmt->setString(0, login);
     stmt->setString(1, resumeRequest.GameAccountName);
     PreparedQueryResult result = LoginDatabase.Query(stmt);
     if (!result)
@@ -332,11 +353,12 @@ void Battlenet::Session::HandleResumeRequest(Authentication::ResumeRequest const
     }
 
     Field* fields = result->Fetch();
+    _accountInfo->LoadResult(fields);
+    K.SetHexStr(fields[8].GetString().c_str());
 
-    _accountId = fields[0].GetUInt32();
-    K.SetHexStr(fields[1].GetString().c_str());
-    _gameAccountId = fields[2].GetUInt32();
-    _gameAccountName = resumeRequest.GameAccountName;
+    _gameAccounts.resize(1);
+    _gameAccountInfo = &_gameAccounts[0];
+    _gameAccountInfo->LoadResult(fields + 9);
 
     ModuleInfo* thumbprint = sModuleMgr->CreateModule(_os, "Thumbprint");
     ModuleInfo* resume = sModuleMgr->CreateModule(_os, "Resume");
@@ -404,7 +426,7 @@ void Battlenet::Session::HandleLogoutRequest(Connection::LogoutRequest const& /*
     PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_SESSION_KEY);
     stmt->setString(0, "");
     stmt->setBool(1, false);
-    stmt->setUInt32(2, _accountId);
+    stmt->setUInt32(2, _accountInfo->Id);
     LoginDatabase.Execute(stmt);
 }
 
@@ -417,7 +439,7 @@ void Battlenet::Session::HandleListSubscribeRequest(WoWRealm::ListSubscribeReque
     WoWRealm::ListSubscribeResponse* listSubscribeResponse = new WoWRealm::ListSubscribeResponse();
 
     PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_BNET_CHARACTER_COUNTS);
-    stmt->setUInt32(0, _gameAccountId);
+    stmt->setUInt32(0, _gameAccountInfo->Id);
 
     if (PreparedQueryResult countResult = LoginDatabase.Query(stmt))
     {
@@ -474,7 +496,7 @@ void Battlenet::Session::HandleJoinRequestV2(WoWRealm::JoinRequestV2 const& join
     memcpy(sessionKey + hmac.GetLength(), hmac2.GetDigest(), hmac2.GetLength());
 
     LoginDatabase.DirectPExecute("UPDATE account SET sessionkey = '%s', last_ip = '%s', last_login = NOW(), locale = %u, failed_logins = 0, os = '%s' WHERE id = %u",
-        ByteArrayToHexStr(sessionKey, 40, true).c_str(), GetRemoteIpAddress().to_string().c_str(), GetLocaleByName(_locale), _os.c_str(), _gameAccountId);
+        ByteArrayToHexStr(sessionKey, 40, true).c_str(), GetRemoteIpAddress().to_string().c_str(), GetLocaleByName(_locale), _os.c_str(), _gameAccountInfo->Id);
 
     joinResponse->IPv4.emplace_back(realm->ExternalAddress, realm->Port);
     if (realm->ExternalAddress != realm->LocalAddress)
@@ -600,6 +622,23 @@ void Battlenet::Session::AsyncWrite(ServerPacket* packet)
     QueuePacket(std::move(buffer), guard);
 }
 
+void Battlenet::Session::LoadGameAccountData()
+{
+    PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_BNET_GAME_ACCOUNTS);
+    stmt->setUInt32(0, _accountInfo->Id);
+    PreparedQueryResult result = LoginDatabase.Query(stmt);
+    if (!result)
+        return;
+
+    _gameAccounts.resize(result->GetRowCount());
+    uint32 i = 0;
+    do
+    {
+        _gameAccounts[i++].LoadResult(result->Fetch());
+
+    } while (result->NextRow());
+}
+
 inline void ReplaceResponse(Battlenet::ServerPacket** oldResponse, Battlenet::ServerPacket* newResponse)
 {
     if (*oldResponse)
@@ -626,7 +665,6 @@ bool Battlenet::Session::HandlePasswordModule(BitStream* dataStream, ServerPacke
         return false;
     }
 
-
     BigNumber A, clientM1, clientChallenge;
     A.SetBinary(dataStream->ReadBytes(128).get(), 128);
     clientM1.SetBinary(dataStream->ReadBytes(32).get(), 32);
@@ -707,7 +745,7 @@ bool Battlenet::Session::HandlePasswordModule(BitStream* dataStream, ServerPacke
     if (memcmp(M1.AsByteArray().get(), clientM1.AsByteArray().get(), 32))
     {
         PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_FAILED_LOGINS);
-        stmt->setString(0, _accountName);
+        stmt->setString(0, _accountInfo->Login);
         LoginDatabase.Execute(stmt);
 
         Authentication::LogonResponse* logonResponse = new Authentication::LogonResponse();
@@ -717,14 +755,9 @@ bool Battlenet::Session::HandlePasswordModule(BitStream* dataStream, ServerPacke
         return false;
     }
 
-    uint64 numAccounts = 0;
-    PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_BNET_GAME_ACCOUNTS);
-    stmt->setUInt32(0, _accountId);
-    PreparedQueryResult result = LoginDatabase.Query(stmt);
-    if (result)
-        numAccounts = result->GetRowCount();
+    LoadGameAccountData();
 
-    if (!numAccounts)
+    if (_gameAccounts.empty())
     {
         Authentication::LogonResponse* logonResponse = new Authentication::LogonResponse();
         logonResponse->SetAuthResult(LOGIN_NO_GAME_ACCOUNT);
@@ -733,10 +766,8 @@ bool Battlenet::Session::HandlePasswordModule(BitStream* dataStream, ServerPacke
         return false;
     }
 
-    Field* fields = result->Fetch();
-
     //set expired game account bans to inactive
-    LoginDatabase.DirectExecute(LoginDatabase.GetPreparedStatement(LOGIN_UPD_EXPIRED_ACCOUNT_BANS));
+    LoginDatabase.Execute(LoginDatabase.GetPreparedStatement(LOGIN_UPD_EXPIRED_ACCOUNT_BANS));
 
     BigNumber M;
     sha.Initialize();
@@ -761,26 +792,17 @@ bool Battlenet::Session::HandlePasswordModule(BitStream* dataStream, ServerPacke
 
     Authentication::ProofRequest* proofRequest = new Authentication::ProofRequest();
     proofRequest->Modules.push_back(password);
-    if (numAccounts > 1)
+    if (_gameAccounts.size() > 1)
     {
         BitStream accounts;
         state = 0;
         accounts.WriteBytes(&state, 1);
-        accounts.Write(numAccounts, 8);
-        do
+        accounts.Write(_gameAccounts.size(), 8);
+        for (GameAccountInfo const& gameAccount : _gameAccounts)
         {
-            fields = result->Fetch();
-            std::ostringstream name;
-            std::string originalName = fields[1].GetString();
-            std::size_t hashPos = originalName.find('#');
-            if (hashPos != std::string::npos)
-                name << "WoW" << originalName.substr(hashPos + 1);
-            else
-                name << originalName;
-
             accounts.Write(2, 8);
-            accounts.WriteString(name.str(), 8);
-        } while (result->NextRow());
+            accounts.WriteString(gameAccount.DisplayName, 8);
+        }
 
         ModuleInfo* selectGameAccount = sModuleMgr->CreateModule(_os, "SelectGameAccount");
         selectGameAccount->DataSize = accounts.GetSize();
@@ -791,29 +813,28 @@ bool Battlenet::Session::HandlePasswordModule(BitStream* dataStream, ServerPacke
     }
     else
     {
-        if (fields[4].GetBool())
+        _gameAccountInfo = &_gameAccounts[0];
+
+        if (_gameAccountInfo->IsBanned)
         {
             delete proofRequest;
 
             Authentication::LogonResponse* logonResponse = new Authentication::LogonResponse();
-            if (fields[2].GetUInt32() == fields[3].GetUInt32())
+            if (_gameAccountInfo->IsPermanenetlyBanned)
             {
                 logonResponse->SetAuthResult(LOGIN_BANNED);
-                TC_LOG_DEBUG("session", "'%s:%d' [Battlenet::Password] Banned account %s tried to login!", GetRemoteIpAddress().to_string().c_str(), GetRemotePort(), _accountName.c_str());
+                TC_LOG_DEBUG("session", "'%s:%d' [Battlenet::Password] Banned account %s tried to login!", GetRemoteIpAddress().to_string().c_str(), GetRemotePort(), _accountInfo->Login.c_str());
             }
             else
             {
                 logonResponse->SetAuthResult(LOGIN_SUSPENDED);
-                TC_LOG_DEBUG("session", "'%s:%d' [Battlenet::Password] Temporarily banned account %s tried to login!", GetRemoteIpAddress().to_string().c_str(), GetRemotePort(), _accountName.c_str());
+                TC_LOG_DEBUG("session", "'%s:%d' [Battlenet::Password] Temporarily banned account %s tried to login!", GetRemoteIpAddress().to_string().c_str(), GetRemotePort(), _accountInfo->Login.c_str());
             }
 
             ReplaceResponse(response, logonResponse);
             return false;
         }
 
-        _gameAccountId = fields[0].GetUInt32();
-        _gameAccountName = fields[1].GetString();
-
         proofRequest->Modules.push_back(sModuleMgr->CreateModule(_os, "RiskFingerprint"));
         _modulesWaitingForData.push(MODULE_RISK_FINGERPRINT);
     }
@@ -842,21 +863,16 @@ bool Battlenet::Session::HandleSelectGameAccountModule(BitStream* dataStream, Se
         return false;
     }
 
-    PreparedStatement* stmt;
-    if (account.substr(0, 3) != "WoW")
+    for (std::size_t i = 0; i < _gameAccounts.size(); ++i)
     {
-        stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_BNET_GAME_ACCOUNT);
-        stmt->setString(0, account);
-    }
-    else
-    {
-        stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_BNET_GAME_ACCOUNT_UNNAMED);
-        stmt->setUInt8(0, atol(account.substr(3).c_str()));
+        if (_gameAccounts[i].DisplayName == account)
+        {
+            _gameAccountInfo = &_gameAccounts[i];
+            break;
+        }
     }
 
-    stmt->setUInt32(1, _accountId);
-    PreparedQueryResult result = LoginDatabase.Query(stmt);
-    if (!result)
+    if (!_gameAccountInfo)
     {
         Authentication::LogonResponse* complete = new Authentication::LogonResponse();
         complete->SetAuthResult(LOGIN_NO_GAME_ACCOUNT);
@@ -865,28 +881,24 @@ bool Battlenet::Session::HandleSelectGameAccountModule(BitStream* dataStream, Se
         return false;
     }
 
-    Field* fields = result->Fetch();
-    if (fields[4].GetBool())
+    if (_gameAccountInfo->IsBanned)
     {
         Authentication::LogonResponse* logonResponse = new Authentication::LogonResponse();
-        if (fields[2].GetUInt32() == fields[3].GetUInt32())
+        if (_gameAccountInfo->IsPermanenetlyBanned)
         {
             logonResponse->SetAuthResult(LOGIN_BANNED);
-            TC_LOG_DEBUG("session", "'%s:%d' [Battlenet::SelectGameAccount] Banned account %s tried to login!", GetRemoteIpAddress().to_string().c_str(), GetRemotePort(), _accountName.c_str());
+            TC_LOG_DEBUG("session", "'%s:%d' [Battlenet::SelectGameAccount] Banned account %s tried to login!", GetRemoteIpAddress().to_string().c_str(), GetRemotePort(), _accountInfo->Login.c_str());
         }
         else
         {
             logonResponse->SetAuthResult(LOGIN_SUSPENDED);
-            TC_LOG_DEBUG("session", "'%s:%d' [Battlenet::SelectGameAccount] Temporarily banned account %s tried to login!", GetRemoteIpAddress().to_string().c_str(), GetRemotePort(), _accountName.c_str());
+            TC_LOG_DEBUG("session", "'%s:%d' [Battlenet::SelectGameAccount] Temporarily banned account %s tried to login!", GetRemoteIpAddress().to_string().c_str(), GetRemotePort(), _accountInfo->Login.c_str());
         }
 
         ReplaceResponse(response, logonResponse);
         return false;
     }
 
-    _gameAccountId = fields[0].GetUInt32();
-    _gameAccountName = fields[1].GetString();
-
     Authentication::ProofRequest* proofRequest = new Authentication::ProofRequest();
     proofRequest->Modules.push_back(sModuleMgr->CreateModule(_os, "RiskFingerprint"));
     ReplaceResponse(response, proofRequest);
@@ -898,29 +910,26 @@ bool Battlenet::Session::HandleSelectGameAccountModule(BitStream* dataStream, Se
 bool Battlenet::Session::HandleRiskFingerprintModule(BitStream* dataStream, ServerPacket** response)
 {
     Authentication::LogonResponse* logonResponse = new Authentication::LogonResponse();
-    if (dataStream->Read<uint8>(8) == 1)
+    if (dataStream->Read<uint8>(8) == 1 && _accountInfo && _gameAccountInfo)
     {
-        logonResponse->AccountId = _accountId;
-        logonResponse->GameAccountName = _gameAccountName;
+        logonResponse->AccountId = _accountInfo->Id;
+        logonResponse->GameAccountName = _gameAccountInfo->Name;
         logonResponse->GameAccountFlags = GAMEACCOUNT_FLAG_PROPASS_LOCK;
-        PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_SEL_BNET_FAILED_LOGINS);
-        stmt->setUInt32(0, _accountId);
-        if (PreparedQueryResult failedLoginsResult = LoginDatabase.Query(stmt))
-            logonResponse->FailedLogins = (*failedLoginsResult)[0].GetUInt32();
+        logonResponse->FailedLogins = _accountInfo->FailedLogins;
 
         SQLTransaction trans = LoginDatabase.BeginTransaction();
 
-        stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_LAST_LOGIN_INFO);
+        PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_LAST_LOGIN_INFO);
         stmt->setString(0, GetRemoteIpAddress().to_string());
         stmt->setUInt8(1, GetLocaleByName(_locale));
         stmt->setString(2, _os);
-        stmt->setUInt32(3, _accountId);
+        stmt->setUInt32(3, _accountInfo->Id);
         trans->Append(stmt);
 
         stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_SESSION_KEY);
         stmt->setString(0, K.AsHexStr());
         stmt->setBool(1, true);
-        stmt->setUInt32(2, _accountId);
+        stmt->setUInt32(2, _accountInfo->Id);
         trans->Append(stmt);
 
         LoginDatabase.CommitTransaction(trans);
@@ -980,7 +989,7 @@ bool Battlenet::Session::HandleResumeModule(BitStream* dataStream, ServerPacket*
     if (memcmp(proof.GetDigest(), clientProof.get(), serverPart.GetLength()))
     {
         PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_FAILED_LOGINS);
-        stmt->setString(0, _accountName);
+        stmt->setString(0, _accountInfo->Login);
         LoginDatabase.Execute(stmt);
 
         TC_LOG_DEBUG("session", "[Battlenet::Resume] %s attempted to reconnect with invalid password!", GetClientInfo().c_str());
@@ -993,7 +1002,7 @@ bool Battlenet::Session::HandleResumeModule(BitStream* dataStream, ServerPacket*
     PreparedStatement* stmt = LoginDatabase.GetPreparedStatement(LOGIN_UPD_BNET_SESSION_KEY);
     stmt->setString(0, K.AsHexStr());
     stmt->setBool(1, true);
-    stmt->setUInt32(2, _accountId);
+    stmt->setUInt32(2, _accountInfo->Id);
     LoginDatabase.Execute(stmt);
 
     HmacSha256 serverProof(64, newSessionKey);
@@ -1058,7 +1067,7 @@ Battlenet::WoWRealm::ListUpdate* Battlenet::Session::BuildListUpdate(Realm const
     WoWRealm::ListUpdate* listUpdate = new WoWRealm::ListUpdate();
     listUpdate->Timezone = realm->Timezone;
     listUpdate->Population = realm->PopulationLevel;
-    listUpdate->Lock = (realm->AllowedSecurityLevel > _accountSecurityLevel) ? 1 : 0;
+    listUpdate->Lock = (realm->AllowedSecurityLevel > _gameAccountInfo->SecurityLevel) ? 1 : 0;
     listUpdate->Type = realm->Type;
     listUpdate->Name = realm->Name;
 
@@ -1080,11 +1089,11 @@ std::string Battlenet::Session::GetClientInfo() const
 {
     std::ostringstream stream;
     stream << '[' << GetRemoteIpAddress() << ':' << GetRemotePort();
-    if (!_accountName.empty())
-        stream << ", Account: " << _accountName;
+    if (_accountInfo && !_accountInfo->Login.empty())
+        stream << ", Account: " << _accountInfo->Login;
 
-    if (!_gameAccountName.empty())
-        stream << ", Game account: " << _gameAccountName;
+    if (_gameAccountInfo)
+        stream << ", Game account: " << _gameAccountInfo->Name;
 
     stream << ']';