From 98ac2ccb908f04795736b23ddc5eb606544178e9 Mon Sep 17 00:00:00 2001
From: Seth Alves <seth.alves@gmail.com>
Date: Wed, 5 Jul 2017 17:36:25 -0700
Subject: [PATCH] rearrange code so authed connection works better

---
 tools/ac-client/src/ACClientApp.cpp   | 25 ++++++++++++-------------
 tools/atp-client/src/ATPClientApp.cpp |  1 -
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/tools/ac-client/src/ACClientApp.cpp b/tools/ac-client/src/ACClientApp.cpp
index c44d4aa24c..2b92bb744b 100644
--- a/tools/ac-client/src/ACClientApp.cpp
+++ b/tools/ac-client/src/ACClientApp.cpp
@@ -104,6 +104,9 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
     DependencyManager::set<AddressManager>();
     DependencyManager::set<NodeList>(NodeType::Agent, listenPort);
 
+    auto accountManager = DependencyManager::get<AccountManager>();
+    accountManager->setIsAgent(true);
+    accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL);
 
     auto nodeList = DependencyManager::get<NodeList>();
 
@@ -112,39 +115,34 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
     connect(domainCheckInTimer, &QTimer::timeout, nodeList.data(), &NodeList::sendDomainServerCheckIn);
     domainCheckInTimer->start(DOMAIN_SERVER_CHECK_IN_MSECS);
 
-    // start the nodeThread so its event loop is running 
+    // start the nodeThread so its event loop is running
     // (must happen after the checkin timer is created with the nodelist as it's parent)
     nodeList->startThread();
 
     const DomainHandler& domainHandler = nodeList->getDomainHandler();
-
     connect(&domainHandler, SIGNAL(hostnameChanged(const QString&)), SLOT(domainChanged(const QString&)));
-    // connect(&domainHandler, SIGNAL(resetting()), SLOT(resettingDomain()));
-    // connect(&domainHandler, SIGNAL(disconnectedFromDomain()), SLOT(clearDomainOctreeDetails()));
     connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &ACClientApp::domainConnectionRefused);
 
     connect(nodeList.data(), &NodeList::nodeAdded, this, &ACClientApp::nodeAdded);
     connect(nodeList.data(), &NodeList::nodeKilled, this, &ACClientApp::nodeKilled);
     connect(nodeList.data(), &NodeList::nodeActivated, this, &ACClientApp::nodeActivated);
-    // connect(nodeList.data(), &NodeList::uuidChanged, getMyAvatar(), &MyAvatar::setSessionUUID);
-    // connect(nodeList.data(), &NodeList::uuidChanged, this, &ACClientApp::setSessionUUID);
     connect(nodeList.data(), &NodeList::packetVersionMismatch, this, &ACClientApp::notifyPacketVersionMismatch);
-
     nodeList->addSetOfNodeTypesToNodeInterestSet(NodeSet() << NodeType::AudioMixer << NodeType::AvatarMixer
                                                  << NodeType::EntityServer << NodeType::AssetServer << NodeType::MessagesMixer);
 
-    DependencyManager::get<AddressManager>()->handleLookupString(domainServerAddress, false);
-
-    auto accountManager = DependencyManager::get<AccountManager>();
-    accountManager->setIsAgent(true);
-    accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL);
-
     if (_verbose) {
         QString username = accountManager->getAccountInfo().getUsername();
         qDebug() << "cached username is" << username << ", isLoggedIn =" << accountManager->isLoggedIn();
     }
 
     if (!_username.isEmpty()) {
+
+        connect(accountManager.data(), &AccountManager::newKeypair, this, [&](){
+            if (_verbose) {
+                qDebug() << "new keypair has been created.";
+            }
+        });
+
         connect(accountManager.data(), &AccountManager::loginComplete, this, [&](){
             if (_verbose) {
                 qDebug() << "login successful";
@@ -156,6 +154,7 @@ ACClientApp::ACClientApp(int argc, char* argv[]) :
         accountManager->requestAccessToken(_username, _password);
     }
 
+    DependencyManager::get<AddressManager>()->handleLookupString(domainServerAddress, false);
 
     QTimer* doTimer = new QTimer(this);
     doTimer->setSingleShot(true);
diff --git a/tools/atp-client/src/ATPClientApp.cpp b/tools/atp-client/src/ATPClientApp.cpp
index a0856dbff1..3e2f8ca71d 100644
--- a/tools/atp-client/src/ATPClientApp.cpp
+++ b/tools/atp-client/src/ATPClientApp.cpp
@@ -202,7 +202,6 @@ ATPClientApp::ATPClientApp(int argc, char* argv[]) :
         qDebug() << "domain-server address is" << _domainServerAddress;
     }
 
-
     DependencyManager::get<AddressManager>()->handleLookupString(_domainServerAddress, false);
 
     QTimer* _timeoutTimer = new QTimer(this);