From 13310923c4440ec6b0a97dbf89627dc63fe832ad Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Thu, 23 Jun 2016 19:38:23 -0700
Subject: [PATCH] reset to temp domain after logout

---
 .../resources/web/settings/js/settings.js     |  2 ++
 domain-server/src/DomainServer.cpp            | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js
index 4188e86548..4f153d6190 100644
--- a/domain-server/resources/web/settings/js/settings.js
+++ b/domain-server/resources/web/settings/js/settings.js
@@ -457,6 +457,8 @@ function disonnectHighFidelityAccount() {
   }, function(){
     // we need to post to settings to clear the access-token
     $(Settings.ACCESS_TOKEN_SELECTOR).val('').change();
+    // reset the domain id to get a new temporary name
+    $(Settings.DOMAIN_ID_SELECTOR).val('').change();
     saveSettings();
   });
 }
diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index 192c0d26e6..ca0d7728dd 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -111,12 +111,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
         return;
     }
 
-    // check for the temporary name parameter
-    const QString GET_TEMPORARY_NAME_SWITCH = "--get-temp-name";
-    if (args.contains(GET_TEMPORARY_NAME_SWITCH)) {
-        getTemporaryName();
-    }
-
     setupNodeListAndAssignments();
     setupAutomaticNetworking();
     if (!getID().isNull()) {
@@ -125,6 +119,12 @@ DomainServer::DomainServer(int argc, char* argv[]) :
         sendHeartbeatToMetaverse();
     }
 
+    // check for the temporary name parameter
+    const QString GET_TEMPORARY_NAME_SWITCH = "--get-temp-name";
+    if (args.contains(GET_TEMPORARY_NAME_SWITCH)) {
+        getTemporaryName();
+    }
+
     _gatekeeper.preloadAllowedUserPublicKeys(); // so they can connect on first request
 
     _metadata = new DomainMetadata(this);
@@ -251,12 +251,13 @@ void DomainServer::getTemporaryName(bool force) {
     // check if we already have a domain ID
     const QVariant* idValueVariant = valueForKeyPath(_settingsManager.getSettingsMap(), METAVERSE_DOMAIN_ID_KEY_PATH);
 
+    qInfo() << "Requesting temporary domain name";
     if (idValueVariant) {
-        qWarning() << "Temporary domain name requested but a domain ID is already present in domain-server settings.";
+        qDebug() << "A domain ID is already present in domain-server settings:" << idValueVariant->toString();
         if (force) {
-            qWarning() << "Temporary domain name will be requested to replace it.";
+            qDebug() << "Requesting temporary domain name to replace current ID:" << getID();
         } else {
-            qWarning() << "Temporary domain name will not be requested.";
+            qInfo() << "Abandoning request of temporary domain name.";
             return;
         }
     }