From 8352fb1726e5efab21531bc0b15df784dc5ae0df Mon Sep 17 00:00:00 2001
From: Matthias Piepkorn <mpiepk@gmail.com>
Date: Tue, 14 Nov 2017 19:52:17 +0000
Subject: [PATCH] release 2.1.0

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

diff --git a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
index cbcf1d0..b796962 100644
--- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
+++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
@@ -18,6 +18,7 @@
 import javax.ws.rs.core.Response;
 import javax.ws.rs.core.UriInfo;
 import java.io.IOException;
+import java.lang.reflect.Method;
 import java.net.URI;
 
 public class CASLoginProtocol implements LoginProtocol {
@@ -91,9 +92,19 @@
 
         String service = clientSession.getRedirectUri();
         //TODO validate service
-        accessCode.setAction(CommonClientSessionModel.Action.CODE_TO_TOKEN.name());
+
+        String code;
+        try {
+            // Keycloak >3.4 branch: Method getCode was renamed to getOrGenerateCode, CODE_TO_TOKEN was removed
+            Method getOrGenerateCode = ClientSessionCode.class.getMethod("getOrGenerateCode");
+            code = (String) getOrGenerateCode.invoke(accessCode);
+        } catch (ReflectiveOperationException e) {
+            // Keycloak <=3.3 branch
+            accessCode.setAction(CommonClientSessionModel.Action.CODE_TO_TOKEN.name());
+            code = accessCode.getCode();
+        }
         KeycloakUriBuilder uriBuilder = KeycloakUriBuilder.fromUri(service);
-        uriBuilder.queryParam(TICKET_RESPONSE_PARAM, SERVICE_TICKET_PREFIX + accessCode.getCode());
+        uriBuilder.queryParam(TICKET_RESPONSE_PARAM, SERVICE_TICKET_PREFIX + code);
 
         URI redirectUri = uriBuilder.build();
 

--
Gitblit v1.9.1