From 7a34c2a448ef18f0bc04977db3e9065bfdd2a07d Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Fri, 24 Nov 2023 15:36:27 +0000
Subject: [PATCH] LogoutEndpoint: move client field to local var in checkClient()

---
 src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java |   21 +++++++--------------
 1 files changed, 7 insertions(+), 14 deletions(-)

diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java
index 041303e..3ec9883 100644
--- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java
+++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java
@@ -1,6 +1,8 @@
 package org.keycloak.protocol.cas;
 
-import org.jboss.resteasy.spi.HttpRequest;
+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;
@@ -8,19 +10,10 @@
 import org.keycloak.protocol.cas.endpoints.*;
 import org.keycloak.services.resources.RealmsResource;
 
-import javax.ws.rs.Path;
-import javax.ws.rs.core.*;
-
 public class CASLoginProtocolService {
     private KeycloakSession session;
     private RealmModel realm;
     private EventBuilder event;
-
-    @Context
-    private HttpHeaders headers;
-
-    @Context
-    private HttpRequest request;
 
     public CASLoginProtocolService(KeycloakSession session, EventBuilder event) {
         this.session = session;
@@ -41,28 +34,28 @@
 
     @Path("logout")
     public Object logout() {
-        LogoutEndpoint endpoint = new LogoutEndpoint(realm);
+        LogoutEndpoint endpoint = new LogoutEndpoint(session, realm);
         ResteasyProviderFactory.getInstance().injectProperties(endpoint);
         return endpoint;
     }
 
     @Path("validate")
     public Object validate() {
-        ValidateEndpoint endpoint = new ValidateEndpoint(realm, event);
+        ValidateEndpoint endpoint = new ValidateEndpoint(session, realm, event);
         ResteasyProviderFactory.getInstance().injectProperties(endpoint);
         return endpoint;
     }
 
     @Path("samlValidate")
     public Object validateSaml11() {
-        SamlValidateEndpoint endpoint = new SamlValidateEndpoint(realm, event);
+        SamlValidateEndpoint endpoint = new SamlValidateEndpoint(session, realm, event);
         ResteasyProviderFactory.getInstance().injectProperties(endpoint);
         return endpoint;
     }
 
     @Path("serviceValidate")
     public Object serviceValidate() {
-        ServiceValidateEndpoint endpoint = new ServiceValidateEndpoint(realm, event);
+        ServiceValidateEndpoint endpoint = new ServiceValidateEndpoint(session, realm, event);
         ResteasyProviderFactory.getInstance().injectProperties(endpoint);
         return endpoint;
     }

--
Gitblit v1.9.1