diff --git a/interface/resources/qml/LoginDialog/LoggingInBody.qml b/interface/resources/qml/LoginDialog/LoggingInBody.qml index 04af9eadc9..1c8250cfa8 100644 --- a/interface/resources/qml/LoginDialog/LoggingInBody.qml +++ b/interface/resources/qml/LoginDialog/LoggingInBody.qml @@ -4,6 +4,7 @@ // Created by Wayne Chen on 10/18/18 // Copyright 2018 High Fidelity, Inc. // Copyright 2020 Vircadia contributors. +// Copyright 2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -377,13 +378,13 @@ Item { } } - function onHandleLoginCompleted(): { + function onHandleLoginCompleted() { console.log("Login Succeeded"); loggingInBody.loadingSuccess(); } function onHandleLoginFailed() { - console.log("Login Failed") + console.log("Login Failed"); loggingInSpinner.visible = false; loggingInGlyph.visible = false; var errorString = ""; diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp index 3ae0277e13..9454853418 100644 --- a/libraries/networking/src/AccountManager.cpp +++ b/libraries/networking/src/AccountManager.cpp @@ -4,7 +4,7 @@ // // Created by Stephen Birarda on 2/18/2014. // Copyright 2014 High Fidelity, Inc. -// Copyright 2023 Overte e.V. +// Copyright 2023-2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -696,7 +696,8 @@ void AccountManager::setAccessTokens(const QString& response) { if (!rootObject.contains("access_token") || !rootObject.contains("expires_in") || !rootObject.contains("token_type")) { // TODO: error handling - malformed token response - qCDebug(networking) << "Received a response for password grant that is missing one or more expected values."; + qCWarning(networking) << "Error setting access token. Received a response for password grant that is missing one or more expected values."; + qCWarning(networking) << "Response:" << QJsonDocument(rootObject).toJson(QJsonDocument::Compact); } else { // clear the path from the response URL so we have the right root URL for this access token QUrl rootURL = rootObject.contains("url") ? rootObject["url"].toString() : _authURL; @@ -714,7 +715,7 @@ void AccountManager::setAccessTokens(const QString& response) { } } else { // TODO: error handling - qCDebug(networking) << "Error in response for password grant -" << rootObject["error_description"].toString(); + qCWarning(networking) << "Error in response for password grant -" << rootObject["error"].toString(); emit loginFailed(); } } @@ -731,7 +732,8 @@ void AccountManager::requestAccessTokenFinished() { if (!rootObject.contains("access_token") || !rootObject.contains("expires_in") || !rootObject.contains("token_type")) { // TODO: error handling - malformed token response - qCDebug(networking) << "Received a response for password grant that is missing one or more expected values."; + qCWarning(networking) << "Error requesting access token. Received a response for password grant that is missing one or more expected values."; + qCWarning(networking) << "Response:" << QJsonDocument(rootObject).toJson(QJsonDocument::Compact); } else { // clear the path from the response URL so we have the right root URL for this access token QUrl rootURL = requestReply->url(); @@ -750,7 +752,7 @@ void AccountManager::requestAccessTokenFinished() { } } else { // TODO: error handling - qCDebug(networking) << "Error in response for password grant -" << rootObject["error_description"].toString(); + qCWarning(networking) << "Error in response for password grant -" << rootObject["error"].toString(); emit loginFailed(); } } diff --git a/scripts/system/create/entityProperties/html/entityProperties.html b/scripts/system/create/entityProperties/html/entityProperties.html index a85e3b00ef..5fd7892fae 100644 --- a/scripts/system/create/entityProperties/html/entityProperties.html +++ b/scripts/system/create/entityProperties/html/entityProperties.html @@ -5,7 +5,7 @@ // Created by Ryan Huffman on 13 Nov 2014 // Copyright 2014 High Fidelity, Inc. // Copyright 2020 Vircadia contributors. -// Copyright 2022 Overte e.V. +// Copyright 2022-2024 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -63,131 +63,298 @@