diff --git a/pom.xml b/pom.xml index 0c6e5d0..0953916 100644 --- a/pom.xml +++ b/pom.xml @@ -80,12 +80,12 @@ org.keycloak keycloak-spring-security-adapter - 4.4.0.Final + 11.0.2 org.keycloak keycloak-spring-boot-starter - 4.4.0.Final + 11.0.2 ch.qos.logback @@ -96,7 +96,7 @@ org.keycloak keycloak-admin-client - 4.4.0.Final + 11.0.2 diff --git a/src/main/java/de/caritas/cob/liveservice/websocket/service/KeycloakTokenObserver.java b/src/main/java/de/caritas/cob/liveservice/websocket/service/KeycloakTokenObserver.java index 4ed355d..ffbc24c 100644 --- a/src/main/java/de/caritas/cob/liveservice/websocket/service/KeycloakTokenObserver.java +++ b/src/main/java/de/caritas/cob/liveservice/websocket/service/KeycloakTokenObserver.java @@ -1,7 +1,7 @@ package de.caritas.cob.liveservice.websocket.service; import static org.apache.commons.lang3.StringUtils.isBlank; -import static org.keycloak.adapters.rotation.AdapterRSATokenVerifier.verifyToken; +import static org.keycloak.adapters.rotation.AdapterTokenVerifier.verifyToken; import lombok.NonNull; import lombok.RequiredArgsConstructor; diff --git a/src/test/java/de/caritas/cob/liveservice/websocket/service/KeycloakTokenObserverTest.java b/src/test/java/de/caritas/cob/liveservice/websocket/service/KeycloakTokenObserverTest.java index a236939..1b064c9 100644 --- a/src/test/java/de/caritas/cob/liveservice/websocket/service/KeycloakTokenObserverTest.java +++ b/src/test/java/de/caritas/cob/liveservice/websocket/service/KeycloakTokenObserverTest.java @@ -9,7 +9,7 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.keycloak.adapters.KeycloakDeploymentBuilder; -import org.keycloak.adapters.rotation.AdapterRSATokenVerifier; +import org.keycloak.adapters.rotation.AdapterTokenVerifier; import org.keycloak.adapters.springboot.KeycloakSpringBootProperties; import org.keycloak.common.VerificationException; import org.keycloak.representations.AccessToken; @@ -19,7 +19,7 @@ import org.powermock.modules.junit4.PowerMockRunner; @RunWith(PowerMockRunner.class) -@PrepareForTest({AdapterRSATokenVerifier.class, KeycloakDeploymentBuilder.class}) +@PrepareForTest({AdapterTokenVerifier.class, KeycloakDeploymentBuilder.class}) public class KeycloakTokenObserverTest { @InjectMocks @@ -44,10 +44,10 @@ public void observeUserId_Should_throwVerificationException_When_tokenIsEmpty() public void observeUserId_Should_returnUserId_When_tokenIsValid() throws VerificationException { mockStatic(KeycloakDeploymentBuilder.class); - mockStatic(AdapterRSATokenVerifier.class); + mockStatic(AdapterTokenVerifier.class); AccessToken accessToken = new AccessToken(); accessToken.setOtherClaims("userId", "validId"); - when(AdapterRSATokenVerifier.verifyToken(any(), any())).thenReturn(accessToken); + when(AdapterTokenVerifier.verifyToken(any(), any())).thenReturn(accessToken); String userId = this.keycloakTokenObserver.observeUserId("valid token"); assertThat(userId, is("validId"));