From a8775f757fe993e187ae3966a04b945695305acc Mon Sep 17 00:00:00 2001 From: Stian Thorgersen Date: Mon, 27 Jul 2015 09:59:50 +0200 Subject: [PATCH] KEYCLOAK-1694 Null Client Exception on OAuth Grant Page --- .../org/keycloak/services/resources/IdentityBrokerService.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java b/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java index a6888a9fca..4476557769 100755 --- a/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java +++ b/services/src/main/java/org/keycloak/services/resources/IdentityBrokerService.java @@ -255,6 +255,9 @@ public class IdentityBrokerService implements IdentityProvider.AuthenticationCal } ClientSessionModel clientSession = clientCode.getClientSession(); + + session.getContext().setClient(clientSession.getClient()); + context.getIdp().preprocessFederatedIdentity(session, realmModel, context); Set mappers = realmModel.getIdentityProviderMappersByAlias(context.getIdpConfig().getAlias()); if (mappers != null) {