From c64c2e17c8daf636027bafd07eb13f55f1a16505 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 24 Oct 2017 10:52:27 -0700 Subject: [PATCH 1/9] First pass at consolidation --- assignment-client/src/octree/OctreeServer.cpp | 1 - domain-server/src/DomainServer.cpp | 5 ++--- ice-server/src/IceServer.cpp | 4 ++-- interface/resources/qml/AddressBarDialog.qml | 2 +- interface/resources/qml/hifi/NameCard.qml | 4 ++-- .../qml/hifi/tablet/TabletAddressDialog.qml | 2 +- interface/src/Application.cpp | 3 +-- interface/src/commerce/Ledger.cpp | 4 +--- interface/src/networking/CloseEventSender.cpp | 5 ++--- interface/src/ui/AddressBarDialog.cpp | 2 +- interface/src/ui/AddressBarDialog.h | 8 +++---- interface/src/ui/LoginDialog.cpp | 1 - interface/src/ui/PreferencesDialog.cpp | 1 - .../ui/overlays/ContextOverlayInterface.cpp | 6 ++---- libraries/fbx/src/FSTReader.cpp | 1 - libraries/networking/src/AccountManager.cpp | 3 +-- libraries/networking/src/AccountManager.h | 5 +++++ libraries/networking/src/AddressManager.cpp | 5 ----- libraries/networking/src/AddressManager.h | 4 ---- .../networking/src/NetworkingConstants.h | 21 ------------------- .../src/OAuthNetworkAccessManager.cpp | 3 +-- .../script-engine/src/XMLHttpRequestClass.cpp | 7 +++---- libraries/ui/src/ui/types/RequestFilters.cpp | 4 ++-- scripts/system/makeUserConnection.js | 4 ++-- scripts/system/pal.js | 2 +- scripts/system/snapshot.js | 2 +- scripts/system/tablet-goto.js | 4 ++-- tools/ac-client/src/ACClientApp.cpp | 3 +-- tools/atp-client/src/ATPClientApp.cpp | 3 +-- 29 files changed, 39 insertions(+), 80 deletions(-) delete mode 100644 libraries/networking/src/NetworkingConstants.h diff --git a/assignment-client/src/octree/OctreeServer.cpp b/assignment-client/src/octree/OctreeServer.cpp index 4a1aade59d..c535c48dda 100644 --- a/assignment-client/src/octree/OctreeServer.cpp +++ b/assignment-client/src/octree/OctreeServer.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include #include diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 436f49c7ca..28100efd2d 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -31,7 +31,6 @@ #include #include #include -#include #include #include #include @@ -340,12 +339,12 @@ bool DomainServer::optionallySetupOAuth() { const QVariantMap& settingsMap = _settingsManager.getSettingsMap(); _oauthProviderURL = QUrl(settingsMap.value(OAUTH_PROVIDER_URL_OPTION).toString()); + auto accountManager = DependencyManager::get(); // if we don't have an oauth provider URL then we default to the default node auth url if (_oauthProviderURL.isEmpty()) { - _oauthProviderURL = NetworkingConstants::METAVERSE_SERVER_URL; + _oauthProviderURL = accountManager->getMetaverseServerURL(); } - auto accountManager = DependencyManager::get(); accountManager->setAuthURL(_oauthProviderURL); _oauthClientID = settingsMap.value(OAUTH_CLIENT_ID_OPTION).toString(); diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp index f8bf1f62ae..a2e900e8d2 100644 --- a/ice-server/src/IceServer.cpp +++ b/ice-server/src/IceServer.cpp @@ -18,9 +18,9 @@ #include #include +#include #include #include -#include #include #include @@ -208,7 +208,7 @@ void IceServer::requestDomainPublicKey(const QUuid& domainID) { // send a request to the metaverse API for the public key for this domain auto& networkAccessManager = NetworkAccessManager::getInstance(); - QUrl publicKeyURL { NetworkingConstants::METAVERSE_SERVER_URL }; + QUrl publicKeyURL { DependencyManager::get()->getMetaverseServerURL() }; QString publicKeyPath = QString("/api/v1/domains/%1/public_key").arg(uuidStringWithoutCurlyBraces(domainID)); publicKeyURL.setPath(publicKeyPath); diff --git a/interface/resources/qml/AddressBarDialog.qml b/interface/resources/qml/AddressBarDialog.qml index c19e16cd36..60d2bacc62 100644 --- a/interface/resources/qml/AddressBarDialog.qml +++ b/interface/resources/qml/AddressBarDialog.qml @@ -87,7 +87,7 @@ Window { onReceivedHifiSchemeURL: resetAfterTeleport(); // Update location after using back and forward buttons. - onMetaverseServerUrlChanged: updateLocationTextTimer.start(); + onHostChanged: updateLocationTextTimer.start(); ListModel { id: suggestions } diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml index 65517f5a73..fa73bc5135 100644 --- a/interface/resources/qml/hifi/NameCard.qml +++ b/interface/resources/qml/hifi/NameCard.qml @@ -17,7 +17,7 @@ import "../styles-uit" import "../controls-uit" as HifiControls import "toolbars" -// references Users, UserActivityLogger, MyAvatar, Vec3, Quat, AddressManager from root context +// references Users, UserActivityLogger, MyAvatar, Vec3, Quat, AddressManager, Account from root context Item { id: thisNameCard @@ -30,7 +30,7 @@ Item { // Properties property string profileUrl: ""; - property string defaultBaseUrl: AddressManager.metaverseServerUrl; + property string defaultBaseUrl: Account.metaverseServerURL; property string connectionStatus : "" property string uuid: "" property string displayName: "" diff --git a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml index e8752b01e7..4d9a83817a 100644 --- a/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml +++ b/interface/resources/qml/hifi/tablet/TabletAddressDialog.qml @@ -134,7 +134,7 @@ StackView { bottom: parent.bottom } - onMetaverseServerUrlChanged: updateLocationTextTimer.start(); + onHostChanged: updateLocationTextTimer.start(); Rectangle { id: navBar width: parent.width diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 6e7a405181..b3f31c6c81 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -94,7 +94,6 @@ #include #include #include -#include #include #include #include @@ -960,7 +959,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo // set the account manager's root URL and trigger a login request if we don't have the access token accountManager->setIsAgent(true); - accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL); + accountManager->setAuthURL(accountManager->getMetaverseServerURL()); auto addressManager = DependencyManager::get(); diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp index 80e599fb24..bd7668cf32 100644 --- a/interface/src/commerce/Ledger.cpp +++ b/interface/src/commerce/Ledger.cpp @@ -16,7 +16,6 @@ #include "Wallet.h" #include "Ledger.h" #include "CommerceLogging.h" -#include // inventory answers {status: 'success', data: {assets: [{id: "guid", title: "name", preview: "url"}....]}} // balance answers {status: 'success', data: {balance: integer}} @@ -121,7 +120,6 @@ QString nameFromKey(const QString& key, const QStringList& publicKeys) { return "Someone"; } -static const QString MARKETPLACE_ITEMS_BASE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace/items/"; void Ledger::historySuccess(QNetworkReply& reply) { // here we send a historyResult with some extra stuff in it // Namely, the styled text we'd like to show. The issue is the @@ -154,7 +152,7 @@ void Ledger::historySuccess(QNetworkReply& reply) { } } else { coloredQuantityAndAssetTitle = QString("\"") + coloredQuantityAndAssetTitle + diff --git a/interface/src/networking/CloseEventSender.cpp b/interface/src/networking/CloseEventSender.cpp index de8bd897b2..41e1fb8bef 100644 --- a/interface/src/networking/CloseEventSender.cpp +++ b/interface/src/networking/CloseEventSender.cpp @@ -17,7 +17,6 @@ #include #include #include -#include #include #include #include @@ -27,13 +26,13 @@ QNetworkRequest createNetworkRequest() { QNetworkRequest request; + auto accountManager = DependencyManager::get(); - QUrl requestURL = NetworkingConstants::METAVERSE_SERVER_URL; + QUrl requestURL = accountManager->getMetaverseServerURL(); requestURL.setPath(USER_ACTIVITY_URL); request.setUrl(requestURL); - auto accountManager = DependencyManager::get(); if (accountManager->hasValidAccessToken()) { request.setRawHeader(ACCESS_TOKEN_AUTHORIZATION_HEADER, diff --git a/interface/src/ui/AddressBarDialog.cpp b/interface/src/ui/AddressBarDialog.cpp index d7b59ba912..8b5e255b06 100644 --- a/interface/src/ui/AddressBarDialog.cpp +++ b/interface/src/ui/AddressBarDialog.cpp @@ -39,7 +39,7 @@ AddressBarDialog::AddressBarDialog(QQuickItem* parent) : OffscreenQmlDialog(pare }); _backEnabled = !(DependencyManager::get()->getBackStack().isEmpty()); _forwardEnabled = !(DependencyManager::get()->getForwardStack().isEmpty()); - connect(addressManager.data(), &AddressManager::hostChanged, this, &AddressBarDialog::metaverseServerUrlChanged); + connect(addressManager.data(), &AddressManager::hostChanged, this, &AddressBarDialog::hostChanged); connect(DependencyManager::get().data(), &DialogsManager::setUseFeed, this, &AddressBarDialog::setUseFeed); connect(qApp, &Application::receivedHifiSchemeURL, this, &AddressBarDialog::receivedHifiSchemeURL); } diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h index 921e808abb..48e702f5bf 100644 --- a/interface/src/ui/AddressBarDialog.h +++ b/interface/src/ui/AddressBarDialog.h @@ -13,8 +13,8 @@ #ifndef hifi_AddressBarDialog_h #define hifi_AddressBarDialog_h +#include #include -#include class AddressBarDialog : public OffscreenQmlDialog { Q_OBJECT @@ -22,7 +22,7 @@ class AddressBarDialog : public OffscreenQmlDialog { Q_PROPERTY(bool backEnabled READ backEnabled NOTIFY backEnabledChanged) Q_PROPERTY(bool forwardEnabled READ forwardEnabled NOTIFY forwardEnabledChanged) Q_PROPERTY(bool useFeed READ useFeed WRITE setUseFeed NOTIFY useFeedChanged) - Q_PROPERTY(QString metaverseServerUrl READ metaverseServerUrl NOTIFY metaverseServerUrlChanged) + Q_PROPERTY(QString metaverseServerUrl READ metaverseServerUrl) public: AddressBarDialog(QQuickItem* parent = nullptr); @@ -30,14 +30,14 @@ public: bool forwardEnabled() { return _forwardEnabled; } bool useFeed() { return _useFeed; } void setUseFeed(bool useFeed) { if (_useFeed != useFeed) { _useFeed = useFeed; emit useFeedChanged(); } } - QString metaverseServerUrl() { return NetworkingConstants::METAVERSE_SERVER_URL.toString(); } + QString metaverseServerUrl() { return DependencyManager::get()->getMetaverseServerURL().toString(); } signals: void backEnabledChanged(); void forwardEnabledChanged(); void useFeedChanged(); void receivedHifiSchemeURL(const QString& url); - void metaverseServerUrlChanged(); + void hostChanged(); protected: void displayAddressOfflineMessage(); diff --git a/interface/src/ui/LoginDialog.cpp b/interface/src/ui/LoginDialog.cpp index 515215a8d3..7ce2a0146d 100644 --- a/interface/src/ui/LoginDialog.cpp +++ b/interface/src/ui/LoginDialog.cpp @@ -16,7 +16,6 @@ #include #include -#include #include #include #include diff --git a/interface/src/ui/PreferencesDialog.cpp b/interface/src/ui/PreferencesDialog.cpp index b3bd6fbd34..023d3e6e17 100644 --- a/interface/src/ui/PreferencesDialog.cpp +++ b/interface/src/ui/PreferencesDialog.cpp @@ -11,7 +11,6 @@ #include #include #include -#include #include #include #include diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp index 8cbb214857..969b5e47c5 100644 --- a/interface/src/ui/overlays/ContextOverlayInterface.cpp +++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp @@ -12,8 +12,8 @@ #include "ContextOverlayInterface.h" #include "Application.h" +#include #include -#include #ifndef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) @@ -260,8 +260,6 @@ void ContextOverlayInterface::openInspectionCertificate() { } } -static const QString MARKETPLACE_BASE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace/items/"; - void ContextOverlayInterface::openMarketplace() { // lets open the tablet and go to the current item in // the marketplace (if the current entity has a @@ -269,7 +267,7 @@ void ContextOverlayInterface::openMarketplace() { if (!_currentEntityWithContextOverlay.isNull() && _entityMarketplaceID.length() > 0) { auto tablet = dynamic_cast(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system")); // construct the url to the marketplace item - QString url = MARKETPLACE_BASE_URL + _entityMarketplaceID; + QString url = DependencyManager::get()->getMetaverseServerURL().toString() + "/marketplace/items/" + _entityMarketplaceID; QString MARKETPLACES_INJECT_SCRIPT_PATH = "file:///" + qApp->applicationDirPath() + "/scripts/system/html/js/marketplacesInject.js"; tablet->gotoWebScreen(url, MARKETPLACES_INJECT_SCRIPT_PATH); _hmdScriptingInterface->openTablet(); diff --git a/libraries/fbx/src/FSTReader.cpp b/libraries/fbx/src/FSTReader.cpp index 3f0a629c8c..cc4a919445 100644 --- a/libraries/fbx/src/FSTReader.cpp +++ b/libraries/fbx/src/FSTReader.cpp @@ -15,7 +15,6 @@ #include #include -#include #include #include "FSTReader.h" diff --git a/libraries/networking/src/AccountManager.cpp b/libraries/networking/src/AccountManager.cpp index fa6b49597d..f6264a19c4 100644 --- a/libraries/networking/src/AccountManager.cpp +++ b/libraries/networking/src/AccountManager.cpp @@ -28,7 +28,6 @@ #include -#include "NetworkingConstants.h" #include "NetworkLogging.h" #include "NodeList.h" #include "udt/PacketHeaders.h" @@ -240,7 +239,7 @@ void AccountManager::sendRequest(const QString& path, QUrl requestURL = _authURL; if (requestURL.isEmpty()) { // Assignment client doesn't set _authURL. - requestURL = NetworkingConstants::METAVERSE_SERVER_URL; + requestURL = getMetaverseServerURL(); } if (path.startsWith("/")) { diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index b37846ec1b..aec75a9084 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -58,6 +58,8 @@ using UserAgentGetter = std::function; const auto DEFAULT_USER_AGENT_GETTER = []() -> QString { return HIGH_FIDELITY_USER_AGENT; }; +const QUrl METAVERSE_SERVER_URL = "https://metaverse.highfidelity.com"; + class AccountManager : public QObject, public Dependency { Q_OBJECT public: @@ -96,6 +98,9 @@ public: void setTemporaryDomain(const QUuid& domainID, const QString& key); const QString& getTemporaryDomainKey(const QUuid& domainID) { return _accountInfo.getTemporaryDomainKey(domainID); } + Q_PROPERTY(QUrl metaverseServerURL READ getMetaverseServerURL) + QUrl getMetaverseServerURL() { return METAVERSE_SERVER_URL; } + public slots: void requestAccessToken(const QString& login, const QString& password); void requestAccessTokenWithSteam(QByteArray authSessionTicket); diff --git a/libraries/networking/src/AddressManager.cpp b/libraries/networking/src/AddressManager.cpp index 2376a3b2b6..1a51440e91 100644 --- a/libraries/networking/src/AddressManager.cpp +++ b/libraries/networking/src/AddressManager.cpp @@ -24,7 +24,6 @@ #include "AddressManager.h" #include "NodeList.h" -#include "NetworkingConstants.h" #include "NetworkLogging.h" #include "UserActivityLogger.h" #include "udt/PacketHeaders.h" @@ -770,10 +769,6 @@ QString AddressManager::getDomainId() const { return DependencyManager::get()->getDomainHandler().getUUID().toString(); } -const QUrl AddressManager::getMetaverseServerUrl() const { - return NetworkingConstants::METAVERSE_SERVER_URL; -} - void AddressManager::handleShareableNameAPIResponse(QNetworkReply& requestReply) { // make sure that this response is for the domain we're currently connected to auto domainID = DependencyManager::get()->getDomainHandler().getUUID(); diff --git a/libraries/networking/src/AddressManager.h b/libraries/networking/src/AddressManager.h index 83eedfc82f..366fc5dfab 100644 --- a/libraries/networking/src/AddressManager.h +++ b/libraries/networking/src/AddressManager.h @@ -41,7 +41,6 @@ class AddressManager : public QObject, public Dependency { Q_PROPERTY(QString pathname READ currentPath) Q_PROPERTY(QString placename READ getPlaceName) Q_PROPERTY(QString domainId READ getDomainId) - Q_PROPERTY(QUrl metaverseServerUrl READ getMetaverseServerUrl NOTIFY metaverseServerUrlChanged) public: Q_INVOKABLE QString protocolVersion(); using PositionGetter = std::function; @@ -71,7 +70,6 @@ public: const QUuid& getRootPlaceID() const { return _rootPlaceID; } const QString& getPlaceName() const { return _shareablePlaceName.isEmpty() ? _placeName : _shareablePlaceName; } QString getDomainId() const; - const QUrl getMetaverseServerUrl() const; const QString& getHost() const { return _host; } @@ -123,8 +121,6 @@ signals: void goBackPossible(bool isPossible); void goForwardPossible(bool isPossible); - void metaverseServerUrlChanged(); - protected: AddressManager(); private slots: diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h deleted file mode 100644 index a512ae8887..0000000000 --- a/libraries/networking/src/NetworkingConstants.h +++ /dev/null @@ -1,21 +0,0 @@ -// -// NetworkingConstants.h -// libraries/networking/src -// -// Created by Stephen Birarda on 2015-03-31. -// Copyright 2015 High Fidelity, Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// - -#ifndef hifi_NetworkingConstants_h -#define hifi_NetworkingConstants_h - -#include - -namespace NetworkingConstants { - const QUrl METAVERSE_SERVER_URL = QUrl("https://metaverse.highfidelity.com"); -} - -#endif // hifi_NetworkingConstants_h diff --git a/libraries/networking/src/OAuthNetworkAccessManager.cpp b/libraries/networking/src/OAuthNetworkAccessManager.cpp index 15d5acbc67..42b8f16575 100644 --- a/libraries/networking/src/OAuthNetworkAccessManager.cpp +++ b/libraries/networking/src/OAuthNetworkAccessManager.cpp @@ -15,7 +15,6 @@ #include "AccountManager.h" #include "LimitedNodeList.h" -#include "NetworkingConstants.h" #include "SharedUtil.h" #include "OAuthNetworkAccessManager.h" @@ -35,7 +34,7 @@ QNetworkReply* OAuthNetworkAccessManager::createRequest(QNetworkAccessManager::O auto accountManager = DependencyManager::get(); if (accountManager->hasValidAccessToken() - && req.url().host() == NetworkingConstants::METAVERSE_SERVER_URL.host()) { + && req.url().host() == accountManager->getMetaverseServerURL().host()) { QNetworkRequest authenticatedRequest(req); authenticatedRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); authenticatedRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT); diff --git a/libraries/script-engine/src/XMLHttpRequestClass.cpp b/libraries/script-engine/src/XMLHttpRequestClass.cpp index 1d3c8fda32..c8d518e6c9 100644 --- a/libraries/script-engine/src/XMLHttpRequestClass.cpp +++ b/libraries/script-engine/src/XMLHttpRequestClass.cpp @@ -17,13 +17,10 @@ #include #include -#include #include "ScriptEngine.h" #include "XMLHttpRequestClass.h" -const QString METAVERSE_API_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/api/"; - Q_DECLARE_METATYPE(QByteArray*) XMLHttpRequestClass::XMLHttpRequestClass(QScriptEngine* engine) : @@ -140,7 +137,9 @@ void XMLHttpRequestClass::open(const QString& method, const QString& url, bool a _url.setUrl(url); _async = async; - if (url.toLower().left(METAVERSE_API_URL.length()) == METAVERSE_API_URL) { + auto metaverseApiUrl = DependencyManager::get()->getMetaverseServerURL().toString() + "/api/"; + + if (url.toLower().left(metaverseApiUrl.length()) == metaverseApiUrl) { auto accountManager = DependencyManager::get(); if (accountManager->hasValidAccessToken()) { diff --git a/libraries/ui/src/ui/types/RequestFilters.cpp b/libraries/ui/src/ui/types/RequestFilters.cpp index f9686d2311..1823921545 100644 --- a/libraries/ui/src/ui/types/RequestFilters.cpp +++ b/libraries/ui/src/ui/types/RequestFilters.cpp @@ -10,7 +10,6 @@ // #include "RequestFilters.h" -#include "NetworkingConstants.h" #include #include @@ -26,9 +25,10 @@ namespace { }; const auto& scheme = url.scheme(); const auto& host = url.host(); + auto metaverseServerURL = DependencyManager::get()->getMetaverseServerURL(); return (scheme == "https" && HF_HOSTS.contains(host)) || - ((scheme == NetworkingConstants::METAVERSE_SERVER_URL.scheme()) && (host == NetworkingConstants::METAVERSE_SERVER_URL.host())); + ((scheme == metaverseServerURL.scheme()) && (host == metaverseServerURL.host())); } bool isScript(const QString filename) { diff --git a/scripts/system/makeUserConnection.js b/scripts/system/makeUserConnection.js index bfad959ffc..7dddd46562 100644 --- a/scripts/system/makeUserConnection.js +++ b/scripts/system/makeUserConnection.js @@ -444,7 +444,7 @@ }, WAITING_INTERVAL); } - var pollCount = 0, requestUrl = location.metaverseServerUrl + '/api/v1/user/connection_request'; + var pollCount = 0, requestUrl = Account.metaverseServerURL + '/api/v1/user/connection_request'; // As currently implemented, we select the closest waiting avatar (if close enough) and send // them a connectionRequest. If nobody is close enough we send a waiting message, and wait for a // connectionRequest. If the 2 people who want to connect are both somewhat out of range when they @@ -569,7 +569,7 @@ // IWBNI we also did some fail sound/visual effect. Window.makeConnection(false, result.connection); if (Account.isLoggedIn()) { // Give extra failure info - request(location.metaverseServerUrl + '/api/v1/users/' + Account.username + '/location', function (error, response) { + request(Account.metaverseServerURL + '/api/v1/users/' + Account.username + '/location', function (error, response) { var message = ''; if (error || response.status !== 'success') { message = 'Unable to get location.'; diff --git a/scripts/system/pal.js b/scripts/system/pal.js index 2a8a89ae7d..44ff7c2acd 100644 --- a/scripts/system/pal.js +++ b/scripts/system/pal.js @@ -334,7 +334,7 @@ function updateUser(data) { // User management services // // These are prototype versions that will be changed when the back end changes. -var METAVERSE_BASE = location.metaverseServerUrl; +var METAVERSE_BASE = Account.metaverseServerURL; function requestJSON(url, callback) { // callback(data) if successfull. Logs otherwise. request({ diff --git a/scripts/system/snapshot.js b/scripts/system/snapshot.js index 8f08b29cff..9afdb4ec53 100644 --- a/scripts/system/snapshot.js +++ b/scripts/system/snapshot.js @@ -35,7 +35,7 @@ var imageData = []; var storyIDsToMaybeDelete = []; var shareAfterLogin = false; var snapshotToShareAfterLogin = []; -var METAVERSE_BASE = location.metaverseServerUrl; +var METAVERSE_BASE = Account.metaverseServerURL; var isLoggedIn; var numGifSnapshotUploadsPending = 0; var numStillSnapshotUploadsPending = 0; diff --git a/scripts/system/tablet-goto.js b/scripts/system/tablet-goto.js index 96ed3e3f59..929c6e0e5c 100644 --- a/scripts/system/tablet-goto.js +++ b/scripts/system/tablet-goto.js @@ -115,7 +115,7 @@ var stories = {}, pingPong = false; function expire(id) { var options = { - uri: location.metaverseServerUrl + '/api/v1/user_stories/' + id, + uri: Account.metaverseServerURL + '/api/v1/user_stories/' + id, method: 'PUT', json: true, body: {expire: "true"} @@ -139,7 +139,7 @@ 'protocol=' + encodeURIComponent(location.protocolVersion()), 'per_page=' + count ]; - var url = location.metaverseServerUrl + '/api/v1/user_stories?' + options.join('&'); + var url = Account.metaverseServerURL + '/api/v1/user_stories?' + options.join('&'); request({ uri: url }, function (error, data) { diff --git a/tools/ac-client/src/ACClientApp.cpp b/tools/ac-client/src/ACClientApp.cpp index e00560158f..f3ea9b7348 100644 --- a/tools/ac-client/src/ACClientApp.cpp +++ b/tools/ac-client/src/ACClientApp.cpp @@ -14,7 +14,6 @@ #include #include #include -#include #include #include #include @@ -106,7 +105,7 @@ ACClientApp::ACClientApp(int argc, char* argv[]) : auto accountManager = DependencyManager::get(); accountManager->setIsAgent(true); - accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL); + accountManager->setAuthURL(accountManager->getMetaverseServerURL()); auto nodeList = DependencyManager::get(); diff --git a/tools/atp-client/src/ATPClientApp.cpp b/tools/atp-client/src/ATPClientApp.cpp index c5edf27b67..85aee10d76 100644 --- a/tools/atp-client/src/ATPClientApp.cpp +++ b/tools/atp-client/src/ATPClientApp.cpp @@ -17,7 +17,6 @@ #include #include -#include #include #include #include @@ -145,7 +144,7 @@ ATPClientApp::ATPClientApp(int argc, char* argv[]) : auto accountManager = DependencyManager::get(); accountManager->setIsAgent(true); - accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL); + accountManager->setAuthURL(accountManager->getMetaverseServerURL()); auto nodeList = DependencyManager::get(); From 48c8d52c09db48e617e356f0a360497b44484260 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 24 Oct 2017 13:21:03 -0700 Subject: [PATCH 2/9] Cleanup --- interface/resources/qml/hifi/NameCard.qml | 7 +++---- interface/resources/qml/hifi/Pal.qml | 3 --- interface/src/scripting/AccountScriptingInterface.h | 5 +++++ libraries/networking/src/AccountManager.h | 5 +++-- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/interface/resources/qml/hifi/NameCard.qml b/interface/resources/qml/hifi/NameCard.qml index fa73bc5135..fcfff02b72 100644 --- a/interface/resources/qml/hifi/NameCard.qml +++ b/interface/resources/qml/hifi/NameCard.qml @@ -30,7 +30,6 @@ Item { // Properties property string profileUrl: ""; - property string defaultBaseUrl: Account.metaverseServerURL; property string connectionStatus : "" property string uuid: "" property string displayName: "" @@ -59,7 +58,7 @@ Item { clip: true Image { id: userImage - source: profileUrl !== "" ? ((0 === profileUrl.indexOf("http")) ? profileUrl : (defaultBaseUrl + profileUrl)) : ""; + source: profileUrl !== "" ? ((0 === profileUrl.indexOf("http")) ? profileUrl : (Account.metaverseServerURL + profileUrl)) : ""; mipmap: true; // Anchors anchors.fill: parent @@ -95,7 +94,7 @@ Item { enabled: (selected && activeTab == "nearbyTab") || isMyCard; hoverEnabled: enabled onClicked: { - userInfoViewer.url = defaultBaseUrl + "/users/" + userName; + userInfoViewer.url = Account.metaverseServerURL + "/users/" + userName; userInfoViewer.visible = true; } onEntered: infoHoverImage.visible = true; @@ -366,7 +365,7 @@ Item { enabled: selected hoverEnabled: true onClicked: { - userInfoViewer.url = defaultBaseUrl + "/users/" + userName; + userInfoViewer.url = Account.metaverseServerURL + "/users/" + userName; userInfoViewer.visible = true; } onEntered: { diff --git a/interface/resources/qml/hifi/Pal.qml b/interface/resources/qml/hifi/Pal.qml index c98cfba1ba..89f18e5ce2 100644 --- a/interface/resources/qml/hifi/Pal.qml +++ b/interface/resources/qml/hifi/Pal.qml @@ -23,9 +23,6 @@ import "../controls" as HifiControls Rectangle { id: pal; - // Size - width: parent.width; - height: parent.height; // Style color: "#E3E3E3"; // Properties diff --git a/interface/src/scripting/AccountScriptingInterface.h b/interface/src/scripting/AccountScriptingInterface.h index 4f87e02dce..4ff250e926 100644 --- a/interface/src/scripting/AccountScriptingInterface.h +++ b/interface/src/scripting/AccountScriptingInterface.h @@ -25,6 +25,11 @@ class AccountScriptingInterface : public QObject { * @property username {String} username if user is logged in, otherwise it returns "Unknown user" */ +public: + + Q_PROPERTY(QUrl metaverseServerURL READ getMetaverseServerURL) + QUrl getMetaverseServerURL() { return DependencyManager::get()->getMetaverseServerURL(); } + signals: /**jsdoc diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index aec75a9084..09c38e2d3e 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -58,7 +58,9 @@ using UserAgentGetter = std::function; const auto DEFAULT_USER_AGENT_GETTER = []() -> QString { return HIGH_FIDELITY_USER_AGENT; }; -const QUrl METAVERSE_SERVER_URL = "https://metaverse.highfidelity.com"; +const QUrl METAVERSE_SERVER_URL_STAGING = "https://staging.highfidelity.com"; +const QUrl METAVERSE_SERVER_URL_STABLE = "https://metaverse.highfidelity.com"; +const QUrl METAVERSE_SERVER_URL = METAVERSE_SERVER_URL_STABLE; class AccountManager : public QObject, public Dependency { Q_OBJECT @@ -98,7 +100,6 @@ public: void setTemporaryDomain(const QUuid& domainID, const QString& key); const QString& getTemporaryDomainKey(const QUuid& domainID) { return _accountInfo.getTemporaryDomainKey(domainID); } - Q_PROPERTY(QUrl metaverseServerURL READ getMetaverseServerURL) QUrl getMetaverseServerURL() { return METAVERSE_SERVER_URL; } public slots: From 4b50454104ca527d046e75043ba9408456eda04d Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 24 Oct 2017 14:13:14 -0700 Subject: [PATCH 3/9] Missed a spot --- scripts/system/marketplaces/marketplace.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/marketplaces/marketplace.js b/scripts/system/marketplaces/marketplace.js index f365ca5d4c..d90695c767 100644 --- a/scripts/system/marketplaces/marketplace.js +++ b/scripts/system/marketplaces/marketplace.js @@ -15,7 +15,7 @@ Script.include("../libraries/WebTablet.js"); var toolIconUrl = Script.resolvePath("../assets/images/tools/"); -var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace"; +var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace"; var marketplaceWindow = new OverlayWebWindow({ title: "Marketplace", source: "about:blank", From b092862b03db8c5fc468ba41755175b066d75039 Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 24 Oct 2017 14:22:38 -0700 Subject: [PATCH 4/9] Missed another spot --- domain-server/resources/web/settings/js/settings.js | 4 +++- libraries/networking/src/AccountManager.h | 3 +++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js index 14347b6be1..ecd67e30eb 100644 --- a/domain-server/resources/web/settings/js/settings.js +++ b/domain-server/resources/web/settings/js/settings.js @@ -1,6 +1,8 @@ var Settings = { showAdvanced: false, - METAVERSE_URL: 'https://metaverse.highfidelity.com', + METAVERSE_URL_STABLE: 'https://metaverse.highfidelity.com', + METAVERSE_URL_STAGING: 'https://staging.highfidelity.com', + METAVERSE_URL: METAVERSE_URL_STABLE, ADVANCED_CLASS: 'advanced-setting', DEPRECATED_CLASS: 'deprecated-setting', TRIGGER_CHANGE_CLASS: 'trigger-change', diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index 09c38e2d3e..3dae03200e 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -58,6 +58,9 @@ using UserAgentGetter = std::function; const auto DEFAULT_USER_AGENT_GETTER = []() -> QString { return HIGH_FIDELITY_USER_AGENT; }; +// If you want to use STAGING instead of STABLE, +// don't forget to ALSO change the Domain Server Metaverse Server URL, which is at the top of: +// \domain-server\resources\web\settings\js\settings.js const QUrl METAVERSE_SERVER_URL_STAGING = "https://staging.highfidelity.com"; const QUrl METAVERSE_SERVER_URL_STABLE = "https://metaverse.highfidelity.com"; const QUrl METAVERSE_SERVER_URL = METAVERSE_SERVER_URL_STABLE; From 7998984d8e7e337978d77134193549eda4da28cf Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 24 Oct 2017 14:30:47 -0700 Subject: [PATCH 5/9] Missed tons of spots! --- .../resources/qml/dialogs/preferences/AvatarBrowser.qml | 2 +- .../qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml | 2 +- .../tabletWindows/preferences/TabletAvatarBrowser.qml | 2 +- libraries/ui/src/ui/types/RequestFilters.cpp | 4 ++-- scripts/system/commerce/wallet.js | 2 +- scripts/system/directory.js | 2 +- scripts/system/edit.js | 2 +- scripts/system/html/js/marketplacesInject.js | 6 ++++-- scripts/system/marketplaces/marketplaces.js | 6 ++++-- scripts/system/tablet-users.js | 2 +- scripts/tutorials/getDomainMetadata.js | 2 +- 11 files changed, 18 insertions(+), 14 deletions(-) diff --git a/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml b/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml index e2a012ad46..5949adffca 100644 --- a/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml +++ b/interface/resources/qml/dialogs/preferences/AvatarBrowser.qml @@ -33,7 +33,7 @@ Window { BaseWebView { id: webview - url: "https://metaverse.highfidelity.com/marketplace?category=avatars" + url: Account.metaverseServerURL + "/marketplace?category=avatars" focus: true anchors { diff --git a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml index cc316a70e9..8b3f017fd2 100644 --- a/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml +++ b/interface/resources/qml/hifi/commerce/common/EmulatedMarketplaceHeader.qml @@ -25,7 +25,7 @@ Item { HifiConstants { id: hifi; } id: root; - property string referrerURL: "https://metaverse.highfidelity.com/marketplace?"; + property string referrerURL: (Account.metaverseServerURL + "/marketplace?"); readonly property int additionalDropdownHeight: usernameDropdown.height - myUsernameButton.anchors.bottomMargin; property alias usernameDropdownVisible: usernameDropdown.visible; diff --git a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml index cab76bf818..34d587a3f5 100644 --- a/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml +++ b/interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletAvatarBrowser.qml @@ -31,7 +31,7 @@ Item { BaseWebView { id: webview - url: "https://metaverse.highfidelity.com/marketplace?category=avatars" + url: (Account.metaverseServerURL + "/marketplace?category=avatars)" focus: true anchors { diff --git a/libraries/ui/src/ui/types/RequestFilters.cpp b/libraries/ui/src/ui/types/RequestFilters.cpp index 1823921545..10c0eef58d 100644 --- a/libraries/ui/src/ui/types/RequestFilters.cpp +++ b/libraries/ui/src/ui/types/RequestFilters.cpp @@ -19,13 +19,13 @@ namespace { bool isAuthableHighFidelityURL(const QUrl& url) { + auto metaverseServerURL = DependencyManager::get()->getMetaverseServerURL(); static const QStringList HF_HOSTS = { "highfidelity.com", "highfidelity.io", - "metaverse.highfidelity.com", "metaverse.highfidelity.io" + metaverseServerURL.toString(), "metaverse.highfidelity.io" }; const auto& scheme = url.scheme(); const auto& host = url.host(); - auto metaverseServerURL = DependencyManager::get()->getMetaverseServerURL(); return (scheme == "https" && HF_HOSTS.contains(host)) || ((scheme == metaverseServerURL.scheme()) && (host == metaverseServerURL.host())); diff --git a/scripts/system/commerce/wallet.js b/scripts/system/commerce/wallet.js index 04b67ec14f..8e4a3215fd 100644 --- a/scripts/system/commerce/wallet.js +++ b/scripts/system/commerce/wallet.js @@ -16,7 +16,7 @@ (function () { // BEGIN LOCAL_SCOPE Script.include("/~/system/libraries/accountUtils.js"); - var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace"; + var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace"; // Function Name: onButtonClicked() // diff --git a/scripts/system/directory.js b/scripts/system/directory.js index ac65615a68..8b9ec17f05 100644 --- a/scripts/system/directory.js +++ b/scripts/system/directory.js @@ -15,7 +15,7 @@ Script.include([ var toolIconUrl = Script.resolvePath("assets/images/tools/"); -var DIRECTORY_WINDOW_URL = "https://metaverse.highfidelity.com/directory"; +var DIRECTORY_WINDOW_URL = Account.metaverseServerURL + "/directory"; var directoryWindow = new OverlayWebWindow({ title: 'Directory', source: "about:blank", diff --git a/scripts/system/edit.js b/scripts/system/edit.js index 2ae1e142a0..7b8ec90b7b 100644 --- a/scripts/system/edit.js +++ b/scripts/system/edit.js @@ -163,7 +163,7 @@ var importingSVOTextOverlay = Overlays.addOverlay("text", { visible: false }); -var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace"; +var MARKETPLACE_URL = Account.metaverseServerURL + "/marketplace"; var marketplaceWindow = new OverlayWebWindow({ title: 'Marketplace', source: "about:blank", diff --git a/scripts/system/html/js/marketplacesInject.js b/scripts/system/html/js/marketplacesInject.js index 29bbb4576e..8deb5c0bbd 100644 --- a/scripts/system/html/js/marketplacesInject.js +++ b/scripts/system/html/js/marketplacesInject.js @@ -29,6 +29,7 @@ var commerceMode = false; var userIsLoggedIn = false; var walletNeedsSetup = false; + var metaverseServerURL = "https://metaverse.highfidelity.com"; function injectCommonCode(isDirectoryPage) { @@ -57,7 +58,7 @@ ); // Footer. - var isInitialHiFiPage = location.href === "https://metaverse.highfidelity.com/marketplace?"; + var isInitialHiFiPage = location.href === metaverseServerURL + "/marketplace?"; $("body").append( '
' + (!isInitialHiFiPage ? '' : '') + @@ -69,7 +70,7 @@ // Footer actions. $("#back-button").on("click", function () { - (document.referrer !== "") ? window.history.back() : window.location = "https://metaverse.highfidelity.com/marketplace?"; + (document.referrer !== "") ? window.history.back() : window.location = (metaverseServerURL + "/marketplace?"); }); $("#all-markets").on("click", function () { EventBridge.emitWebEvent(GOTO_DIRECTORY); @@ -641,6 +642,7 @@ commerceMode = !!parsedJsonMessage.data.commerceMode; userIsLoggedIn = !!parsedJsonMessage.data.userIsLoggedIn; walletNeedsSetup = !!parsedJsonMessage.data.walletNeedsSetup; + metaverseServerURL = parsedJsonMessage.data.metaverseServerURL; injectCode(); } } diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js index 6880d10c18..10b52d0f6a 100644 --- a/scripts/system/marketplaces/marketplaces.js +++ b/scripts/system/marketplaces/marketplaces.js @@ -15,7 +15,8 @@ Script.include("../libraries/WebTablet.js"); - var MARKETPLACE_URL = "https://metaverse.highfidelity.com/marketplace"; + var METAVERSE_SERVER_URL = Account.metaverseServerURL; + var MARKETPLACE_URL = METAVERSE_SERVER_URL + "/marketplace"; var MARKETPLACE_URL_INITIAL = MARKETPLACE_URL + "?"; // Append "?" to signal injected script that it's the initial page. var MARKETPLACES_URL = Script.resolvePath("../html/marketplaces.html"); var MARKETPLACES_INJECT_SCRIPT_URL = Script.resolvePath("../html/js/marketplacesInject.js"); @@ -155,7 +156,8 @@ data: { commerceMode: Settings.getValue("commerce", false), userIsLoggedIn: Account.loggedIn, - walletNeedsSetup: Wallet.walletStatus === 1 + walletNeedsSetup: Wallet.walletStatus === 1, + metaverseServerURL: Account.metaverseServerURL } })); } diff --git a/scripts/system/tablet-users.js b/scripts/system/tablet-users.js index 591537f9bc..6f37cd55eb 100644 --- a/scripts/system/tablet-users.js +++ b/scripts/system/tablet-users.js @@ -14,7 +14,7 @@ var USERS_URL = "https://hifi-content.s3.amazonaws.com/faye/tablet-dev/users.html"; var HOME_BUTTON_TEXTURE = Script.resourcesPath() + "meshes/tablet-with-home-button.fbx/tablet-with-home-button.fbm/button-root.png"; - var FRIENDS_WINDOW_URL = "https://metaverse.highfidelity.com/user/friends"; + var FRIENDS_WINDOW_URL = Account.metaverseServerURL + "/user/friends"; var FRIENDS_WINDOW_WIDTH = 290; var FRIENDS_WINDOW_HEIGHT = 500; var FRIENDS_WINDOW_TITLE = "Add/Remove Friends"; diff --git a/scripts/tutorials/getDomainMetadata.js b/scripts/tutorials/getDomainMetadata.js index 54c356ae7b..1af801f2d6 100644 --- a/scripts/tutorials/getDomainMetadata.js +++ b/scripts/tutorials/getDomainMetadata.js @@ -6,7 +6,7 @@ // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -var SERVER = 'https://metaverse.highfidelity.com/api/v1'; +var SERVER = Account.metaverseServerURL + '/api/v1'; var OVERLAY = null; From d7bdbfb37bae8b95652eea01411c43bfa459d2ef Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 25 Oct 2017 09:53:59 -0700 Subject: [PATCH 6/9] Fix unix build errors --- libraries/networking/src/AccountManager.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index 3dae03200e..a0abde26c9 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -61,8 +61,8 @@ const auto DEFAULT_USER_AGENT_GETTER = []() -> QString { return HIGH_FIDELITY_US // If you want to use STAGING instead of STABLE, // don't forget to ALSO change the Domain Server Metaverse Server URL, which is at the top of: // \domain-server\resources\web\settings\js\settings.js -const QUrl METAVERSE_SERVER_URL_STAGING = "https://staging.highfidelity.com"; -const QUrl METAVERSE_SERVER_URL_STABLE = "https://metaverse.highfidelity.com"; +const QUrl METAVERSE_SERVER_URL_STAGING("https://staging.highfidelity.com"); +const QUrl METAVERSE_SERVER_URL_STABLE("https://metaverse.highfidelity.com"); const QUrl METAVERSE_SERVER_URL = METAVERSE_SERVER_URL_STABLE; class AccountManager : public QObject, public Dependency { From 3f0108528d17632921f42cd448e8ca3e1f773d3b Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Wed, 25 Oct 2017 15:19:56 -0700 Subject: [PATCH 7/9] Remove unnecessary newline --- scripts/system/marketplaces/marketplaces.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/system/marketplaces/marketplaces.js b/scripts/system/marketplaces/marketplaces.js index 8fc50059ab..f0044084f6 100644 --- a/scripts/system/marketplaces/marketplaces.js +++ b/scripts/system/marketplaces/marketplaces.js @@ -136,7 +136,7 @@ function setCertificateInfo(currentEntityWithContextOverlay, itemCertificateId) { wireEventBridge(true); - var certificateId = itemCertificateId || (Entities.getEntityProperties(currentEntityWithContextOverlay, ['certificateID']).certificateID + "\n"); + var certificateId = itemCertificateId || (Entities.getEntityProperties(currentEntityWithContextOverlay, ['certificateID']).certificateID); tablet.sendToQml({ method: 'inspectionCertificate_setCertificateId', certificateId: certificateId From d24f241b8896a253a31795259e0c8b57fcc0333f Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 26 Oct 2017 13:31:15 -0700 Subject: [PATCH 8/9] Fix silly javascript error --- domain-server/resources/web/settings/js/settings.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/domain-server/resources/web/settings/js/settings.js b/domain-server/resources/web/settings/js/settings.js index ecd67e30eb..c4da828bb1 100644 --- a/domain-server/resources/web/settings/js/settings.js +++ b/domain-server/resources/web/settings/js/settings.js @@ -1,8 +1,8 @@ var Settings = { showAdvanced: false, - METAVERSE_URL_STABLE: 'https://metaverse.highfidelity.com', - METAVERSE_URL_STAGING: 'https://staging.highfidelity.com', - METAVERSE_URL: METAVERSE_URL_STABLE, + // STABLE METAVERSE_URL: https://metaverse.highfidelity.com + // STAGING METAVERSE_URL: https://staging.highfidelity.com + METAVERSE_URL: 'https://metaverse.highfidelity.com', ADVANCED_CLASS: 'advanced-setting', DEPRECATED_CLASS: 'deprecated-setting', TRIGGER_CHANGE_CLASS: 'trigger-change', From 002141724bc14ef9615c4d21195cd2b27f107eda Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Thu, 26 Oct 2017 14:12:36 -0700 Subject: [PATCH 9/9] Return to using NetworkingConstants --- domain-server/src/DomainServer.cpp | 5 ++-- ice-server/src/IceServer.cpp | 4 +-- interface/src/Application.cpp | 3 ++- interface/src/commerce/Ledger.cpp | 4 ++- interface/src/networking/CloseEventSender.cpp | 5 ++-- interface/src/ui/AddressBarDialog.h | 4 +-- .../ui/overlays/ContextOverlayInterface.cpp | 6 +++-- libraries/networking/src/AccountManager.h | 10 ++----- .../networking/src/NetworkingConstants.h | 26 +++++++++++++++++++ .../src/OAuthNetworkAccessManager.cpp | 3 ++- .../script-engine/src/XMLHttpRequestClass.cpp | 7 ++--- libraries/ui/src/ui/types/RequestFilters.cpp | 3 ++- tools/ac-client/src/ACClientApp.cpp | 3 ++- tools/atp-client/src/ATPClientApp.cpp | 3 ++- 14 files changed, 59 insertions(+), 27 deletions(-) create mode 100644 libraries/networking/src/NetworkingConstants.h diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 28100efd2d..436f49c7ca 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -339,12 +340,12 @@ bool DomainServer::optionallySetupOAuth() { const QVariantMap& settingsMap = _settingsManager.getSettingsMap(); _oauthProviderURL = QUrl(settingsMap.value(OAUTH_PROVIDER_URL_OPTION).toString()); - auto accountManager = DependencyManager::get(); // if we don't have an oauth provider URL then we default to the default node auth url if (_oauthProviderURL.isEmpty()) { - _oauthProviderURL = accountManager->getMetaverseServerURL(); + _oauthProviderURL = NetworkingConstants::METAVERSE_SERVER_URL; } + auto accountManager = DependencyManager::get(); accountManager->setAuthURL(_oauthProviderURL); _oauthClientID = settingsMap.value(OAUTH_CLIENT_ID_OPTION).toString(); diff --git a/ice-server/src/IceServer.cpp b/ice-server/src/IceServer.cpp index a2e900e8d2..f8bf1f62ae 100644 --- a/ice-server/src/IceServer.cpp +++ b/ice-server/src/IceServer.cpp @@ -18,9 +18,9 @@ #include #include -#include #include #include +#include #include #include @@ -208,7 +208,7 @@ void IceServer::requestDomainPublicKey(const QUuid& domainID) { // send a request to the metaverse API for the public key for this domain auto& networkAccessManager = NetworkAccessManager::getInstance(); - QUrl publicKeyURL { DependencyManager::get()->getMetaverseServerURL() }; + QUrl publicKeyURL { NetworkingConstants::METAVERSE_SERVER_URL }; QString publicKeyPath = QString("/api/v1/domains/%1/public_key").arg(uuidStringWithoutCurlyBraces(domainID)); publicKeyURL.setPath(publicKeyPath); diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index 5e41886905..f2bb52ea47 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -94,6 +94,7 @@ #include #include #include +#include #include #include #include @@ -960,7 +961,7 @@ Application::Application(int& argc, char** argv, QElapsedTimer& startupTimer, bo // set the account manager's root URL and trigger a login request if we don't have the access token accountManager->setIsAgent(true); - accountManager->setAuthURL(accountManager->getMetaverseServerURL()); + accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL); auto addressManager = DependencyManager::get(); diff --git a/interface/src/commerce/Ledger.cpp b/interface/src/commerce/Ledger.cpp index bd7668cf32..80e599fb24 100644 --- a/interface/src/commerce/Ledger.cpp +++ b/interface/src/commerce/Ledger.cpp @@ -16,6 +16,7 @@ #include "Wallet.h" #include "Ledger.h" #include "CommerceLogging.h" +#include // inventory answers {status: 'success', data: {assets: [{id: "guid", title: "name", preview: "url"}....]}} // balance answers {status: 'success', data: {balance: integer}} @@ -120,6 +121,7 @@ QString nameFromKey(const QString& key, const QStringList& publicKeys) { return "Someone"; } +static const QString MARKETPLACE_ITEMS_BASE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace/items/"; void Ledger::historySuccess(QNetworkReply& reply) { // here we send a historyResult with some extra stuff in it // Namely, the styled text we'd like to show. The issue is the @@ -152,7 +154,7 @@ void Ledger::historySuccess(QNetworkReply& reply) { } } else { coloredQuantityAndAssetTitle = QString("\"") + coloredQuantityAndAssetTitle + diff --git a/interface/src/networking/CloseEventSender.cpp b/interface/src/networking/CloseEventSender.cpp index 41e1fb8bef..de8bd897b2 100644 --- a/interface/src/networking/CloseEventSender.cpp +++ b/interface/src/networking/CloseEventSender.cpp @@ -17,6 +17,7 @@ #include #include #include +#include #include #include #include @@ -26,13 +27,13 @@ QNetworkRequest createNetworkRequest() { QNetworkRequest request; - auto accountManager = DependencyManager::get(); - QUrl requestURL = accountManager->getMetaverseServerURL(); + QUrl requestURL = NetworkingConstants::METAVERSE_SERVER_URL; requestURL.setPath(USER_ACTIVITY_URL); request.setUrl(requestURL); + auto accountManager = DependencyManager::get(); if (accountManager->hasValidAccessToken()) { request.setRawHeader(ACCESS_TOKEN_AUTHORIZATION_HEADER, diff --git a/interface/src/ui/AddressBarDialog.h b/interface/src/ui/AddressBarDialog.h index 48e702f5bf..cab533cce3 100644 --- a/interface/src/ui/AddressBarDialog.h +++ b/interface/src/ui/AddressBarDialog.h @@ -13,8 +13,8 @@ #ifndef hifi_AddressBarDialog_h #define hifi_AddressBarDialog_h -#include #include +#include class AddressBarDialog : public OffscreenQmlDialog { Q_OBJECT @@ -30,7 +30,7 @@ public: bool forwardEnabled() { return _forwardEnabled; } bool useFeed() { return _useFeed; } void setUseFeed(bool useFeed) { if (_useFeed != useFeed) { _useFeed = useFeed; emit useFeedChanged(); } } - QString metaverseServerUrl() { return DependencyManager::get()->getMetaverseServerURL().toString(); } + QString metaverseServerUrl() { return NetworkingConstants::METAVERSE_SERVER_URL.toString(); } signals: void backEnabledChanged(); diff --git a/interface/src/ui/overlays/ContextOverlayInterface.cpp b/interface/src/ui/overlays/ContextOverlayInterface.cpp index 08e8e734c0..70b75a0b17 100644 --- a/interface/src/ui/overlays/ContextOverlayInterface.cpp +++ b/interface/src/ui/overlays/ContextOverlayInterface.cpp @@ -12,8 +12,8 @@ #include "ContextOverlayInterface.h" #include "Application.h" -#include #include +#include #ifndef MIN #define MIN(a,b) ((a) < (b) ? (a) : (b)) @@ -263,6 +263,8 @@ void ContextOverlayInterface::openInspectionCertificate() { } } +static const QString MARKETPLACE_BASE_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/marketplace/items/"; + void ContextOverlayInterface::openMarketplace() { // lets open the tablet and go to the current item in // the marketplace (if the current entity has a @@ -270,7 +272,7 @@ void ContextOverlayInterface::openMarketplace() { if (!_currentEntityWithContextOverlay.isNull() && _entityMarketplaceID.length() > 0) { auto tablet = dynamic_cast(_tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system")); // construct the url to the marketplace item - QString url = DependencyManager::get()->getMetaverseServerURL().toString() + "/marketplace/items/" + _entityMarketplaceID; + QString url = MARKETPLACE_BASE_URL + _entityMarketplaceID; QString MARKETPLACES_INJECT_SCRIPT_PATH = "file:///" + qApp->applicationDirPath() + "/scripts/system/html/js/marketplacesInject.js"; tablet->gotoWebScreen(url, MARKETPLACES_INJECT_SCRIPT_PATH); _hmdScriptingInterface->openTablet(); diff --git a/libraries/networking/src/AccountManager.h b/libraries/networking/src/AccountManager.h index a0abde26c9..7d97687d0b 100644 --- a/libraries/networking/src/AccountManager.h +++ b/libraries/networking/src/AccountManager.h @@ -18,6 +18,7 @@ #include #include +#include "NetworkingConstants.h" #include "NetworkAccessManager.h" #include "DataServerAccountInfo.h" @@ -58,13 +59,6 @@ using UserAgentGetter = std::function; const auto DEFAULT_USER_AGENT_GETTER = []() -> QString { return HIGH_FIDELITY_USER_AGENT; }; -// If you want to use STAGING instead of STABLE, -// don't forget to ALSO change the Domain Server Metaverse Server URL, which is at the top of: -// \domain-server\resources\web\settings\js\settings.js -const QUrl METAVERSE_SERVER_URL_STAGING("https://staging.highfidelity.com"); -const QUrl METAVERSE_SERVER_URL_STABLE("https://metaverse.highfidelity.com"); -const QUrl METAVERSE_SERVER_URL = METAVERSE_SERVER_URL_STABLE; - class AccountManager : public QObject, public Dependency { Q_OBJECT public: @@ -103,7 +97,7 @@ public: void setTemporaryDomain(const QUuid& domainID, const QString& key); const QString& getTemporaryDomainKey(const QUuid& domainID) { return _accountInfo.getTemporaryDomainKey(domainID); } - QUrl getMetaverseServerURL() { return METAVERSE_SERVER_URL; } + QUrl getMetaverseServerURL() { return NetworkingConstants::METAVERSE_SERVER_URL; } public slots: void requestAccessToken(const QString& login, const QString& password); diff --git a/libraries/networking/src/NetworkingConstants.h b/libraries/networking/src/NetworkingConstants.h new file mode 100644 index 0000000000..0bb0cee5d2 --- /dev/null +++ b/libraries/networking/src/NetworkingConstants.h @@ -0,0 +1,26 @@ +// +// NetworkingConstants.h +// libraries/networking/src +// +// Created by Stephen Birarda on 2015-03-31. +// Copyright 2015 High Fidelity, Inc. +// +// Distributed under the Apache License, Version 2.0. +// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html +// + +#ifndef hifi_NetworkingConstants_h +#define hifi_NetworkingConstants_h + +#include + +namespace NetworkingConstants { + // If you want to use STAGING instead of STABLE, + // don't forget to ALSO change the Domain Server Metaverse Server URL, which is at the top of: + // \domain-server\resources\web\settings\js\settings.js + const QUrl METAVERSE_SERVER_URL_STABLE("https://metaverse.highfidelity.com"); + const QUrl METAVERSE_SERVER_URL_STAGING("https://staging.highfidelity.com"); + const QUrl METAVERSE_SERVER_URL = METAVERSE_SERVER_URL_STABLE; +} + +#endif // hifi_NetworkingConstants_h diff --git a/libraries/networking/src/OAuthNetworkAccessManager.cpp b/libraries/networking/src/OAuthNetworkAccessManager.cpp index 42b8f16575..15d5acbc67 100644 --- a/libraries/networking/src/OAuthNetworkAccessManager.cpp +++ b/libraries/networking/src/OAuthNetworkAccessManager.cpp @@ -15,6 +15,7 @@ #include "AccountManager.h" #include "LimitedNodeList.h" +#include "NetworkingConstants.h" #include "SharedUtil.h" #include "OAuthNetworkAccessManager.h" @@ -34,7 +35,7 @@ QNetworkReply* OAuthNetworkAccessManager::createRequest(QNetworkAccessManager::O auto accountManager = DependencyManager::get(); if (accountManager->hasValidAccessToken() - && req.url().host() == accountManager->getMetaverseServerURL().host()) { + && req.url().host() == NetworkingConstants::METAVERSE_SERVER_URL.host()) { QNetworkRequest authenticatedRequest(req); authenticatedRequest.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true); authenticatedRequest.setHeader(QNetworkRequest::UserAgentHeader, HIGH_FIDELITY_USER_AGENT); diff --git a/libraries/script-engine/src/XMLHttpRequestClass.cpp b/libraries/script-engine/src/XMLHttpRequestClass.cpp index c8d518e6c9..1d3c8fda32 100644 --- a/libraries/script-engine/src/XMLHttpRequestClass.cpp +++ b/libraries/script-engine/src/XMLHttpRequestClass.cpp @@ -17,10 +17,13 @@ #include #include +#include #include "ScriptEngine.h" #include "XMLHttpRequestClass.h" +const QString METAVERSE_API_URL = NetworkingConstants::METAVERSE_SERVER_URL.toString() + "/api/"; + Q_DECLARE_METATYPE(QByteArray*) XMLHttpRequestClass::XMLHttpRequestClass(QScriptEngine* engine) : @@ -137,9 +140,7 @@ void XMLHttpRequestClass::open(const QString& method, const QString& url, bool a _url.setUrl(url); _async = async; - auto metaverseApiUrl = DependencyManager::get()->getMetaverseServerURL().toString() + "/api/"; - - if (url.toLower().left(metaverseApiUrl.length()) == metaverseApiUrl) { + if (url.toLower().left(METAVERSE_API_URL.length()) == METAVERSE_API_URL) { auto accountManager = DependencyManager::get(); if (accountManager->hasValidAccessToken()) { diff --git a/libraries/ui/src/ui/types/RequestFilters.cpp b/libraries/ui/src/ui/types/RequestFilters.cpp index 10c0eef58d..b1deec47c8 100644 --- a/libraries/ui/src/ui/types/RequestFilters.cpp +++ b/libraries/ui/src/ui/types/RequestFilters.cpp @@ -10,6 +10,7 @@ // #include "RequestFilters.h" +#include "NetworkingConstants.h" #include #include @@ -19,7 +20,7 @@ namespace { bool isAuthableHighFidelityURL(const QUrl& url) { - auto metaverseServerURL = DependencyManager::get()->getMetaverseServerURL(); + auto metaverseServerURL = NetworkingConstants::METAVERSE_SERVER_URL; static const QStringList HF_HOSTS = { "highfidelity.com", "highfidelity.io", metaverseServerURL.toString(), "metaverse.highfidelity.io" diff --git a/tools/ac-client/src/ACClientApp.cpp b/tools/ac-client/src/ACClientApp.cpp index f3ea9b7348..e00560158f 100644 --- a/tools/ac-client/src/ACClientApp.cpp +++ b/tools/ac-client/src/ACClientApp.cpp @@ -14,6 +14,7 @@ #include #include #include +#include #include #include #include @@ -105,7 +106,7 @@ ACClientApp::ACClientApp(int argc, char* argv[]) : auto accountManager = DependencyManager::get(); accountManager->setIsAgent(true); - accountManager->setAuthURL(accountManager->getMetaverseServerURL()); + accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL); auto nodeList = DependencyManager::get(); diff --git a/tools/atp-client/src/ATPClientApp.cpp b/tools/atp-client/src/ATPClientApp.cpp index 85aee10d76..c5edf27b67 100644 --- a/tools/atp-client/src/ATPClientApp.cpp +++ b/tools/atp-client/src/ATPClientApp.cpp @@ -17,6 +17,7 @@ #include #include +#include #include #include #include @@ -144,7 +145,7 @@ ATPClientApp::ATPClientApp(int argc, char* argv[]) : auto accountManager = DependencyManager::get(); accountManager->setIsAgent(true); - accountManager->setAuthURL(accountManager->getMetaverseServerURL()); + accountManager->setAuthURL(NetworkingConstants::METAVERSE_SERVER_URL); auto nodeList = DependencyManager::get();