From b92028de86e6b25a87c12ff34ae00338a455308d Mon Sep 17 00:00:00 2001 From: Laurent Meunier <lme@atolcd.com> Date: Fri, 21 Jun 2024 11:50:28 +0000 Subject: [PATCH] Fix NPE in backchannel logout --- src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java | 21 +++++---------------- 1 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java index 3ec9883..a985901 100644 --- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java +++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java @@ -3,7 +3,6 @@ import jakarta.ws.rs.Path; import jakarta.ws.rs.core.Response; import jakarta.ws.rs.core.UriBuilder; -import org.jboss.resteasy.spi.ResteasyProviderFactory; import org.keycloak.events.EventBuilder; import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; @@ -27,37 +26,27 @@ @Path("login") public Object login() { - AuthorizationEndpoint endpoint = new AuthorizationEndpoint(session, event); - ResteasyProviderFactory.getInstance().injectProperties(endpoint); - return endpoint; + return new AuthorizationEndpoint(session, event); } @Path("logout") public Object logout() { - LogoutEndpoint endpoint = new LogoutEndpoint(session, realm); - ResteasyProviderFactory.getInstance().injectProperties(endpoint); - return endpoint; + return new LogoutEndpoint(session, realm); } @Path("validate") public Object validate() { - ValidateEndpoint endpoint = new ValidateEndpoint(session, realm, event); - ResteasyProviderFactory.getInstance().injectProperties(endpoint); - return endpoint; + return new ValidateEndpoint(session, realm, event); } @Path("samlValidate") public Object validateSaml11() { - SamlValidateEndpoint endpoint = new SamlValidateEndpoint(session, realm, event); - ResteasyProviderFactory.getInstance().injectProperties(endpoint); - return endpoint; + return new SamlValidateEndpoint(session, realm, event); } @Path("serviceValidate") public Object serviceValidate() { - ServiceValidateEndpoint endpoint = new ServiceValidateEndpoint(session, realm, event); - ResteasyProviderFactory.getInstance().injectProperties(endpoint); - return endpoint; + return new ServiceValidateEndpoint(session, realm, event); } @Path("proxyValidate") -- Gitblit v1.9.1