Skip to content

Commit b2cd1bf

Browse files
committed
Fixes gh-3
1 parent def4661 commit b2cd1bf

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

src/main/java/com/example/spring/authorizationserver/config/JwtTokenCustomizerConfig.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import com.example.spring.authorizationserver.security.OidcUserInfoService;
44
import org.springframework.context.annotation.Bean;
55
import org.springframework.context.annotation.Configuration;
6+
import org.springframework.security.oauth2.core.AuthorizationGrantType;
67
import org.springframework.security.oauth2.core.oidc.OidcUserInfo;
78
import org.springframework.security.oauth2.server.authorization.token.JwtEncodingContext;
89
import org.springframework.security.oauth2.server.authorization.token.OAuth2TokenCustomizer;
@@ -15,11 +16,13 @@ public class JwtTokenCustomizerConfig {
1516
@Bean
1617
public OAuth2TokenCustomizer<JwtEncodingContext> tokenCustomizer(OidcUserInfoService userInfoService) {
1718
return (context) -> {
18-
if (ID_TOKEN.equals(context.getTokenType().getValue()) || ACCESS_TOKEN.equals(context.getTokenType())) {
19-
OidcUserInfo userInfo = userInfoService.loadUser(
20-
context.getPrincipal().getName());
21-
context.getClaims().claims(claims ->
22-
claims.putAll(userInfo.getClaims()));
19+
if (!AuthorizationGrantType.CLIENT_CREDENTIALS.equals(context.getAuthorizationGrantType())) {
20+
if (ID_TOKEN.equals(context.getTokenType().getValue()) || ACCESS_TOKEN.equals(context.getTokenType())) {
21+
OidcUserInfo userInfo = userInfoService.loadUser(
22+
context.getPrincipal().getName());
23+
context.getClaims().claims(claims ->
24+
claims.putAll(userInfo.getClaims()));
25+
}
2326
}
2427
};
2528
}

0 commit comments

Comments
 (0)