From 257eadc99f84b97fe6a6cc4cfc1db0b0011cdec1 Mon Sep 17 00:00:00 2001
From: David Rowe <david@ctrlaltstudio.com>
Date: Mon, 3 Aug 2020 16:12:13 +1200
Subject: [PATCH] "Unable connect to this domain" message box after login if
can't connect
---
domain-server/src/DomainGatekeeper.cpp | 4 ++--
interface/src/ConnectionMonitor.cpp | 6 ++++++
libraries/networking/src/AccountManager.cpp | 4 +++-
libraries/networking/src/DomainHandler.cpp | 4 +++-
4 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp
index 4b0eaab662..8d0bc17f00 100644
--- a/domain-server/src/DomainGatekeeper.cpp
+++ b/domain-server/src/DomainGatekeeper.cpp
@@ -553,10 +553,10 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
if (domainAuthURLVariant.canConvert<QString>()) {
domainAuthURL = domainAuthURLVariant.toString();
}
- sendConnectionDeniedPacket("You lack the required permissions to connect to this domain.",
+ sendConnectionDeniedPacket("You lack the required domain permissions to connect to this domain.",
nodeConnection.senderSockAddr, DomainHandler::ConnectionRefusedReason::NotAuthorizedDomain, domainAuthURL);
} else {
- sendConnectionDeniedPacket("You lack the required permissions to connect to this domain.",
+ sendConnectionDeniedPacket("You lack the required metaverse permissions to connect to this domain.",
nodeConnection.senderSockAddr, DomainHandler::ConnectionRefusedReason::NotAuthorizedMetaverse);
}
#ifdef WANT_DEBUG
diff --git a/interface/src/ConnectionMonitor.cpp b/interface/src/ConnectionMonitor.cpp
index 33d9fddc1b..070015f05b 100644
--- a/interface/src/ConnectionMonitor.cpp
+++ b/interface/src/ConnectionMonitor.cpp
@@ -14,8 +14,10 @@
#include "Application.h"
#include "ui/DialogsManager.h"
+#include <AccountManager.h>
#include <DependencyManager.h>
#include <DomainHandler.h>
+#include <DomainAccountManager.h>
#include <AddressManager.h>
#include <NodeList.h>
@@ -34,6 +36,10 @@ void ConnectionMonitor::init() {
connect(&domainHandler, &DomainHandler::domainConnectionRefused, this, &ConnectionMonitor::stopTimer);
connect(&domainHandler, &DomainHandler::redirectToErrorDomainURL, this, &ConnectionMonitor::stopTimer);
connect(this, &ConnectionMonitor::setRedirectErrorState, &domainHandler, &DomainHandler::setRedirectErrorState);
+ auto accountManager = DependencyManager::get<AccountManager>();
+ connect(accountManager.data(), &AccountManager::loginComplete, this, &ConnectionMonitor::startTimer);
+ auto domainAccountManager = DependencyManager::get<DomainAccountManager>();
+ connect(domainAccountManager.data(), &DomainAccountManager::loginComplete, this, &ConnectionMonitor::startTimer);
_timer.setSingleShot(true);
if (!domainHandler.isConnected()) {
diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp
index 83c0fd28dd..5589defd80 100644
--- a/libraries/networking/src/AccountManager.cpp
+++ b/libraries/networking/src/AccountManager.cpp
@@ -508,7 +508,9 @@ bool AccountManager::checkAndSignalForAccessToken() {
if (!hasToken) {
// emit a signal so somebody can call back to us and request an access token given a username and password
- emit authRequired();
+
+ // Dialog can be hidden immediately after showing if we've just teleported to the domain, unless the signal is delayed.
+ QTimer::singleShot(500, this, [this] { emit this->authRequired(); });
}
return hasToken;
diff --git a/libraries/networking/src/DomainHandler.cpp b/libraries/networking/src/DomainHandler.cpp
index 0a61036b96..7049f2aef6 100644
--- a/libraries/networking/src/DomainHandler.cpp
+++ b/libraries/networking/src/DomainHandler.cpp
@@ -550,7 +550,9 @@ void DomainHandler::processDomainServerConnectionDeniedPacket(QSharedPointer<Rec
// output to the log so the user knows they got a denied connection request
// and check and signal for an access token so that we can make sure they are logged in
- qCWarning(networking) << "The domain-server denied a connection request: " << reasonMessage << " extraInfo:" << extraInfo;
+ QString sanitizedExtraInfo = extraInfo.toLower().startsWith("http") ? "" : extraInfo; // Don't log URLs.
+ qCWarning(networking) << "The domain-server denied a connection request: " << reasonMessage
+ << " extraInfo:" << sanitizedExtraInfo;
if (!_domainConnectionRefusals.contains(reasonMessage)) {
_domainConnectionRefusals.insert(reasonMessage);