diff options
Diffstat (limited to 'src/app')
-rw-r--r-- | src/app/components/layout/header/header/header.component.ts | 2 | ||||
-rw-r--r-- | src/app/components/layout/sidemenu/sidemenu.component.ts | 1 | ||||
-rw-r--r-- | src/app/model/environment.model.ts | 5 | ||||
-rw-r--r-- | src/app/modules/auth/auth.config.ts | 2 |
4 files changed, 4 insertions, 6 deletions
diff --git a/src/app/components/layout/header/header/header.component.ts b/src/app/components/layout/header/header/header.component.ts index f5c1a1c..b6c513f 100644 --- a/src/app/components/layout/header/header/header.component.ts +++ b/src/app/components/layout/header/header/header.component.ts @@ -48,7 +48,7 @@ export class HeaderComponent implements OnInit { isOnapTheme = false; switchToMainContent: string = ''; isFullScreen = false; - changePasswordUrl = `${environment.keycloakEditProfile}/password`; + changePasswordUrl = `${environment.keycloak.hostname}/auth/realms/${environment.keycloak.realm}/account/password`; shortcuts: Map<KeyboardShortcuts,string> = this.shortcutService.getShortcuts(); public ACCESS_KEY = KeyboardShortcuts; diff --git a/src/app/components/layout/sidemenu/sidemenu.component.ts b/src/app/components/layout/sidemenu/sidemenu.component.ts index 1f5c123..8cbe6b2 100644 --- a/src/app/components/layout/sidemenu/sidemenu.component.ts +++ b/src/app/components/layout/sidemenu/sidemenu.component.ts @@ -35,7 +35,6 @@ export class SidemenuComponent { @Input() isSidebarCollapsed = false; public ACCESS_KEY = KeyboardShortcuts; - public keycloakEditProfile = environment.keycloakEditProfile; public isKpiDashboardSubMenuCollapsed = false; constructor() { diff --git a/src/app/model/environment.model.ts b/src/app/model/environment.model.ts index 5bfb615..8e6bba1 100644 --- a/src/app/model/environment.model.ts +++ b/src/app/model/environment.model.ts @@ -21,18 +21,17 @@ export interface Environment { customStyleEnabled: boolean; backendServerUrl: string; hostname: string; - keycloakEditProfile: string; production: boolean; keycloak: KeycloakEnvironment; dateTimeFormat: string; loggingUrl: string; loggingEnabled: boolean supportUrlLink: string - } export interface KeycloakEnvironment { - issuer: string; + hostname: string; + realm: string; redirectUri: string; clientId: string; responseType: string; diff --git a/src/app/modules/auth/auth.config.ts b/src/app/modules/auth/auth.config.ts index 3414edd..8f8035e 100644 --- a/src/app/modules/auth/auth.config.ts +++ b/src/app/modules/auth/auth.config.ts @@ -22,7 +22,7 @@ import { environment } from '../../../environments/environment'; export const authConfig: AuthConfig = { // Url of the Identity Provider - issuer: environment.keycloak.issuer, + issuer: `${environment.keycloak.hostname}/auth/realms/${environment.keycloak.realm}`, // URL of the SPA to redirect the user to after login redirectUri: environment.keycloak.redirectUri, |