From dd088b75c0a9e58b910f6593951d803bd9813615 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 23 Sep 2024 09:51:33 +0000
Subject: [PATCH] Update to Keycloak 25.0.6
---
src/main/java/org/keycloak/protocol/cas/endpoints/ServiceValidateEndpoint.java | 24 +++++++++---------------
1 files changed, 9 insertions(+), 15 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..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,34 +1,28 @@
package org.keycloak.protocol.cas.endpoints;
+import jakarta.ws.rs.core.MediaType;
+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
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);
}
@@ -39,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