From 41b82e96e051f127b379d58e946b405ad2531da8 Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 18 Oct 2024 08:49:16 +0000 Subject: [PATCH] Update to Keycloak 26.0.1 --- src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java | 14 +++++--------- 1 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java b/src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java index 3d04ef1..014ee49 100644 --- a/src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java +++ b/src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java @@ -1,10 +1,9 @@ package org.keycloak.protocol.cas.endpoints; -import jakarta.ws.rs.core.Context; import jakarta.ws.rs.core.MediaType; -import jakarta.ws.rs.core.Request; import jakarta.ws.rs.core.Response; import org.keycloak.events.EventBuilder; +import org.keycloak.models.KeycloakSession; import org.keycloak.models.RealmModel; import org.keycloak.models.UserSessionModel; import org.keycloak.protocol.cas.representations.CASServiceResponse; @@ -15,18 +14,15 @@ import java.util.Map; public class ServiceValidateEndpoint extends ValidateEndpoint { - @Context - private Request restRequest; - - public ServiceValidateEndpoint(RealmModel realm, EventBuilder event) { - super(realm, event); + public ServiceValidateEndpoint(KeycloakSession session, RealmModel realm, EventBuilder event) { + super(session, realm, event); } @Override protected Response successResponse() { UserSessionModel userSession = clientSession.getUserSession(); Map<String, Object> attributes = getUserAttributes(); - CASServiceResponse serviceResponse = ServiceResponseHelper.createSuccess(userSession.getUser().getUsername(), attributes); + CASServiceResponse serviceResponse = ServiceResponseHelper.createSuccess(userSession.getUser().getUsername(), attributes, this.pgtIou, null); return prepare(Response.Status.OK, serviceResponse); } @@ -37,7 +33,7 @@ } private Response prepare(Response.Status status, CASServiceResponse serviceResponse) { - MediaType responseMediaType = new ContentTypeHelper(request, restRequest, session.getContext().getUri()).selectResponseType(); + MediaType responseMediaType = new ContentTypeHelper(session.getContext().getUri()).selectResponseType(); return ServiceResponseHelper.createResponse(status, responseMediaType, serviceResponse); } } -- Gitblit v1.9.1