diff --git a/modules/apps/portal-security-sso/portal-security-sso-openid-connect-impl/src/main/java/com/liferay/portal/security/sso/openid/connect/internal/OpenIdConnectAuthenticationHandlerImpl.java b/modules/apps/portal-security-sso/portal-security-sso-openid-connect-impl/src/main/java/com/liferay/portal/security/sso/openid/connect/internal/OpenIdConnectAuthenticationHandlerImpl.java index 0addc0f0a5119d..d6ee01f22c17f2 100644 --- a/modules/apps/portal-security-sso/portal-security-sso-openid-connect-impl/src/main/java/com/liferay/portal/security/sso/openid/connect/internal/OpenIdConnectAuthenticationHandlerImpl.java +++ b/modules/apps/portal-security-sso/portal-security-sso-openid-connect-impl/src/main/java/com/liferay/portal/security/sso/openid/connect/internal/OpenIdConnectAuthenticationHandlerImpl.java @@ -143,8 +143,7 @@ public void processAuthenticationResponse( if (oidcProviderMetadata.getUserInfoEndpointURI() == null) { UserInfo userInfo = new UserInfo( - JWTClaimsSet.parse( - _getUserInfoClaims(oidcTokens.getIDToken()))); + JWTClaimsSet.parse(getUserInfoClaims(oidcTokens.getIDToken()))); userInfoJSON = userInfo.toJSONString(); } @@ -262,6 +261,20 @@ public void requestAuthentication( httpServletRequest, httpServletResponse); } + protected Map getUserInfoClaims(JWT jwt) + throws java.text.ParseException { + + JWTClaimsSet jwtClaimsSet = jwt.getJWTClaimsSet(); + + Map claims = jwtClaimsSet.toJSONObject(); + + claims.put("email", jwtClaimsSet.getStringClaim("email")); + claims.put("family_name", jwtClaimsSet.getStringClaim("family_name")); + claims.put("given_name", jwtClaimsSet.getStringClaim("given_name")); + + return claims; + } + private URI _getAuthenticationRequestURI( URI authenticationEndpointURI, String authenticationRequestParametersJSON, String clientId, @@ -384,20 +397,6 @@ private URI _getLoginRedirectURI(HttpServletRequest httpServletRequest) { } } - private Map _getUserInfoClaims(JWT jwt) - throws java.text.ParseException { - - JWTClaimsSet jwtClaimsSet = jwt.getJWTClaimsSet(); - - Map claims = jwtClaimsSet.toJSONObject(); - - claims.put("email", jwtClaimsSet.getStringClaim("email")); - claims.put("family_name", jwtClaimsSet.getStringClaim("family_name")); - claims.put("given_name", jwtClaimsSet.getStringClaim("given_name")); - - return claims; - } - private String _requestUserInfoJSON( AccessToken accessToken, OIDCProviderMetadata oidcProviderMetadata) throws OpenIdConnectServiceException.UserInfoException {