From b1ec309effa13b22df969c3835605f6614d00a66 Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Wed, 23 Mar 2022 09:43:25 +0000 Subject: [PATCH] Upgrade Maven plugins to the latest versions --- src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java b/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java index 1db8322..ce2ac6b 100644 --- a/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java +++ b/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java @@ -20,7 +20,6 @@ import javax.ws.rs.core.Context; import javax.ws.rs.core.HttpHeaders; import javax.ws.rs.core.Response; -import javax.ws.rs.core.UriInfo; public class LogoutEndpoint { private static final Logger logger = Logger.getLogger(LogoutEndpoint.class); @@ -36,9 +35,6 @@ @Context private HttpHeaders headers; - - @Context - private UriInfo uriInfo; private RealmModel realm; private EventBuilder event; @@ -62,7 +58,7 @@ if (redirectUri != null) userSession.setNote(CASLoginProtocol.LOGOUT_REDIRECT_URI, redirectUri); logger.debug("Initiating CAS browser logout"); - Response response = AuthenticationManager.browserLogout(session, realm, authResult.getSession(), uriInfo, clientConnection, headers); + Response response = AuthenticationManager.browserLogout(session, realm, authResult.getSession(), session.getContext().getUri(), clientConnection, headers, null); logger.debug("finishing CAS browser logout"); return response; } @@ -76,10 +72,10 @@ client = realm.getClients().stream() .filter(c -> CASLoginProtocol.LOGIN_PROTOCOL.equals(c.getProtocol())) - .filter(c -> RedirectUtils.verifyRedirectUri(uriInfo, service, realm, c) != null) + .filter(c -> RedirectUtils.verifyRedirectUri(session, service, c) != null) .findFirst().orElse(null); if (client != null) { - redirectUri = RedirectUtils.verifyRedirectUri(uriInfo, service, realm, client); + redirectUri = RedirectUtils.verifyRedirectUri(session, service, client); session.getContext().setClient(client); } -- Gitblit v1.9.1