From 7998984d8e7e337978d77134193549eda4da28cf Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 24 Oct 2017 14:30:47 -0700 Subject: [PATCH] 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;