From 7da91d95579d519c88acb6a988c07df9b8b50329 Mon Sep 17 00:00:00 2001 From: David Rowe Date: Tue, 4 Aug 2020 09:15:05 +1200 Subject: [PATCH] Misc. tidying --- domain-server/src/DomainGatekeeper.cpp | 8 +------- domain-server/src/DomainServerSettingsManager.cpp | 2 +- interface/src/Application.cpp | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp index 8d0bc17f00..9019a530d7 100644 --- a/domain-server/src/DomainGatekeeper.cpp +++ b/domain-server/src/DomainGatekeeper.cpp @@ -1218,7 +1218,7 @@ Node::LocalID DomainGatekeeper::findOrCreateLocalID(const QUuid& uuid) { bool DomainGatekeeper::domainHasLogin() { // The domain may have its own users and groups in a WordPress site. - // ####### TODO: Add checks of any further domain server settings used. + // ####### TODO: Add checks of any further domain server settings used. [plugin, groups] return _server->_settingsManager.valueForKeyPath(AUTHENTICATION_ENAABLED).toBool() && !_server->_settingsManager.valueForKeyPath(AUTHENTICATION_OAUTH2_URL_PATH).toString().isEmpty() && !_server->_settingsManager.valueForKeyPath(AUTHENTICATION_WORDPRESS_URL_BASE).toString().isEmpty(); @@ -1226,12 +1226,6 @@ bool DomainGatekeeper::domainHasLogin() { void DomainGatekeeper::requestDomainUser(const QString& username, const QString& accessToken, const QString& refreshToken) { - // ####### TODO: Move this further up the chain such that generates "invalid username or password" condition? - // Don't request identity for the standard psuedo-account-names. - if (NodePermissions::standardNames.contains(username, Qt::CaseInsensitive)) { - return; - } - if (_inFlightDomainUserIdentityRequests.contains(username)) { // Domain identify request for this username is already in progress. return; diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index 30ca15a51e..82ac0b265a 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -2186,7 +2186,7 @@ QList DomainServerSettingsManager::getBlacklistGroupIDs() { } QStringList DomainServerSettingsManager::getDomainGroupNames() { - // Names as configured in domain server; not necessarily mnetaverse groups. + // Names as configured in domain server; not necessarily metaverse groups. QSet result; foreach(NodePermissionsKey groupKey, _groupPermissions.keys()) { result += _groupPermissions[groupKey]->getID(); diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 72e6af74ec..2c6702fbfc 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -9444,7 +9444,6 @@ void Application::forceDisplayName(const QString& displayName) { getMyAvatar()->setDisplayName(displayName); } void Application::forceLoginWithTokens(const QString& tokens) { - // ####### TODO DependencyManager::get()->setAccessTokens(tokens); Setting::Handle(KEEP_ME_LOGGED_IN_SETTING_NAME, true).set(true); }