From f66fb0814b2e5a9fcd83cfacfe9ea658472b60d2 Mon Sep 17 00:00:00 2001
From: Joe Grandja <10884212+jgrandja@users.noreply.github.com>
Date: Tue, 7 Apr 2026 16:12:34 -0400
Subject: [PATCH] Fix merge

---
 .../oauth2/server/authorization/token/JwtGenerator.java         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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
index 05461f973a..562f546aa3 100644
--- 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 @@ public final class JwtGenerator implements OAuth2TokenGenerator<Jwt> {
 				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)) {