diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp index ea7f0d2d91..350eda7bf0 100644 --- a/domain-server/src/DomainGatekeeper.cpp +++ b/domain-server/src/DomainGatekeeper.cpp @@ -514,7 +514,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect nodeConnection.machineFingerprint); if (!userPerms.can(NodePermissions::Permission::canConnectToDomain)) { - if (domainHasLogin() && !domainUsername.isEmpty()) { + if (domainHasLogin()) { sendConnectionDeniedPacket("You lack the required permissions to connect to this domain.", nodeConnection.senderSockAddr, DomainHandler::ConnectionRefusedReason::NotAuthorizedDomain); } else { diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp index ceb2928c93..8a8ffe9f8a 100644 --- a/libraries/networking/src/DomainHandler.cpp +++ b/libraries/networking/src/DomainHandler.cpp @@ -221,6 +221,8 @@ void DomainHandler::setURLAndID(QUrl domainURL, QUuid domainID) { QString previousHost = _domainURL.host(); _domainURL = domainURL; + _hasCheckedForDomainAccessToken = false; + if (previousHost != domainURL.host()) { qCDebug(networking) << "Updated domain hostname to" << domainURL.host(); diff --git a/libraries/networking/src/NodeList.cpp b/libraries/networking/src/NodeList.cpp index 63c2e9c902..79b939d409 100644 --- a/libraries/networking/src/NodeList.cpp +++ b/libraries/networking/src/NodeList.cpp @@ -486,10 +486,10 @@ void NodeList::sendDomainServerCheckIn() { // ####### If get into difficulties, could perhaps send domain's username and signature instead of metaverse. bool domainLoginIsConnected = false; if (!domainLoginIsConnected) { - if (true) { + if (false) { // ####### For testing, false causes user to be considered "not logged in". packetStream << QString("a@b.c"); - if (true) { - packetStream << QString("signature"); + if (true) { // ####### For testing, false is unhandled at this stage. + packetStream << QString("signature"); // #######: Consider "logged in" if this is sent during testing. } } }