Adjust keycloak url after KeycloakX upgrade

Issue-ID: PORTALNG-104
Change-Id: I181b78dfc333efb968e6281a80bc4c6faa1040f6
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>

diff --git a/app/src/main/resources/application-local.yml b/app/src/main/resources/application-local.yml
index 1ca695e..5d7376c 100644 (file)
--- a/app/src/main/resources/application-local.yml
+++ b/app/src/main/resources/application-local.yml
@@ -11,7 +11,7 @@ spring:
     oauth2:
       resourceserver:
         jwt:
-          jwk-set-uri: http://localhost:8080/auth/realms/ONAP/protocol/openid-connect/certs #Keycloak Endpoint
+          jwk-set-uri: http://localhost:8080/realms/ONAP/protocol/openid-connect/certs #Keycloak Endpoint
   data:
     mongodb:
       database: portal_preferences

diff --git a/app/src/main/resources/application.yml b/app/src/main/resources/application.yml
index 75654ef..85156b1 100644 (file)
--- a/app/src/main/resources/application.yml
+++ b/app/src/main/resources/application.yml
@@ -13,7 +13,7 @@ spring:
     oauth2:
       resourceserver:
         jwt:
-          jwk-set-uri: ${KEYCLOAK_URL}/auth/realms/${KEYCLOAK_REALM}/protocol/openid-connect/certs #Keycloak Endpoint
+          jwk-set-uri: ${KEYCLOAK_URL}/realms/${KEYCLOAK_REALM}/protocol/openid-connect/certs #Keycloak Endpoint
   data:
     mongodb:
       database: ${MONGO_DATABASE}

diff --git a/app/src/test/java/org/onap/portalng/preferences/BaseIntegrationTest.java b/app/src/test/java/org/onap/portalng/preferences/BaseIntegrationTest.java
index df8da62..cd5aac4 100644 (file)
--- a/app/src/test/java/org/onap/portalng/preferences/BaseIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/preferences/BaseIntegrationTest.java
@@ -68,7 +68,7 @@ public abstract class BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.get(
                 WireMock.urlMatching(
-                    String.format("/auth/realms/%s/protocol/openid-connect/certs", realm)))
+                    String.format("/realms/%s/protocol/openid-connect/certs", realm)))
             .willReturn(
                 WireMock.aResponse()
                     .withHeader("Content-Type", JWKSet.MIME_TYPE)
@@ -80,7 +80,7 @@ public abstract class BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.post(
                 WireMock.urlMatching(
-                    String.format("/auth/realms/%s/protocol/openid-connect/token", realm)))
+                    String.format("/realms/%s/protocol/openid-connect/token", realm)))
             .withBasicAuth("test", "test")
             .withRequestBody(WireMock.containing("grant_type=client_credentials"))
             .willReturn(

diff --git a/app/src/test/java/org/onap/portalng/preferences/TokenGenerator.java b/app/src/test/java/org/onap/portalng/preferences/TokenGenerator.java
index 30ddbdc..3dbf110 100644 (file)
--- a/app/src/test/java/org/onap/portalng/preferences/TokenGenerator.java
+++ b/app/src/test/java/org/onap/portalng/preferences/TokenGenerator.java
@@ -124,7 +124,7 @@ public class TokenGenerator {
     @Builder.Default private final List<String> roles = Collections.emptyList();
 
     public String issuer() {
-      return String.format("http://localhost:%d/auth/realms/%s", port, realm);
+      return String.format("http://localhost:%d/realms/%s", port, realm);
     }
   }
 }

diff --git a/app/src/test/resources/application.yml b/app/src/test/resources/application.yml
index 7092971..499b8e4 100644 (file)
--- a/app/src/test/resources/application.yml
+++ b/app/src/test/resources/application.yml
@@ -17,7 +17,7 @@ spring:
     oauth2:
       resourceserver:
         jwt:
-          jwk-set-uri: http://localhost:${wiremock.server.port}/auth/realms/ONAP/protocol/openid-connect/certs #Keycloak Endpoint
+          jwk-set-uri: http://localhost:${wiremock.server.port}/realms/ONAP/protocol/openid-connect/certs #Keycloak Endpoint
 
 preferences:
   realm: ONAP

diff --git a/development/.env b/development/.env
index ff65652..87c0bbb 100644 (file)
--- a/development/.env
+++ b/development/.env
@@ -1,5 +1,5 @@
 KEYCLOAK_IMAGE=quay.io/keycloak/keycloak
-KEYCLOAK_VERSION=18.0.2-legacy
+KEYCLOAK_VERSION=22.04
 KEYCLOAK_USER=admin
 KEYCLOAK_PASSWORD=password
 KEYCLOAK_DB=keycloak

diff --git a/development/request.http b/development/request.http
index 403d4bc..277e8a8 100644 (file)
--- a/development/request.http
+++ b/development/request.http
@@ -1,4 +1,4 @@
-POST http://localhost:8080/auth/realms/ONAP/protocol/openid-connect/token
+POST http://localhost:8080/realms/ONAP/protocol/openid-connect/token
 Content-Type: application/x-www-form-urlencoded
 
 client_id=portal-app&client_secret=&scope=openid&grant_type=password&username=onap-admin&password=password