From 4302a86fad195731f986953d92556a2c755cd8f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?/usr/local/=CE=95=CE=A8=CE=97=CE=95=CE=9B=CE=A9=CE=9D?= Date: Fri, 20 Aug 2021 16:09:33 +0200 Subject: [PATCH] Default principalClaimName to SUB Closes gh-10214 --- .../authentication/JwtAuthenticationConverter.java | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationConverter.java b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationConverter.java index 787c3a5fb6..7478d1d0df 100644 --- a/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationConverter.java +++ b/oauth2/oauth2-resource-server/src/main/java/org/springframework/security/oauth2/server/resource/authentication/JwtAuthenticationConverter.java @@ -1,5 +1,5 @@ /* - * Copyright 2002-2020 the original author or authors. + * Copyright 2002-2021 the original author or authors. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -36,14 +36,12 @@ public class JwtAuthenticationConverter implements Converter> jwtGrantedAuthoritiesConverter = new JwtGrantedAuthoritiesConverter(); - private String principalClaimName; + private String principalClaimName = JwtClaimNames.SUB; @Override public final AbstractAuthenticationToken convert(Jwt jwt) { Collection authorities = extractAuthorities(jwt); - if (this.principalClaimName == null) { - return new JwtAuthenticationToken(jwt, authorities); - } + String principalClaimValue = jwt.getClaimAsString(this.principalClaimName); return new JwtAuthenticationToken(jwt, authorities, principalClaimValue); }