From 4a30d549add061e408c95d692e2098ef6eb70207 Mon Sep 17 00:00:00 2001
From: Zach Pomerantz <zach@highfidelity.io>
Date: Fri, 17 Jun 2016 19:26:22 -0700
Subject: [PATCH] force temp domain reset on 404 too (401 already)

---
 domain-server/src/DomainServer.cpp | 51 +++++++++++++++++++-----------
 1 file changed, 32 insertions(+), 19 deletions(-)

diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp
index df1697af28..192c0d26e6 100644
--- a/domain-server/src/DomainServer.cpp
+++ b/domain-server/src/DomainServer.cpp
@@ -1121,29 +1121,42 @@ void DomainServer::handleMetaverseHeartbeatError(QNetworkReply& requestReply) {
         return;
     }
 
-    // if we have a temporary domain with a bad token, we will get a 401
-    if (requestReply.error() == QNetworkReply::NetworkError::AuthenticationRequiredError) {
-        static const QString DATA_KEY = "data";
-        static const QString TOKEN_KEY = "api_key";
+    // check if we need to force a new temporary domain name
+    switch (requestReply.error()) {
+        // if we have a temporary domain with a bad token, we get a 401
+        case QNetworkReply::NetworkError::AuthenticationRequiredError: {
+            static const QString DATA_KEY = "data";
+            static const QString TOKEN_KEY = "api_key";
 
-        QJsonObject jsonObject = QJsonDocument::fromJson(requestReply.readAll()).object();
-        auto tokenFailure = jsonObject[DATA_KEY].toObject()[TOKEN_KEY];
+            QJsonObject jsonObject = QJsonDocument::fromJson(requestReply.readAll()).object();
+            auto tokenFailure = jsonObject[DATA_KEY].toObject()[TOKEN_KEY];
 
-        if (!tokenFailure.isNull()) {
-            qWarning() << "Temporary domain name lacks a valid API key, and is being reset.";
-
-            // halt heartbeats until we have a token
-            _metaverseHeartbeatTimer->deleteLater();
-            _metaverseHeartbeatTimer = nullptr;
-
-            // give up eventually to avoid flooding traffic
-            static const int MAX_ATTEMPTS = 5;
-            static int attempt = 0;
-            if (++attempt < MAX_ATTEMPTS) {
-                // get a new temporary name and token
-                getTemporaryName(true);
+            if (!tokenFailure.isNull()) {
+                qWarning() << "Temporary domain name lacks a valid API key, and is being reset.";
             }
+            break;
         }
+        // if the domain does not (or no longer) exists, we get a 404
+        case QNetworkReply::NetworkError::ContentNotFoundError:
+            qWarning() << "Domain not found, getting a new temporary domain.";
+            break;
+        // otherwise, we erred on something else, and should not force a temporary domain
+        default:
+            return;
+    }
+
+    // halt heartbeats until we have a token
+    _metaverseHeartbeatTimer->deleteLater();
+    _metaverseHeartbeatTimer = nullptr;
+
+    // give up eventually to avoid flooding traffic
+    static const int MAX_ATTEMPTS = 5;
+    static int attempt = 0;
+    if (++attempt < MAX_ATTEMPTS) {
+        // get a new temporary name and token
+        getTemporaryName(true);
+    } else {
+        qWarning() << "Already attempted too many temporary domain requests. Please set a domain ID manually or restart.";
     }
 }