From cbb2f2f81452a97fddbdcc1f6010fbc85682e3b3 Mon Sep 17 00:00:00 2001
From: Erlend Hamnaberg <erlend@hamnaberg.net>
Date: Thu, 29 Nov 2018 07:42:20 +0000
Subject: [PATCH] Redirect to application after login is complete
---
src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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..2723079 100644
--- a/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
+++ b/src/main/java/org/keycloak/protocol/cas/CASLoginProtocol.java
@@ -12,7 +12,6 @@
import org.keycloak.services.managers.ClientSessionCode;
import org.keycloak.services.managers.ResourceAdminManager;
import org.keycloak.sessions.AuthenticationSessionModel;
-import org.keycloak.sessions.CommonClientSessionModel;
import javax.ws.rs.core.HttpHeaders;
import javax.ws.rs.core.Response;
@@ -86,14 +85,16 @@
}
@Override
- public Response authenticated(UserSessionModel userSession, AuthenticatedClientSessionModel clientSession) {
+ public Response authenticated(UserSessionModel userSession, ClientSessionContext clientSessionCtx) {
+ AuthenticatedClientSessionModel clientSession = clientSessionCtx.getClientSession();
ClientSessionCode<AuthenticatedClientSessionModel> accessCode = new ClientSessionCode<>(session, realm, clientSession);
String service = clientSession.getRedirectUri();
//TODO validate service
- accessCode.setAction(CommonClientSessionModel.Action.CODE_TO_TOKEN.name());
+
+ String code = accessCode.getOrGenerateCode();
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();
@@ -140,13 +141,14 @@
event.event(EventType.LOGOUT);
event.user(userSession.getUser()).session(userSession).success();
- LoginFormsProvider infoPage = session.getProvider(LoginFormsProvider.class).setSuccess("Logout successful");
+
if (redirectUri != null) {
- infoPage.setAttribute("pageRedirectUri", redirectUri);
+ return Response.status(302).location(URI.create(redirectUri)).build();
} else {
+ LoginFormsProvider infoPage = session.getProvider(LoginFormsProvider.class).setSuccess("Logout successful");
infoPage.setAttribute("skipLink", true);
+ return infoPage.createInfoPage();
}
- return infoPage.createInfoPage();
}
@Override
--
Gitblit v1.9.1