From ceed8fb052685c0105d225a61d8574d36e171166 Mon Sep 17 00:00:00 2001
From: Jacek Kowalski <Jacek@jacekk.info>
Date: Fri, 24 Nov 2023 13:37:32 +0000
Subject: [PATCH] Get rid of @Context variables in Endpoint classes
---
src/main/java/org/keycloak/protocol/cas/utils/ServiceResponseHelper.java | 31 ++++++++++++++++---------------
1 files changed, 16 insertions(+), 15 deletions(-)
diff --git a/src/main/java/org/keycloak/protocol/cas/utils/ServiceResponseHelper.java b/src/main/java/org/keycloak/protocol/cas/utils/ServiceResponseHelper.java
index 8b927b8..ada4d7f 100644
--- a/src/main/java/org/keycloak/protocol/cas/utils/ServiceResponseHelper.java
+++ b/src/main/java/org/keycloak/protocol/cas/utils/ServiceResponseHelper.java
@@ -1,12 +1,13 @@
package org.keycloak.protocol.cas.utils;
-import org.keycloak.protocol.cas.representations.CasServiceResponse;
-import org.keycloak.protocol.cas.representations.CasServiceResponseAuthenticationFailure;
-import org.keycloak.protocol.cas.representations.CasServiceResponseAuthenticationSuccess;
+import jakarta.ws.rs.core.HttpHeaders;
+import jakarta.ws.rs.core.MediaType;
+import jakarta.ws.rs.core.Response;
+import org.keycloak.protocol.cas.representations.CASErrorCode;
+import org.keycloak.protocol.cas.representations.CASServiceResponse;
+import org.keycloak.protocol.cas.representations.CASServiceResponseAuthenticationFailure;
+import org.keycloak.protocol.cas.representations.CASServiceResponseAuthenticationSuccess;
-import javax.ws.rs.core.HttpHeaders;
-import javax.ws.rs.core.MediaType;
-import javax.ws.rs.core.Response;
import java.util.List;
import java.util.Map;
@@ -14,14 +15,14 @@
private ServiceResponseHelper() {
}
- public static CasServiceResponse createSuccess(String username, Map<String, Object> attributes) {
+ public static CASServiceResponse createSuccess(String username, Map<String, Object> attributes) {
return createSuccess(username, attributes, null, null);
}
- public static CasServiceResponse createSuccess(String username, Map<String, Object> attributes,
+ public static CASServiceResponse createSuccess(String username, Map<String, Object> attributes,
String proxyGrantingTicket, List<String> proxies) {
- CasServiceResponse response = new CasServiceResponse();
- CasServiceResponseAuthenticationSuccess success = new CasServiceResponseAuthenticationSuccess();
+ CASServiceResponse response = new CASServiceResponse();
+ CASServiceResponseAuthenticationSuccess success = new CASServiceResponseAuthenticationSuccess();
success.setUser(username);
success.setProxies(proxies);
success.setProxyGrantingTicket(proxyGrantingTicket);
@@ -32,17 +33,17 @@
return response;
}
- public static CasServiceResponse createFailure(String errorCode, String errorDescription) {
- CasServiceResponse response = new CasServiceResponse();
- CasServiceResponseAuthenticationFailure failure = new CasServiceResponseAuthenticationFailure();
- failure.setCode(errorCode);
+ public static CASServiceResponse createFailure(CASErrorCode errorCode, String errorDescription) {
+ CASServiceResponse response = new CASServiceResponse();
+ CASServiceResponseAuthenticationFailure failure = new CASServiceResponseAuthenticationFailure();
+ failure.setCode(errorCode == null ? CASErrorCode.INTERNAL_ERROR.name() : errorCode.name());
failure.setDescription(errorDescription);
response.setAuthenticationFailure(failure);
return response;
}
- public static Response createResponse(Response.Status status, MediaType mediaType, CasServiceResponse serviceResponse) {
+ public static Response createResponse(Response.Status status, MediaType mediaType, CASServiceResponse serviceResponse) {
Response.ResponseBuilder builder = Response.status(status)
.header(HttpHeaders.CONTENT_TYPE, mediaType.withCharset("utf-8"));
if (MediaType.APPLICATION_JSON_TYPE.equals(mediaType)) {
--
Gitblit v1.9.1