From 952160874c576ada782bf25c826ea75537e38836 Mon Sep 17 00:00:00 2001
From: Zach Fox <fox@highfidelity.io>
Date: Wed, 18 Oct 2017 11:21:03 -0700
Subject: [PATCH] Stringmatch Domain ID instead of placename for DVV

---
 assignment-client/src/entities/EntityServer.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/assignment-client/src/entities/EntityServer.cpp b/assignment-client/src/entities/EntityServer.cpp
index d23cdd593e..75bdb469a4 100644
--- a/assignment-client/src/entities/EntityServer.cpp
+++ b/assignment-client/src/entities/EntityServer.cpp
@@ -446,7 +446,7 @@ void EntityServer::domainSettingsRequestFailed() {
 void EntityServer::startDynamicDomainVerification() {
     qCDebug(entities) << "Starting Dynamic Domain Verification...";
 
-    QString thisPlaceName = DependencyManager::get<AddressManager>()->getPlaceName();
+    QString thisDomainID = DependencyManager::get<AddressManager>()->getDomainId();
 
     EntityTreePointer tree = std::static_pointer_cast<EntityTree>(_tree);
     QHash<QString, EntityItemID> localMap(tree->getEntityCertificateIDMap());
@@ -486,9 +486,9 @@ void EntityServer::startDynamicDomainVerification() {
                     jsonObject = jsonObject["data"].toObject();
 
                     if (networkReply->error() == QNetworkReply::NoError) {
-                        if (jsonObject["location"].toArray().first().toString() != thisPlaceName) {
-                            qCDebug(entities) << "Entity's cert's place name" << jsonObject["place_name"].toString()
-                                << "isn't the current place name" << thisPlaceName << "; deleting entity" << i.value();
+                        if (jsonObject["domain_id"].toString() != thisDomainID) {
+                            qCDebug(entities) << "Entity's cert's domain ID" << jsonObject["domain_id"].toString()
+                                << "doesn't match the current Domain ID" << thisDomainID << "; deleting entity" << i.value();
                             tree->deleteEntity(i.value(), true);
                         } else {
                             qCDebug(entities) << "Entity passed dynamic domain verification:" << i.value();