diff --git a/apps/red-ui/src/app/app-config/app-config.service.ts b/apps/red-ui/src/app/app-config/app-config.service.ts index 3228fa25b..bbca2f6fa 100644 --- a/apps/red-ui/src/app/app-config/app-config.service.ts +++ b/apps/red-ui/src/app/app-config/app-config.service.ts @@ -7,7 +7,7 @@ import {Observable} from "rxjs"; export enum AppConfigKey { KEYCLOAK_URL = "KEYCLOAK_URL", KEYCLOAK_REALM = "KEYCLOAK_REALM", - KEYCLOAK_CLIENT_ID = "KEYCLOAK_CLIENT_ID", + API_CLIENT = "API_CLIENT", API_URL = "API_URL", } diff --git a/apps/red-ui/src/app/interceptor/api-path-interceptor.service.ts b/apps/red-ui/src/app/interceptor/api-path-interceptor.service.ts index d6421b1ae..283d24a2a 100644 --- a/apps/red-ui/src/app/interceptor/api-path-interceptor.service.ts +++ b/apps/red-ui/src/app/interceptor/api-path-interceptor.service.ts @@ -1,7 +1,7 @@ import {HttpEvent, HttpHandler, HttpInterceptor, HttpRequest} from '@angular/common/http'; import {Injectable} from '@angular/core'; import {Observable} from 'rxjs'; -import {AppConfigService} from "../app-config/app-config.service"; +import {AppConfigKey, AppConfigService} from "../app-config/app-config.service"; @Injectable() export class ApiPathInterceptorService implements HttpInterceptor { @@ -11,16 +11,13 @@ export class ApiPathInterceptorService implements HttpInterceptor { intercept(req: HttpRequest, next: HttpHandler): Observable> { - // if (!req.url.startsWith('/assets')) { - // const updatedRequest = req.clone({ - // url: this._appConfigService.getConfig(AppConfigKey.API_URL) + req.url - // }) - // - // console.log(req); - // - // return next.handle(updatedRequest); - // } else { - return next.handle(req); - // } + if (!req.url.startsWith('/assets')) { + const updatedRequest = req.clone({ + url: this._appConfigService.getConfig(AppConfigKey.API_URL) + req.url + }) + return next.handle(updatedRequest); + } else { + return next.handle(req); + } } } diff --git a/apps/red-ui/src/app/keycloak-auth/keycloak.initializer.ts b/apps/red-ui/src/app/keycloak-auth/keycloak.initializer.ts index 01f789634..ee607a430 100644 --- a/apps/red-ui/src/app/keycloak-auth/keycloak.initializer.ts +++ b/apps/red-ui/src/app/keycloak-auth/keycloak.initializer.ts @@ -9,7 +9,7 @@ export function keycloakInitializer(keycloak: KeycloakService, appConfigService: config: { url: appConfigService.getConfig(AppConfigKey.KEYCLOAK_URL), realm: appConfigService.getConfig(AppConfigKey.KEYCLOAK_REALM), - clientId: appConfigService.getConfig(AppConfigKey.KEYCLOAK_CLIENT_ID) + clientId: appConfigService.getConfig(AppConfigKey.API_CLIENT) }, initOptions: { checkLoginIframe: false, diff --git a/apps/red-ui/src/assets/config/config.json b/apps/red-ui/src/assets/config/config.json index edc00a3e3..013c097c8 100644 --- a/apps/red-ui/src/assets/config/config.json +++ b/apps/red-ui/src/assets/config/config.json @@ -1,6 +1,6 @@ { "KEYCLOAK_URL": "https://keycloak-dev.iqser.cloud/auth", "KEYCLOAK_REALM": "dev", - "KEYCLOAK_CLIENT_ID": "gin-client", + "API_CLIENT": "gin-client", "API_URL": "" }