Fix merge

jgrandja · jgrandja · commit f66fb0814b2e · 2026-04-07T16:12:34.000-04:00
diff --git a/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/JwtGenerator.java b/oauth2/oauth2-authorization-server/src/main/java/org/springframework/security/oauth2/server/authorization/token/JwtGenerator.java
@@ -144,7 +144,7 @@ else if (OidcParameterNames.ID_TOKEN.equals(context.getTokenType().getValue()))
 				SessionInformation sessionInformation = context.get(SessionInformation.class);
 				if (sessionInformation != null) {
 					claimsBuilder.claim("sid", sessionInformation.getSessionId());
-					claimsBuilder.claim(IdTokenClaimNames.AUTH_TIME, getAuthenticationTime(context.getPrincipal()));
+					claimsBuilder.claim(IdTokenClaimNames.AUTH_TIME, getAuthenticationTime(principal));
 				}
 			}
 			else if (AuthorizationGrantType.REFRESH_TOKEN.equals(authorizationGrantType)) {

Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ else if (OidcParameterNames.ID_TOKEN.equals(context.getTokenType().getValue()))`
`144`	`144`	`SessionInformation sessionInformation = context.get(SessionInformation.class);`
`145`	`145`	`if (sessionInformation != null) {`
`146`	`146`	`claimsBuilder.claim("sid", sessionInformation.getSessionId());`
`147`		`- claimsBuilder.claim(IdTokenClaimNames.AUTH_TIME, getAuthenticationTime(context.getPrincipal()));`
	`147`	`+ claimsBuilder.claim(IdTokenClaimNames.AUTH_TIME, getAuthenticationTime(principal));`
`148`	`148`	`}`
`149`	`149`	`}`
`150`	`150`	`else if (AuthorizationGrantType.REFRESH_TOKEN.equals(authorizationGrantType)) {`