From d9e0a4ada25c3e900630cd26e8b0709dc6bc8fe1 Mon Sep 17 00:00:00 2001 From: AKurakin Date: Thu, 13 Jul 2023 14:52:38 +0300 Subject: [PATCH] =?UTF-8?q?backend-api=20=D0=BF=D0=BE=D0=BF=D1=80=D0=B0?= =?UTF-8?q?=D0=B2=D0=B8=D0=BB=20=D1=81=D1=82=D1=83=D0=BA=20=D0=BF=D1=80?= =?UTF-8?q?=D0=B8=20=D0=B0=D0=BD=D0=BE=D0=BD=D0=B8=D0=BC=D0=BD=D0=BE=D0=BC?= =?UTF-8?q?=20=D0=B7=D0=B0=D1=85=D0=BE=D0=B4=D0=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../clearing/backendapi/security/KeycloakUtils.java | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/KeycloakUtils.java b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/KeycloakUtils.java index a4e60ac57..f80fe11dc 100644 --- a/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/KeycloakUtils.java +++ b/clearing-parent/backend-api/src/main/java/ru/spcex/clearing/backendapi/security/KeycloakUtils.java @@ -3,15 +3,23 @@ package ru.spcex.clearing.backendapi.security; import org.keycloak.KeycloakPrincipal; import org.keycloak.adapters.spi.KeycloakAccount; import org.keycloak.adapters.springsecurity.token.KeycloakAuthenticationToken; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory;; import org.springframework.security.core.Authentication; public class KeycloakUtils { + static Logger log = LoggerFactory.getLogger(KeycloakUtils.class); + /** * Достать username из Keycloak имплементации Authentication */ public static String getUserNameFromAuthentication(Authentication authentication) { + if (authentication == null) return null; + if (!(authentication instanceof KeycloakAuthenticationToken)) { // AnonymousAuthenticationToken + log.trace("Authentication token class {} is not KeycloakAuthenticationToken", authentication.getClass().getName()); + return null; + } KeycloakAuthenticationToken auth = (KeycloakAuthenticationToken) authentication; - if (auth == null) return null; KeycloakAccount details = (KeycloakAccount) auth.getDetails(); return ((KeycloakPrincipal) details.getPrincipal()) .getKeycloakSecurityContext()