Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-06 19:59:28 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

reset to temp domain after logout

Browse source
This commit is contained in:
Zach Pomerantz 2016-06-23 19:38:23 -07:00
parent 1de1c632af
commit 13310923c4
2 changed files with 12 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
domain-server/resources/web/settings/js/settings.js
View file

@ -457,6 +457,8 @@ function disonnectHighFidelityAccount() {
}, function(){ }, function(){
// we need to post to settings to clear the access-token // we need to post to settings to clear the access-token
$(Settings.ACCESS_TOKEN_SELECTOR).val('').change(); $(Settings.ACCESS_TOKEN_SELECTOR).val('').change();
// reset the domain id to get a new temporary name
$(Settings.DOMAIN_ID_SELECTOR).val('').change();
saveSettings(); saveSettings();
}); });
} }

19
domain-server/src/DomainServer.cpp
View file

@ -111,12 +111,6 @@ DomainServer::DomainServer(int argc, char* argv[]) :
return; return;
} }
// check for the temporary name parameter
const QString GET_TEMPORARY_NAME_SWITCH = "--get-temp-name";
if (args.contains(GET_TEMPORARY_NAME_SWITCH)) {
getTemporaryName();
}
setupNodeListAndAssignments(); setupNodeListAndAssignments();
setupAutomaticNetworking(); setupAutomaticNetworking();
if (!getID().isNull()) { if (!getID().isNull()) {
@ -125,6 +119,12 @@ DomainServer::DomainServer(int argc, char* argv[]) :
sendHeartbeatToMetaverse(); sendHeartbeatToMetaverse();
} }
// check for the temporary name parameter
const QString GET_TEMPORARY_NAME_SWITCH = "--get-temp-name";
if (args.contains(GET_TEMPORARY_NAME_SWITCH)) {
getTemporaryName();
}
_gatekeeper.preloadAllowedUserPublicKeys(); // so they can connect on first request _gatekeeper.preloadAllowedUserPublicKeys(); // so they can connect on first request
_metadata = new DomainMetadata(this); _metadata = new DomainMetadata(this);
@ -251,12 +251,13 @@ void DomainServer::getTemporaryName(bool force) {
// check if we already have a domain ID // check if we already have a domain ID
const QVariant* idValueVariant = valueForKeyPath(_settingsManager.getSettingsMap(), METAVERSE_DOMAIN_ID_KEY_PATH); const QVariant* idValueVariant = valueForKeyPath(_settingsManager.getSettingsMap(), METAVERSE_DOMAIN_ID_KEY_PATH);
qInfo() << "Requesting temporary domain name";
if (idValueVariant) { if (idValueVariant) {
qWarning() << "Temporary domain name requested but a domain ID is already present in domain-server settings."; qDebug() << "A domain ID is already present in domain-server settings:" << idValueVariant->toString();
if (force) { if (force) {
qWarning() << "Temporary domain name will be requested to replace it."; qDebug() << "Requesting temporary domain name to replace current ID:" << getID();
} else { } else {
qWarning() << "Temporary domain name will not be requested."; qInfo() << "Abandoning request of temporary domain name.";
return; return;
} }
} }