diff --git a/client/src/app/app-init.ts b/client/src/app/app-init.ts index 6b9241ee9afd93090d03991dda756a79062137d4..c1e253719205e54ea7d5915a59b192508e6a37a8 100644 --- a/client/src/app/app-init.ts +++ b/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, diff --git a/client/src/environments/environment.prod.ts b/client/src/environments/environment.prod.ts index 5506fedd9829d17697569af187d24a95a4184af4..f60eda9a75b945e12c51930609e1102c5a7d80ca 100644 --- a/client/src/environments/environment.prod.ts +++ b/client/src/environments/environment.prod.ts @@ -1,4 +1,4 @@ export const environment = { production: true, - apiUrl: "/server" + apiUrl: "server" };