Skip to content
Snippets Groups Projects
Commit 93f9a66f authored by François Agneray's avatar François Agneray
Browse files

Add getClientSettingsUrl (bug base href)

parent 6a890695
No related branches found
No related tags found
1 merge request!29Develop
Pipeline #6396 passed
Pipeline: anis-next

#6397

    ...@@ -11,7 +11,7 @@ import { environment } from 'src/environments/environment'; ...@@ -11,7 +11,7 @@ import { environment } from 'src/environments/environment';
    function appInit(http: HttpClient, appConfigService: AppConfigService, keycloak: KeycloakService, store: Store<{ }>) { function appInit(http: HttpClient, appConfigService: AppConfigService, keycloak: KeycloakService, store: Store<{ }>) {
    return () => { return () => {
    return http.get(`${environment.apiUrl}/client-settings`) return http.get(getClientSettingsUrl())
    .toPromise() .toPromise()
    .then(data => { .then(data => {
    Object.assign(appConfigService, data); Object.assign(appConfigService, data);
    ...@@ -24,6 +24,16 @@ function appInit(http: HttpClient, appConfigService: AppConfigService, keycloak: ...@@ -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 = { export const appInitializer = {
    provide: APP_INITIALIZER, provide: APP_INITIALIZER,
    useFactory: appInit, useFactory: appInit,
    ......
    export const environment = { export const environment = {
    production: true, production: true,
    apiUrl: "/server" apiUrl: "server"
    }; };
    0% Loading or .
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment