diff options
| author |   Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-05-21 11:07:01 +0200 |
|---|---|---|
| committer | Fiete Ostkamp <Fiete.Ostkamp@telekom.de> | 2024-05-21 11:07:01 +0200 |
| commit | 541945eb329413772a992d82991778dd2a06e883 (patch) | |
| tree | eb328f00a6a85e3d03132435d9c42a35e1da8517 /app | |
| parent | 3629e5e99722dc6fe1b61c153c9a245055de4be9 (diff) | |
Adjust keycloak url after KeycloakX upgrade0.1.1
Issue-ID: PORTALNG-104
Change-Id: I181b78dfc333efb968e6281a80bc4c6faa1040f6
Signed-off-by: Fiete Ostkamp <Fiete.Ostkamp@telekom.de>
Diffstat (limited to 'app')
5 files changed, 6 insertions, 6 deletions
diff --git a/app/src/main/resources/application-local.yml b/app/src/main/resources/application-local.yml index 1ca695e..5d7376c 100644 --- 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 --- 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 --- 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 --- 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 --- 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 |