From a41a341aca743d71e8df732916170d9dba498e4f Mon Sep 17 00:00:00 2001 From: Sriharsha Chintalapani Date: Sat, 6 Jan 2024 23:49:52 -0800 Subject: [PATCH] Minor: Revert JWT Filter changes to extract username (#14607) --- .../org/openmetadata/service/security/JwtFilter.java | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/openmetadata-service/src/main/java/org/openmetadata/service/security/JwtFilter.java b/openmetadata-service/src/main/java/org/openmetadata/service/security/JwtFilter.java index 470a3dc6a60..559630e4486 100644 --- a/openmetadata-service/src/main/java/org/openmetadata/service/security/JwtFilter.java +++ b/openmetadata-service/src/main/java/org/openmetadata/service/security/JwtFilter.java @@ -14,7 +14,6 @@ package org.openmetadata.service.security; import static org.openmetadata.common.utils.CommonUtil.nullOrEmpty; -import static org.openmetadata.service.security.jwt.JWTTokenGenerator.SUBJECT_CLAIM; import static org.openmetadata.service.security.jwt.JWTTokenGenerator.TOKEN_TYPE; import com.auth0.jwk.Jwk; @@ -184,12 +183,6 @@ public class JwtFilter implements ContainerRequestFilter { @SneakyThrows public String validateAndReturnUsername(Map claims) { - // Get username from JWT token - String claimUserName = ""; - if (!Objects.isNull(claims.get(SUBJECT_CLAIM))) { - claimUserName = claims.get(SUBJECT_CLAIM).as(TextNode.class).asText(); - } - // Get email from JWT token String jwtClaim = jwtPrincipalClaims.stream() @@ -213,11 +206,6 @@ public class JwtFilter implements ContainerRequestFilter { domain = StringUtils.EMPTY; } - // Prefer userName over email - if (org.apache.commons.lang3.StringUtils.isNotBlank(claimUserName)) { - userName = claimUserName; - } - // validate principal domain if (enforcePrincipalDomain && !domain.equals(principalDomain)) { throw new AuthenticationException(