mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 23:40:11 +02:00
Get basics working
This commit is contained in:
parent
9bb913983d
commit
82252cdc08
3 changed files with 6 additions and 4 deletions
|
@ -514,7 +514,7 @@ SharedNodePointer DomainGatekeeper::processAgentConnectRequest(const NodeConnect
|
||||||
nodeConnection.machineFingerprint);
|
nodeConnection.machineFingerprint);
|
||||||
|
|
||||||
if (!userPerms.can(NodePermissions::Permission::canConnectToDomain)) {
|
if (!userPerms.can(NodePermissions::Permission::canConnectToDomain)) {
|
||||||
if (domainHasLogin() && !domainUsername.isEmpty()) {
|
if (domainHasLogin()) {
|
||||||
sendConnectionDeniedPacket("You lack the required permissions to connect to this domain.",
|
sendConnectionDeniedPacket("You lack the required permissions to connect to this domain.",
|
||||||
nodeConnection.senderSockAddr, DomainHandler::ConnectionRefusedReason::NotAuthorizedDomain);
|
nodeConnection.senderSockAddr, DomainHandler::ConnectionRefusedReason::NotAuthorizedDomain);
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -221,6 +221,8 @@ void DomainHandler::setURLAndID(QUrl domainURL, QUuid domainID) {
|
||||||
QString previousHost = _domainURL.host();
|
QString previousHost = _domainURL.host();
|
||||||
_domainURL = domainURL;
|
_domainURL = domainURL;
|
||||||
|
|
||||||
|
_hasCheckedForDomainAccessToken = false;
|
||||||
|
|
||||||
if (previousHost != domainURL.host()) {
|
if (previousHost != domainURL.host()) {
|
||||||
qCDebug(networking) << "Updated domain hostname to" << domainURL.host();
|
qCDebug(networking) << "Updated domain hostname to" << domainURL.host();
|
||||||
|
|
||||||
|
|
|
@ -486,10 +486,10 @@ void NodeList::sendDomainServerCheckIn() {
|
||||||
// ####### If get into difficulties, could perhaps send domain's username and signature instead of metaverse.
|
// ####### If get into difficulties, could perhaps send domain's username and signature instead of metaverse.
|
||||||
bool domainLoginIsConnected = false;
|
bool domainLoginIsConnected = false;
|
||||||
if (!domainLoginIsConnected) {
|
if (!domainLoginIsConnected) {
|
||||||
if (true) {
|
if (false) { // ####### For testing, false causes user to be considered "not logged in".
|
||||||
packetStream << QString("a@b.c");
|
packetStream << QString("a@b.c");
|
||||||
if (true) {
|
if (true) { // ####### For testing, false is unhandled at this stage.
|
||||||
packetStream << QString("signature");
|
packetStream << QString("signature"); // #######: Consider "logged in" if this is sent during testing.
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue