Remove hardcoded /auth from the keycloak urls in bff

- it should be possible not to configure /auth in the Keycloak url
since newer versions do not use it

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

1 files changed, 21 insertions, 21 deletions

diff --git a/app/src/test/java/org/onap/portalng/bff/users/UpdateAssignedRolesIntegrationTest.java b/app/src/test/java/org/onap/portalng/bff/users/UpdateAssignedRolesIntegrationTest.java
index 8f7b350..a69e969 100644
--- a/app/src/test/java/org/onap/portalng/bff/users/UpdateAssignedRolesIntegrationTest.java
+++ b/app/src/test/java/org/onap/portalng/bff/users/UpdateAssignedRolesIntegrationTest.java
@@ -55,7 +55,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
         WireMock.get(
                 WireMock.urlMatching(
                     String.format(
-                        "/auth/admin/realms/%s/users/1/role-mappings/realm/available", realm)))
+                        "/admin/realms/%s/users/1/role-mappings/realm/available", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .willReturn(
@@ -66,7 +66,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.get(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .willReturn(
@@ -77,7 +77,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.post(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .withRequestBody(WireMock.equalTo(objectMapper.writeValueAsString(keycloakRolesToAdd)))
@@ -87,7 +87,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.get(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs("rolesUpdated")
             .willReturn(
@@ -139,7 +139,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
         WireMock.get(
                 WireMock.urlMatching(
                     String.format(
-                        "/auth/admin/realms/%s/users/1/role-mappings/realm/available", realm)))
+                        "/admin/realms/%s/users/1/role-mappings/realm/available", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .willReturn(
@@ -150,7 +150,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.get(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .willReturn(
@@ -161,7 +161,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.delete(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .withRequestBody(
@@ -171,7 +171,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.post(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .withRequestBody(WireMock.equalTo(objectMapper.writeValueAsString(keycloakRolesToAdd)))
@@ -181,7 +181,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.get(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs("rolesUpdated")
             .willReturn(
@@ -227,7 +227,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
         WireMock.get(
                 WireMock.urlMatching(
                     String.format(
-                        "/auth/admin/realms/%s/users/1/role-mappings/realm/available", realm)))
+                        "/admin/realms/%s/users/1/role-mappings/realm/available", realm)))
             .willReturn(
                 WireMock.aResponse()
                     .withHeader("Content-Type", MediaType.APPLICATION_JSON_VALUE)
@@ -236,7 +236,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.delete(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .withRequestBody(
                 WireMock.equalTo(objectMapper.writeValueAsString(keycloakRolesToRemove)))
             .willReturn(WireMock.aResponse().withStatus(HttpStatus.NO_CONTENT.value())));
@@ -244,7 +244,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.get(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .willReturn(
                 WireMock.aResponse()
                     .withHeader("Content-Type", MediaType.APPLICATION_JSON_VALUE)
@@ -289,7 +289,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
         WireMock.get(
                 WireMock.urlMatching(
                     String.format(
-                        "/auth/admin/realms/%s/users/1/role-mappings/realm/available", realm)))
+                        "/admin/realms/%s/users/1/role-mappings/realm/available", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .willReturn(
@@ -300,7 +300,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.get(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .willReturn(
@@ -311,7 +311,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.post(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .withRequestBody(WireMock.equalTo(objectMapper.writeValueAsString(keycloakRolesToAdd)))
@@ -321,7 +321,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.get(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs("rolesUpdated")
             .willReturn(
@@ -375,7 +375,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
         WireMock.get(
                 WireMock.urlMatching(
                     String.format(
-                        "/auth/admin/realms/%s/users/1/role-mappings/realm/available", realm)))
+                        "/admin/realms/%s/users/1/role-mappings/realm/available", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .willReturn(
@@ -386,7 +386,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.get(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .willReturn(
@@ -398,7 +398,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.delete(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .withRequestBody(
@@ -408,7 +408,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.post(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs(Scenario.STARTED)
             .withRequestBody(WireMock.equalTo(objectMapper.writeValueAsString(keycloakRolesToAdd)))
@@ -418,7 +418,7 @@ class UpdateAssignedRolesIntegrationTest extends BaseIntegrationTest {
     WireMock.stubFor(
         WireMock.get(
                 WireMock.urlMatching(
-                    String.format("/auth/admin/realms/%s/users/1/role-mappings/realm", realm)))
+                    String.format("/admin/realms/%s/users/1/role-mappings/realm", realm)))
             .inScenario("test")
             .whenScenarioStateIs("rolesUpdated")
             .willReturn(