Switching name to preferred username in AuthFilter (#209)

Co-authored-by: Krishnan Subramanian <krishnan.s@aot-technologies.com>
AOT-Technologies · Jan 18, 2022 · 18a77a7 · 18a77a7
1 parent 25e165e
commit 18a77a7
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/...m/src/main/java/org/camunda/bpm/extension/keycloak/rest/KeycloakAuthenticationFilter.java b/...m/src/main/java/org/camunda/bpm/extension/keycloak/rest/KeycloakAuthenticationFilter.java
@@ -51,10 +51,10 @@ public void doFilter(ServletRequest request, ServletResponse response, FilterCha
 		String userId = null;
 		Map<String, Object> claims;
 		if (authentication instanceof JwtAuthenticationToken) {
-			userId = ((JwtAuthenticationToken)authentication).getName();
+			userId = ((JwtAuthenticationToken) authentication).getToken().getClaimAsString("preferred_username");
 			claims = ((JwtAuthenticationToken)authentication).getToken().getClaims();
 		} else if (authentication.getPrincipal() instanceof OidcUser) {
-			userId = ((OidcUser)authentication.getPrincipal()).getName();
+			userId = ((OidcUser)authentication.getPrincipal()).getPreferredUsername();
 			claims = ((OidcUser)authentication.getPrincipal()).getClaims();
 		} else {
 			throw new ServletException("Invalid authentication request token");

diff --git a/...c/test/java/org/camunda/bpm/extension/keycloak/rest/KeycloakAuthenticationFilterTest.java b/...c/test/java/org/camunda/bpm/extension/keycloak/rest/KeycloakAuthenticationFilterTest.java
@@ -75,6 +75,8 @@ public void doFilterTest() throws IOException, ServletException {
 				.thenReturn(oidcUser);
 		when(oidcUser.getName())
 				.thenReturn(userId);
+		when(oidcUser.getPreferredUsername())
+			.thenReturn(userId);
 		when(oidcUser.getClaims())
 				.thenReturn(claims);