From 24338bc2f78841a0475d91b49eb9458767ab97e9 Mon Sep 17 00:00:00 2001 From: Fiete Ostkamp Date: Tue, 28 May 2024 16:11:55 +0200 Subject: Adjust keycloak auth url after KeycloakX upgrade - remove /auth from auth url after KeycloakX upgrade - increase version to 0.1.1 Issue-ID: PORTALNG-109 Change-Id: I74182d3f8a8eca3a1a341622076980e6be544cd5 Signed-off-by: Fiete Ostkamp --- src/app/components/layout/header/header/header.component.ts | 2 +- src/app/http-interceptors/caching-interceptor.ts | 2 +- src/app/modules/auth/auth.config.ts | 2 +- version.properties | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/app/components/layout/header/header/header.component.ts b/src/app/components/layout/header/header/header.component.ts index b6c513f..57d4688 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.keycloak.hostname}/auth/realms/${environment.keycloak.realm}/account/password`; + changePasswordUrl = `${environment.keycloak.hostname}/realms/${environment.keycloak.realm}/account/password`; shortcuts: Map = this.shortcutService.getShortcuts(); public ACCESS_KEY = KeyboardShortcuts; diff --git a/src/app/http-interceptors/caching-interceptor.ts b/src/app/http-interceptors/caching-interceptor.ts index df13376..d783a93 100644 --- a/src/app/http-interceptors/caching-interceptor.ts +++ b/src/app/http-interceptors/caching-interceptor.ts @@ -35,7 +35,7 @@ import { urlTileApi } from '../services/tileservice/tiles.service'; export class CachingInterceptor implements HttpInterceptor { private cachedUrls: Array = [ urlTileApi, - window.location.origin + '/keycloak/auth/realms/ONAP/protocol/openid-connect/userinfo', + window.location.origin + '/keycloak/realms/ONAP/protocol/openid-connect/userinfo', ]; // cache is the cache service that supports get() and put() diff --git a/src/app/modules/auth/auth.config.ts b/src/app/modules/auth/auth.config.ts index 8f8035e..5a7ad9e 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.hostname}/auth/realms/${environment.keycloak.realm}`, + issuer: `${environment.keycloak.hostname}/realms/${environment.keycloak.realm}`, // URL of the SPA to redirect the user to after login redirectUri: environment.keycloak.redirectUri, diff --git a/version.properties b/version.properties index 5294d92..b179fec 100644 --- a/version.properties +++ b/version.properties @@ -4,10 +4,10 @@ major=0 minor=1 -patch=0 +patch=1 base_version=${major}.${minor}.${patch} # Release must be completed with git revision # in Jenkins release_version=${base_version} -snapshot_version=${base_version}-SNAPSHOT \ No newline at end of file +snapshot_version=${base_version}-SNAPSHOT -- cgit 1.2.3-korg