From a793b81f64d6430a14e736b1dd4729ffa8e873ab Mon Sep 17 00:00:00 2001 From: github-actions <41898282+github-actions[bot]@users.noreply.github.com> Date: Fri, 24 Nov 2023 12:17:22 +0000 Subject: [PATCH] Update to Keycloak 23.0.0 --- src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java | 24 ++++++++++-------------- 1 files changed, 10 insertions(+), 14 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 fa56d4f..2284e25 100644 --- a/src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java +++ b/src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java @@ -1,27 +1,23 @@ 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.*; -import org.keycloak.protocol.ProtocolMapper; -import org.keycloak.protocol.cas.mappers.CASAttributeMapper; +import org.keycloak.models.KeycloakSession; +import org.keycloak.models.RealmModel; +import org.keycloak.models.UserSessionModel; import org.keycloak.protocol.cas.representations.CASServiceResponse; import org.keycloak.protocol.cas.utils.CASValidationException; import org.keycloak.protocol.cas.utils.ContentTypeHelper; import org.keycloak.protocol.cas.utils.ServiceResponseHelper; -import org.keycloak.services.managers.ClientSessionCode; -import org.keycloak.services.util.DefaultClientSessionContext; -import javax.ws.rs.core.*; -import java.util.HashMap; import java.util.Map; -import java.util.Set; 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 @@ -39,7 +35,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