Skip to content

Commit

Permalink
Revert "LPD-33798 make it private"
Browse files Browse the repository at this point in the history
This reverts commit 6093ee3
  • Loading branch information
tomibiro committed Sep 12, 2024
1 parent bfddf4d commit 8fd57e7
Showing 1 changed file with 15 additions and 16 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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();
}
Expand Down Expand Up @@ -262,6 +261,20 @@ public void requestAuthentication(
httpServletRequest, httpServletResponse);
}

protected Map<String, Object> getUserInfoClaims(JWT jwt)
throws java.text.ParseException {

JWTClaimsSet jwtClaimsSet = jwt.getJWTClaimsSet();

Map<String, Object> 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,
Expand Down Expand Up @@ -384,20 +397,6 @@ private URI _getLoginRedirectURI(HttpServletRequest httpServletRequest) {
}
}

private Map<String, Object> _getUserInfoClaims(JWT jwt)
throws java.text.ParseException {

JWTClaimsSet jwtClaimsSet = jwt.getJWTClaimsSet();

Map<String, Object> 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 {
Expand Down

0 comments on commit 8fd57e7

Please sign in to comment.