From b9d66b05ba1b10148a36e08d52853012f54526d9 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 23 Apr 2022 08:49:54 +0000
Subject: [PATCH] Update to Keycloak 18.0.0

---
 src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java |   11 ++++++++++-
 1 files changed, 10 insertions(+), 1 deletions(-)

diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
index 14f276a..718ae6b 100644
--- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
+++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
@@ -36,6 +36,7 @@
     public static final String FORMAT_PARAM = "format";
 
     public static final String TICKET_RESPONSE_PARAM = "ticket";
+    public static final String SAMLART_RESPONSE_PARAM = "SAMLart";
 
     public static final String SERVICE_TICKET_PREFIX = "ST-";
     public static final String SESSION_SERVICE_TICKET = "service_ticket";
@@ -102,7 +103,15 @@
         String code = OAuth2CodeParser.persistCode(session, clientSession, codeData);
 
         KeycloakUriBuilder uriBuilder = KeycloakUriBuilder.fromUri(service);
-        uriBuilder.queryParam(TICKET_RESPONSE_PARAM, SERVICE_TICKET_PREFIX + code);
+
+        String loginTicket = SERVICE_TICKET_PREFIX + code;
+
+        if (authSession.getClientNotes().containsKey(CASLoginProtocol.TARGET_PARAM)) {
+            // This was a SAML 1.1 auth request so return the ticket ID as "SAMLart" instead of "ticket"
+            uriBuilder.queryParam(SAMLART_RESPONSE_PARAM, loginTicket);
+        } else {
+            uriBuilder.queryParam(TICKET_RESPONSE_PARAM, loginTicket);
+        }
 
         URI redirectUri = uriBuilder.build();
 

--
Gitblit v1.9.1