Merge branch 'develop' into 7-add-tests-for-instance-store-module

client/src/app/app-init.ts

@@ -11,7 +11,7 @@ import { environment } from 'src/environments/environment';
 
 function appInit(http: HttpClient, appConfigService: AppConfigService, keycloak: KeycloakService, store: Store<{ }>) {
     return () => {
-        return http.get(`${environment.apiUrl}/client-settings`)
+        return http.get(getClientSettingsUrl())
             .toPromise()
             .then(data => {
                 Object.assign(appConfigService, data);
@@ -24,6 +24,16 @@ function appInit(http: HttpClient, appConfigService: AppConfigService, keycloak:
     }
 }
 
+function getClientSettingsUrl() {
+    let url: string;
+    if (environment.production) {
+        url = `${document.getElementsByTagName('base')[0].getAttribute('href')}${environment.apiUrl}/client-settings`;
+    } else {
+        url = environment.apiUrl;
+    }
+    return url;
+}
+
 export const appInitializer = {
     provide: APP_INITIALIZER,
     useFactory: appInit,

client/src/environments/environment.prod.ts

 export const environment = {
     production: true,
-    apiUrl: "/server"
+    apiUrl: "server"
 };