From 6fff26d1517dbcec6dfb3f181bda418577ea3b17 Mon Sep 17 00:00:00 2001 From: Jacek Kowalski <Jacek@jacekk.info> Date: Fri, 24 Nov 2023 13:37:32 +0000 Subject: [PATCH] ContextTypeHelper: do account for the "Accept" header (per CAS specs) --- src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java | 16 +++++++--------- 1 files changed, 7 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 fa56d4f..d6b459d 100644 --- a/src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java +++ b/src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java @@ -1,20 +1,18 @@ 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.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 @@ -39,7 +37,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