From 9b0ac9d75f59363b6d03f1931ffa46cf8a976f06 Mon Sep 17 00:00:00 2001 From: Kalila L Date: Tue, 15 Sep 2020 21:05:00 -0400 Subject: [PATCH] Update endpoints to be consistent and work with the updates. --- domain-server/src/DomainGatekeeper.cpp | 6 +++--- domain-server/src/DomainServer.cpp | 5 +++-- domain-server/src/DomainServerSettingsManager.cpp | 5 +++-- domain-server/src/DomainServerSettingsManager.h | 3 ++- interface/src/Constants.h | 3 ++- .../src/scripting/ScreenshareScriptingInterface.cpp | 2 +- interface/src/ui/LoginDialog.cpp | 8 ++++---- libraries/entities/src/EntityTree.cpp | 1 + libraries/networking/src/AccountManager.cpp | 6 ++++-- libraries/networking/src/NetworkingConstants.h | 9 +++++---- 10 files changed, 28 insertions(+), 20 deletions(-) diff --git a/domain-server/src/DomainGatekeeper.cpp b/domain-server/src/DomainGatekeeper.cpp index ead4002334..f87a993df1 100644 --- a/domain-server/src/DomainGatekeeper.cpp +++ b/domain-server/src/DomainGatekeeper.cpp @@ -821,7 +821,7 @@ void DomainGatekeeper::requestUserPublicKey(const QString& username, bool isOpti callbackParams.errorCallbackMethod = "publicKeyJSONErrorCallback"; - const QString USER_PUBLIC_KEY_PATH = "api/v1/users/%1/public_key"; + const QString USER_PUBLIC_KEY_PATH = "/api/v1/users/%1/public_key"; qDebug().nospace() << "Requesting " << (isOptimistic ? "optimistic " : " ") << "public key for user " << username; @@ -1048,7 +1048,7 @@ void DomainGatekeeper::getGroupMemberships(const QString& username) { callbackParams.jsonCallbackMethod = "getIsGroupMemberJSONCallback"; callbackParams.errorCallbackMethod = "getIsGroupMemberErrorCallback"; - const QString GET_IS_GROUP_MEMBER_PATH = "api/v1/groups/members/%2"; + const QString GET_IS_GROUP_MEMBER_PATH = "/api/v1/groups/members/%2"; DependencyManager::get()->sendRequest(GET_IS_GROUP_MEMBER_PATH.arg(username), AccountManagerAuth::Required, QNetworkAccessManager::PostOperation, callbackParams, @@ -1114,7 +1114,7 @@ void DomainGatekeeper::getDomainOwnerFriendsList() { callbackParams.jsonCallbackMethod = "getDomainOwnerFriendsListJSONCallback"; callbackParams.errorCallbackMethod = "getDomainOwnerFriendsListErrorCallback"; - const QString GET_FRIENDS_LIST_PATH = "api/v1/user/friends"; + const QString GET_FRIENDS_LIST_PATH = "/api/v1/user/friends"; if (DependencyManager::get()->hasValidAccessToken()) { DependencyManager::get()->sendRequest(GET_FRIENDS_LIST_PATH, AccountManagerAuth::Required, QNetworkAccessManager::GetOperation, callbackParams, QByteArray(), diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 46f8c5bac3..c3f827234a 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -4,6 +4,7 @@ // // Created by Stephen Birarda on 9/26/13. // Copyright 2013 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -1434,7 +1435,7 @@ void DomainServer::sendPendingTransactionsToServer() { transactionCallbackParams.jsonCallbackMethod = "transactionJSONCallback"; while (i != _pendingAssignmentCredits.end()) { - accountManager->sendRequest("api/v1/transactions", + accountManager->sendRequest("/api/v1/transactions", AccountManagerAuth::Required, QNetworkAccessManager::PostOperation, transactionCallbackParams, i.value()->postJson().toJson()); @@ -3725,7 +3726,7 @@ void DomainServer::screensharePresence(QString roomname, QUuid avatarID, int exp callbackData.insert("roomname", roomname); callbackData.insert("avatarID", avatarID.toString()); callbackParams.callbackData = callbackData; - const QString PATH = "api/v1/domains/%1/screenshare"; + const QString PATH = "/api/v1/domains/%1/screenshare"; QString domain_id = uuidStringWithoutCurlyBraces(getID()); QJsonObject json, screenshare; screenshare["username"] = verifiedUsername; diff --git a/domain-server/src/DomainServerSettingsManager.cpp b/domain-server/src/DomainServerSettingsManager.cpp index 95bf4adc65..08cf56b188 100644 --- a/domain-server/src/DomainServerSettingsManager.cpp +++ b/domain-server/src/DomainServerSettingsManager.cpp @@ -4,6 +4,7 @@ // // Created by Stephen Birarda on 2014-06-24. // Copyright 2014 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -1998,7 +1999,7 @@ void DomainServerSettingsManager::apiGetGroupID(const QString& groupName) { callbackParams.jsonCallbackMethod = "apiGetGroupIDJSONCallback"; callbackParams.errorCallbackMethod = "apiGetGroupIDErrorCallback"; - const QString GET_GROUP_ID_PATH = "api/v1/groups/names/%1"; + const QString GET_GROUP_ID_PATH = "/api/v1/groups/names/%1"; DependencyManager::get()->sendRequest(GET_GROUP_ID_PATH.arg(groupName), AccountManagerAuth::Required, QNetworkAccessManager::GetOperation, callbackParams); @@ -2064,7 +2065,7 @@ void DomainServerSettingsManager::apiGetGroupRanks(const QUuid& groupID) { callbackParams.jsonCallbackMethod = "apiGetGroupRanksJSONCallback"; callbackParams.errorCallbackMethod = "apiGetGroupRanksErrorCallback"; - const QString GET_GROUP_RANKS_PATH = "api/v1/groups/%1/ranks"; + const QString GET_GROUP_RANKS_PATH = "/api/v1/groups/%1/ranks"; DependencyManager::get()->sendRequest(GET_GROUP_RANKS_PATH.arg(groupID.toString().mid(1,36)), AccountManagerAuth::Required, QNetworkAccessManager::GetOperation, callbackParams); diff --git a/domain-server/src/DomainServerSettingsManager.h b/domain-server/src/DomainServerSettingsManager.h index 294e441ba4..79a4c3e291 100644 --- a/domain-server/src/DomainServerSettingsManager.h +++ b/domain-server/src/DomainServerSettingsManager.h @@ -4,6 +4,7 @@ // // Created by Stephen Birarda on 2014-06-24. // Copyright 2014 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -108,7 +109,7 @@ public: QStringList getDomainServerGroupNames(); QStringList getDomainServerBlacklistGroupNames(); - // these are used to locally cache the result of calling "api/v1/groups/.../is_member/..." on metaverse's api + // these are used to locally cache the result of calling "/api/v1/groups/.../is_member/..." on metaverse's api void clearGroupMemberships(const QString& name) { _groupMembership[name.toLower()].clear(); } void recordGroupMembership(const QString& name, const QUuid groupID, QUuid rankID); QUuid isGroupMember(const QString& name, const QUuid& groupID); // returns rank or -1 if not a member diff --git a/interface/src/Constants.h b/interface/src/Constants.h index f40c08f558..5a745a8122 100644 --- a/interface/src/Constants.h +++ b/interface/src/Constants.h @@ -4,6 +4,7 @@ // // Created by Gabriel Calero on 9/28/18. // Copyright 2015 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -12,4 +13,4 @@ #pragma once #include -static const QString API_SIGNUP_PATH = "api/v1/users"; +static const QString API_SIGNUP_PATH = "/api/v1/users"; diff --git a/interface/src/scripting/ScreenshareScriptingInterface.cpp b/interface/src/scripting/ScreenshareScriptingInterface.cpp index 3bf8336fe4..7ef437a609 100644 --- a/interface/src/scripting/ScreenshareScriptingInterface.cpp +++ b/interface/src/scripting/ScreenshareScriptingInterface.cpp @@ -108,7 +108,7 @@ void ScreenshareScriptingInterface::requestScreenshareInfo() { // See `DomainServer::screensharePresence()` for more info about that. QString currentDomainID = uuidStringWithoutCurlyBraces(addressManager->getDomainID()); - QString requestURLPath = "api/v1/domains/%1/screenshare"; + QString requestURLPath = "/api/v1/domains/%1/screenshare"; JSONCallbackParameters callbackParams; callbackParams.callbackReceiver = this; callbackParams.jsonCallbackMethod = "handleSuccessfulScreenshareInfoGet"; diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp index b45a62ae3a..58764d958b 100644 --- a/interface/src/ui/LoginDialog.cpp +++ b/interface/src/ui/LoginDialog.cpp @@ -172,7 +172,7 @@ void LoginDialog::linkOculus() { callbackParams.callbackReceiver = this; callbackParams.jsonCallbackMethod = "linkCompleted"; callbackParams.errorCallbackMethod = "linkFailed"; - const QString LINK_OCULUS_PATH = "api/v1/user/oculus/link"; + const QString LINK_OCULUS_PATH = "/api/v1/user/oculus/link"; QJsonObject payload; payload["oculus_nonce"] = nonce; @@ -200,7 +200,7 @@ void LoginDialog::createAccountFromOculus(QString email, QString username, QStri callbackParams.jsonCallbackMethod = "createCompleted"; callbackParams.errorCallbackMethod = "createFailed"; - const QString CREATE_ACCOUNT_FROM_OCULUS_PATH = "api/v1/user/oculus/create"; + const QString CREATE_ACCOUNT_FROM_OCULUS_PATH = "/api/v1/user/oculus/create"; QJsonObject payload; payload["oculus_nonce"] = nonce; @@ -251,7 +251,7 @@ void LoginDialog::linkSteam() { callbackParams.jsonCallbackMethod = "linkCompleted"; callbackParams.errorCallbackMethod = "linkFailed"; - const QString LINK_STEAM_PATH = "api/v1/user/steam/link"; + const QString LINK_STEAM_PATH = "/api/v1/user/steam/link"; QJsonObject payload; payload["steam_auth_ticket"] = QJsonValue::fromVariant(QVariant(ticket)); @@ -278,7 +278,7 @@ void LoginDialog::createAccountFromSteam(QString username) { callbackParams.jsonCallbackMethod = "createCompleted"; callbackParams.errorCallbackMethod = "createFailed"; - const QString CREATE_ACCOUNT_FROM_STEAM_PATH = "api/v1/user/steam/create"; + const QString CREATE_ACCOUNT_FROM_STEAM_PATH = "/api/v1/user/steam/create"; QJsonObject payload; payload["steam_auth_ticket"] = QJsonValue::fromVariant(QVariant(ticket)); diff --git a/libraries/entities/src/EntityTree.cpp b/libraries/entities/src/EntityTree.cpp index 24089aaf71..24b6f7ccd4 100644 --- a/libraries/entities/src/EntityTree.cpp +++ b/libraries/entities/src/EntityTree.cpp @@ -4,6 +4,7 @@ // // Created by Brad Hefta-Gaub on 12/4/13. // Copyright 2013 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp index a942ea5b89..916e8aa01c 100644 --- a/libraries/networking/src/AccountManager.cpp +++ b/libraries/networking/src/AccountManager.cpp @@ -237,6 +237,8 @@ QNetworkRequest AccountManager::createRequest(QString path, AccountManagerAuth:: } // qCDebug(networking) << "Creating request path" << requestURL; + // qCDebug(networking) << "requestURL.isValid()" << requestURL.isValid(); + // qCDebug(networking) << "requestURL.errorString()" << requestURL.errorString(); if (queryStringLocation >= 0) { QUrlQuery query(path.mid(queryStringLocation+1)); @@ -1008,8 +1010,8 @@ void AccountManager::uploadPublicKey() { qCDebug(networking) << "Attempting upload of public key"; // upload the public key so data-web has an up-to-date key - const QString USER_PUBLIC_KEY_UPDATE_PATH = "api/v1/user/public_key"; - const QString DOMAIN_PUBLIC_KEY_UPDATE_PATH = "api/v1/domains/%1/public_key"; + const QString USER_PUBLIC_KEY_UPDATE_PATH = "/api/v1/user/public_key"; + const QString DOMAIN_PUBLIC_KEY_UPDATE_PATH = "/api/v1/domains/%1/public_key"; QString uploadPath; const auto& domainID = _accountInfo.getDomainID(); diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h index 81fdcd8362..7b20ed5359 100644 --- a/libraries/networking/src/NetworkingConstants.h +++ b/libraries/networking/src/NetworkingConstants.h @@ -4,6 +4,7 @@ // // Created by Stephen Birarda on 2015-03-31. // Copyright 2015 High Fidelity, Inc. +// Copyright 2020 Vircadia contributors. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -25,8 +26,8 @@ namespace NetworkingConstants { // if you manually generate a personal access token for the domains scope // at https://staging.highfidelity.com/user/tokens/new?for_domain_server=true - const QUrl METAVERSE_SERVER_URL_STABLE { "https://metaverse.vircadia.com/live" }; - const QUrl METAVERSE_SERVER_URL_STAGING { "https://metaverse.vircadia.com/live" }; + const QUrl METAVERSE_SERVER_URL_STABLE { "https://metaverse.bluestuff.org:9400" }; + const QUrl METAVERSE_SERVER_URL_STAGING { "https://metaverse.bluestuff.org:9400" }; // Web Engine requests to this parent domain have an account authorization header added const QString AUTH_HOSTNAME_BASE = "highfidelity.com"; @@ -44,9 +45,9 @@ namespace NetworkingConstants { #if USE_STABLE_GLOBAL_SERVICES - const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.vircadia.com"; + const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.bluestuff.org"; #else - const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.vircadia.com"; + const QString ICE_SERVER_DEFAULT_HOSTNAME = "ice.bluestuff.org"; #endif const QString MARKETPLACE_CDN_HOSTNAME = "mpassets.highfidelity.com";