From 8637a8200ccef6985297b6a8c738f56927bc2d27 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 16 Dec 2023 08:47:13 +0000
Subject: [PATCH] Update to Keycloak 23.0.3

---
 src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java |   42 +++++++++++++++++++-----------------------
 1 files changed, 19 insertions(+), 23 deletions(-)

diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java
index 861742a..3ec9883 100644
--- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java
+++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocolService.java
@@ -1,34 +1,23 @@
 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;
 import org.keycloak.models.RealmModel;
-import org.keycloak.protocol.cas.endpoints.AuthorizationEndpoint;
-import org.keycloak.protocol.cas.endpoints.LogoutEndpoint;
-import org.keycloak.protocol.cas.endpoints.ServiceValidateEndpoint;
-import org.keycloak.protocol.cas.endpoints.ValidateEndpoint;
+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 KeycloakSession session;
-
-    @Context
-    private HttpHeaders headers;
-
-    @Context
-    private HttpRequest request;
-
-    public CASLoginProtocolService(RealmModel realm, EventBuilder event) {
-        this.realm = realm;
+    public CASLoginProtocolService(KeycloakSession session, EventBuilder event) {
+        this.session = session;
+        this.realm = session.getContext().getRealm();
         this.event = event;
     }
 
@@ -38,28 +27,35 @@
 
     @Path("login")
     public Object login() {
-        AuthorizationEndpoint endpoint = new AuthorizationEndpoint(realm, event);
+        AuthorizationEndpoint endpoint = new AuthorizationEndpoint(session, event);
         ResteasyProviderFactory.getInstance().injectProperties(endpoint);
         return endpoint;
     }
 
     @Path("logout")
     public Object logout() {
-        LogoutEndpoint endpoint = new LogoutEndpoint(realm, event);
+        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(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