From e1b962f5e269fd62c49eb6ca3ed887bad9811ead Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Fri, 24 Nov 2023 12:17:22 +0000
Subject: [PATCH] Get rid of @Context variables in Endpoint classes
---
src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java | 19 +++----------------
1 files changed, 3 insertions(+), 16 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 bd3a48a..6216ec3 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/LogoutEndpoint.java
@@ -2,13 +2,9 @@
import jakarta.ws.rs.GET;
import jakarta.ws.rs.QueryParam;
-import jakarta.ws.rs.core.Context;
-import jakarta.ws.rs.core.HttpHeaders;
import jakarta.ws.rs.core.Response;
import org.jboss.logging.Logger;
import org.jboss.resteasy.annotations.cache.NoCache;
-import org.jboss.resteasy.spi.HttpRequest;
-import org.keycloak.common.ClientConnection;
import org.keycloak.models.ClientModel;
import org.keycloak.models.KeycloakSession;
import org.keycloak.models.RealmModel;
@@ -24,23 +20,14 @@
public class LogoutEndpoint {
private static final Logger logger = Logger.getLogger(LogoutEndpoint.class);
- @Context
private KeycloakSession session;
-
- @Context
- private ClientConnection clientConnection;
-
- @Context
- private HttpRequest request;
-
- @Context
- private HttpHeaders headers;
private RealmModel realm;
private ClientModel client;
private String redirectUri;
- public LogoutEndpoint(RealmModel realm) {
+ public LogoutEndpoint(KeycloakSession session, RealmModel realm) {
+ this.session = session;
this.realm = realm;
}
@@ -59,7 +46,7 @@
}
logger.debug("Initiating CAS browser logout");
- Response response = AuthenticationManager.browserLogout(session, realm, authResult.getSession(), session.getContext().getUri(), clientConnection, headers);
+ Response response = AuthenticationManager.browserLogout(session, realm, authResult.getSession(), session.getContext().getUri(), session.getContext().getConnection(), session.getContext().getRequestHeaders());
logger.debug("finishing CAS browser logout");
return response;
}
--
Gitblit v1.9.1