From f4c9ba04fa3653b88721464c3ca7257a906dfeb1 Mon Sep 17 00:00:00 2001
From: github-actions <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 26 Jan 2022 09:38:14 +0000
Subject: [PATCH] Update to Keycloak 16.1.1

---
 src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java |   11 +++++++----
 1 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java b/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
index bcf1231..1526d21 100644
--- a/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
+++ b/src/main/java/org/keycloak/protocol/cas/endpoints/AuthorizationEndpoint.java
@@ -33,7 +33,7 @@
 
     @GET
     public Response build() {
-        MultivaluedMap<String, String> params = uriInfo.getQueryParameters();
+        MultivaluedMap<String, String> params = session.getContext().getUri().getQueryParameters();
         String service = params.getFirst(CASLoginProtocol.SERVICE_PARAM);
         boolean renew = params.containsKey(CASLoginProtocol.RENEW_PARAM);
         boolean gateway = params.containsKey(CASLoginProtocol.GATEWAY_PARAM);
@@ -51,9 +51,12 @@
         if (renew) {
             authenticationSession.setClientNote(CASLoginProtocol.RENEW_PARAM, "true");
         }
+        if (gateway) {
+            authenticationSession.setClientNote(CASLoginProtocol.GATEWAY_PARAM, "true");
+        }
 
         this.event.event(EventType.LOGIN);
-        return handleBrowserAuthenticationRequest(authenticationSession, new CASLoginProtocol(session, realm, uriInfo, headers, event), gateway, false);
+        return handleBrowserAuthenticationRequest(authenticationSession, new CASLoginProtocol(session, realm, session.getContext().getUri(), headers, event), gateway, false);
     }
 
     private void checkClient(String service) {
@@ -64,7 +67,7 @@
 
         client = realm.getClients().stream()
                 .filter(c -> CASLoginProtocol.LOGIN_PROTOCOL.equals(c.getProtocol()))
-                .filter(c -> RedirectUtils.verifyRedirectUri(uriInfo, service, realm, c) != null)
+                .filter(c -> RedirectUtils.verifyRedirectUri(session, service, c) != null)
                 .findFirst().orElse(null);
         if (client == null) {
             event.error(Errors.CLIENT_NOT_FOUND);
@@ -76,7 +79,7 @@
             throw new ErrorPageException(session, Response.Status.BAD_REQUEST, Messages.CLIENT_DISABLED);
         }
 
-        redirectUri = RedirectUtils.verifyRedirectUri(uriInfo, service, realm, client);
+        redirectUri = RedirectUtils.verifyRedirectUri(session, service, client);
 
         event.client(client.getClientId());
         event.detail(Details.REDIRECT_URI, redirectUri);

--
Gitblit v1.9.1