From b3a8c0bbece6477d6097b6dc9e0a021d434f13ac Mon Sep 17 00:00:00 2001 From: Kalila L Date: Thu, 30 Sep 2021 23:56:35 -0400 Subject: [PATCH] CR. --- .../resources/web/web-new/src/boot/axios.ts | 3 ++ .../src/pages/FirstTimeWizard/Index.vue | 52 ------------------- domain-server/src/DomainServer.cpp | 2 +- 3 files changed, 4 insertions(+), 53 deletions(-) diff --git a/domain-server/resources/web/web-new/src/boot/axios.ts b/domain-server/resources/web/web-new/src/boot/axios.ts index 0cc43a1a12..4d02170e22 100644 --- a/domain-server/resources/web/web-new/src/boot/axios.ts +++ b/domain-server/resources/web/web-new/src/boot/axios.ts @@ -18,6 +18,9 @@ declare module "@vue/runtime-core" { Log.info(Log.types.OTHER, "Bootstrapping Axios."); +// This is a necessary header to be passed to the Metaverse server in order for +// it to fail with an HTTP error code instead of succeeding and returning +// the error in JSON only. axios.defaults.headers.common = { "x-vircadia-error-handle": "badrequest" }; diff --git a/domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue b/domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue index e16ec37708..a4428f2265 100644 --- a/domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue +++ b/domain-server/resources/web/web-new/src/pages/FirstTimeWizard/Index.vue @@ -633,58 +633,6 @@ - - diff --git a/domain-server/src/DomainServer.cpp b/domain-server/src/DomainServer.cpp index 7d37a1e321..2d5aa690f3 100644 --- a/domain-server/src/DomainServer.cpp +++ b/domain-server/src/DomainServer.cpp @@ -88,7 +88,7 @@ int DomainServer::_parentPID { -1 }; /// @brief Route a request to the Metaverse server. /// @param connection The HTTP connection object. -/// @param requestUrl The full URL of the request. +/// @param requestUrl The full URL of the request. e.g. https://google.com/api/v1/test /// @param metaversePath The path on the Metaverse server to route to. /// @param requestSubobjectKey The parent object key that any data will be inserted into for the forwarded request. /// @param requiredData The data that is required to be forwarded with this request.