fix: allow overriding REST API domain for ingress

resoai · Apr 15, 2021 · 5987c16 · 5987c16
1 parent f95b918
commit 5987c16
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 4 deletions.
diff --git a/index.html.ejs b/index.html.ejs
@@ -31,9 +31,10 @@
    <link rel="stylesheet" href="./styles/custom.css">
 
    <script>
+      window.AUTH_TOKEN_OVERRIDE = null;
       window.SERVER_URL_OVERRIDE = null;
+      window.REST_URL_OVERRIDE = null;
       window.WS_URL_OVERRIDE = null;
-      window.AUTH_TOKEN_OVERRIDE = null;
    </script>
 
    <% javascripts.forEach(javascript => { %><script src="./<%= javascript %>"></script><% }) %>

diff --git a/scripts/globals/utils.js b/scripts/globals/utils.js
@@ -81,9 +81,9 @@ export const debounce = function (func, wait, immediate) {
    };
 };
 
-export const toAbsoluteServerURL = function (path) {
+export const toAbsoluteServerURL = function (path, serverUrlOverride = false) {
    const startsWithProtocol = path.indexOf('http') === 0;
-   const url = startsWithProtocol ? path : (window.SERVER_URL_OVERRIDE || window.CONFIG.serverUrl) + '/' + path;
+   const url = startsWithProtocol ? path : (serverUrlOverride || window.SERVER_URL_OVERRIDE || window.CONFIG.serverUrl) + '/' + path;
    // Replace extra forward slashes but not in protocol.
    return url.replace(/([^:])\/+/g, '$1/');
 };

diff --git a/scripts/models/api.js b/scripts/models/api.js
@@ -147,7 +147,7 @@ App.provider('Api', function () {
 
       $Api.prototype.rest = function (requestStub) {
          const request = angular.copy(requestStub);
-         request.url = toAbsoluteServerURL(request.url);
+         request.url = toAbsoluteServerURL(request.url, window.REST_URL_OVERRIDE);
          request.headers = request.headers || {};
          request.headers.Authorization = 'Bearer ' + this._token;
          return $http(request)

diff --git a/types/globals.d.ts b/types/globals.d.ts
@@ -1,5 +1,6 @@
 interface Window {
     AUTH_TOKEN_OVERRIDE: string | null
+    REST_URL_OVERRIDE: string | null
     SERVER_URL_OVERRIDE: string | null
     WS_URL_OVERRIDE: string | null
 }