Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 14:08:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Misc. tidying

Browse source
This commit is contained in:
David Rowe 2020-08-04 09:15:05 +12:00
parent 257eadc99f
commit 7da91d9557
3 changed files with 2 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
domain-server/src/DomainGatekeeper.cpp
View file

@ -1218,7 +1218,7 @@ Node::LocalID DomainGatekeeper::findOrCreateLocalID(const QUuid& uuid) {
bool DomainGatekeeper::domainHasLogin() { bool DomainGatekeeper::domainHasLogin() {
// The domain may have its own users and groups in a WordPress site. // 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() return _server->_settingsManager.valueForKeyPath(AUTHENTICATION_ENAABLED).toBool()
&& !_server->_settingsManager.valueForKeyPath(AUTHENTICATION_OAUTH2_URL_PATH).toString().isEmpty() && !_server->_settingsManager.valueForKeyPath(AUTHENTICATION_OAUTH2_URL_PATH).toString().isEmpty()
&& !_server->_settingsManager.valueForKeyPath(AUTHENTICATION_WORDPRESS_URL_BASE).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) { 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)) { if (_inFlightDomainUserIdentityRequests.contains(username)) {
// Domain identify request for this username is already in progress. // Domain identify request for this username is already in progress.
return; return;

2
domain-server/src/DomainServerSettingsManager.cpp
View file

@ -2186,7 +2186,7 @@ QList<QUuid> DomainServerSettingsManager::getBlacklistGroupIDs() {
} }
QStringList DomainServerSettingsManager::getDomainGroupNames() { QStringList DomainServerSettingsManager::getDomainGroupNames() {
// Names as configured in domain server; not necessarily mnetaverse groups. // Names as configured in domain server; not necessarily metaverse groups.
QSet<QString> result; QSet<QString> result;
foreach(NodePermissionsKey groupKey, _groupPermissions.keys()) { foreach(NodePermissionsKey groupKey, _groupPermissions.keys()) {
result += _groupPermissions[groupKey]->getID(); result += _groupPermissions[groupKey]->getID();

1
interface/src/Application.cpp
View file

@ -9444,7 +9444,6 @@ void Application::forceDisplayName(const QString& displayName) {
getMyAvatar()->setDisplayName(displayName); getMyAvatar()->setDisplayName(displayName);
} }
void Application::forceLoginWithTokens(const QString& tokens) { void Application::forceLoginWithTokens(const QString& tokens) {
// ####### TODO
DependencyManager::get<AccountManager>()->setAccessTokens(tokens); DependencyManager::get<AccountManager>()->setAccessTokens(tokens);
Setting::Handle<bool>(KEEP_ME_LOGGED_IN_SETTING_NAME, true).set(true); Setting::Handle<bool>(KEEP_ME_LOGGED_IN_SETTING_NAME, true).set(true);
} }