Merge branch 'master' into 13894-default-view-component

[arvados.git] / src / common / config.ts

diff --git a/src/common/config.ts b/src/common/config.ts
index 4b4a52a3ea4169db5bebbca79e578c8c6230b01b..250c806c69641cbf9a63cde243075bd234a88177 100644 (file)
--- a/src/common/config.ts
+++ b/src/common/config.ts
@@ -2,7 +2,7 @@
 //
 // SPDX-License-Identifier: AGPL-3.0
 
-import Axios from "../../node_modules/axios";
+import Axios from "axios";
 
 export const CONFIG_URL = process.env.REACT_APP_ARVADOS_CONFIG_URL || "/config.json";
 
@@ -10,14 +10,21 @@ export interface Config {
     API_HOST: string;
 }
 
-const defaultConfig: Config = {
-    API_HOST: process.env.REACT_APP_ARVADOS_API_HOST || ""
-};
-
 export const fetchConfig = () => {
     return Axios
         .get<Config>(CONFIG_URL + "?nocache=" + (new Date()).getTime())
         .then(response => response.data)
-        .catch(() => Promise.resolve(defaultConfig));
+        .catch(() => Promise.resolve(getDefaultConfig()))
+        .then(mapConfig);
 };
 
+const mapConfig = (config: Config): Config => ({
+    ...config,
+    API_HOST: addProtocol(config.API_HOST)
+});
+
+const getDefaultConfig = (): Config => ({
+    API_HOST: process.env.REACT_APP_ARVADOS_API_HOST || ""
+});
+
+const addProtocol = (url: string) => `${window.location.protocol}//${url}`;