Use pattern matching
Closes gh-1907 Signed-off-by: arefbehboudi <behboodiaref@gmail.com>
This commit is contained in:
committed by
Joe Grandja
parent
904a7eaf7b
commit
2e9fe7e99e
@@ -50,10 +50,10 @@ public final class FederatedIdentityAuthenticationSuccessHandler implements Auth
|
||||
@Override
|
||||
public void onAuthenticationSuccess(HttpServletRequest request, HttpServletResponse response, Authentication authentication) throws IOException, ServletException {
|
||||
if (authentication instanceof OAuth2AuthenticationToken) {
|
||||
if (authentication.getPrincipal() instanceof OidcUser) {
|
||||
this.oidcUserHandler.accept((OidcUser) authentication.getPrincipal());
|
||||
} else if (authentication.getPrincipal() instanceof OAuth2User) {
|
||||
this.oauth2UserHandler.accept((OAuth2User) authentication.getPrincipal());
|
||||
if (authentication.getPrincipal() instanceof OidcUser oidcUser) {
|
||||
this.oidcUserHandler.accept(oidcUser);
|
||||
} else if (authentication.getPrincipal() instanceof OAuth2User oAuth2User) {
|
||||
this.oauth2UserHandler.accept(oAuth2User);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -77,12 +77,10 @@ public final class FederatedIdentityIdTokenCustomizer implements OAuth2TokenCust
|
||||
|
||||
private Map<String, Object> extractClaims(Authentication principal) {
|
||||
Map<String, Object> claims;
|
||||
if (principal.getPrincipal() instanceof OidcUser) {
|
||||
OidcUser oidcUser = (OidcUser) principal.getPrincipal();
|
||||
if (principal.getPrincipal() instanceof OidcUser oidcUser) {
|
||||
OidcIdToken idToken = oidcUser.getIdToken();
|
||||
claims = idToken.getClaims();
|
||||
} else if (principal.getPrincipal() instanceof OAuth2User) {
|
||||
OAuth2User oauth2User = (OAuth2User) principal.getPrincipal();
|
||||
} else if (principal.getPrincipal() instanceof OAuth2User oauth2User) {
|
||||
claims = oauth2User.getAttributes();
|
||||
} else {
|
||||
claims = Collections.emptyMap();
|
||||
|
||||
Reference in New Issue
Block a user