From c90a52941a5eafc26b25fbf55450c2e65edbab06 Mon Sep 17 00:00:00 2001
From: Max Shaposhnik <mshaposh@redhat.com>
Date: Thu, 23 May 2019 10:32:57 +0300
Subject: [PATCH] Restore account linking on newest keycloak versions

Signed-off-by: Max Shaposhnik <mshaposh@redhat.com>
---
 .../che/multiuser/keycloak/server/KeycloakServiceClient.java   | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/multiuser/keycloak/che-multiuser-keycloak-server/src/main/java/org/eclipse/che/multiuser/keycloak/server/KeycloakServiceClient.java b/multiuser/keycloak/che-multiuser-keycloak-server/src/main/java/org/eclipse/che/multiuser/keycloak/server/KeycloakServiceClient.java
index 3828573d6a..0d0a991736 100644
--- a/multiuser/keycloak/che-multiuser-keycloak-server/src/main/java/org/eclipse/che/multiuser/keycloak/server/KeycloakServiceClient.java
+++ b/multiuser/keycloak/che-multiuser-keycloak-server/src/main/java/org/eclipse/che/multiuser/keycloak/server/KeycloakServiceClient.java
@@ -85,8 +85,7 @@ public class KeycloakServiceClient {
       @SuppressWarnings("rawtypes") Jwt token, String oauthProvider, String redirectAfterLogin) {
 
     DefaultClaims claims = (DefaultClaims) token.getBody();
-    final String clientId = claims.getAudience();
-
+    final String clientId = claims.get("azp", String.class);
     final String sessionState = claims.get("session_state", String.class);
     MessageDigest md;
     try {