Skip to content

Commit 897e4cb

Browse files
author
Justin Richer
committed
proper null check for client's preferred signature method
1 parent 9df10d3 commit 897e4cb

File tree

1 file changed

+3
-6
lines changed

1 file changed

+3
-6
lines changed

openid-connect-server/src/main/java/org/mitre/openid/connect/token/ConnectTokenEnhancer.java

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -84,12 +84,9 @@ public OAuth2AccessToken enhance(OAuth2AccessToken accessToken, OAuth2Authentica
8484

8585
claims.setJWTID(UUID.randomUUID().toString()); // set a random NONCE in the middle of it
8686

87-
JWSAlgorithm signingAlg;
88-
JWSAlgorithm clientAlg = client.getIdTokenSignedResponseAlg().getAlgorithm();
89-
if (clientAlg != null) {
90-
signingAlg = clientAlg;
91-
} else {
92-
signingAlg = jwtService.getDefaultSigningAlgorithm();
87+
JWSAlgorithm signingAlg = jwtService.getDefaultSigningAlgorithm();
88+
if (client.getIdTokenSignedResponseAlg() != null) {
89+
signingAlg = client.getIdTokenSignedResponseAlg().getAlgorithm();
9390
}
9491

9592
SignedJWT signed = new SignedJWT(new JWSHeader(signingAlg), claims);

0 commit comments

Comments
 (0)