From d896e7242cd66433077625024a3714fc57197df5 Mon Sep 17 00:00:00 2001
From: zwj <6513209+imagine0820@user.noreply.gitee.com>
Date: Wed, 22 Jan 2025 07:41:23 +0000
Subject: [PATCH] =?UTF-8?q?=E5=BD=93=E5=B7=B2=E5=AD=98=E5=9C=A8token?=
 =?UTF-8?q?=E6=97=B6=E4=B9=9F=E9=9C=80=E8=A6=81=E4=BF=9D=E5=AD=98visited?=
 =?UTF-8?q?=E5=88=B0=E5=BD=93=E5=89=8Dsession=E5=91=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: zwj <6513209+imagine0820@user.noreply.gitee.com>
---
 .../provider/token/DefaultTokenServices.java  | 34 +++++++++++--------
 1 file changed, 19 insertions(+), 15 deletions(-)

diff --git a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultTokenServices.java b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultTokenServices.java
index cc47d1ac3..becf5f7e1 100644
--- a/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultTokenServices.java
+++ b/maxkey-protocols/maxkey-protocol-oauth-2.0/src/main/java/org/dromara/maxkey/authz/oauth2/provider/token/DefaultTokenServices.java
@@ -91,6 +91,23 @@ public class DefaultTokenServices implements AuthorizationServerTokenServices, R
 		Assert.notNull(tokenStore, "tokenStore must be set");
 	}
 
+    private void saveVisited(OAuth2Authentication authentication, OAuth2AccessToken accessToken) {
+		//存储oauth、oidc等的token,用户退出时清除
+		if(authentication.getUserAuthentication().getPrincipal() instanceof SignPrincipal principal) {
+			_logger.debug("{}({}) , session {} access for logout clear ",
+					principal.getUsername(),principal.getUserId(),principal.getSessionId());
+			String clientId = authentication.getOAuth2Request().getRequestParameters().get(OAuth2Constants.PARAMETER.CLIENT_ID);
+			_logger.debug("client_id {} token {}",clientId, accessToken);
+			Apps app = appsService.get(clientId, true);
+			VisitedDto visited = new VisitedDto(app,principal.getSessionId());
+			visited.setToken(accessToken.getValue());
+			if (Objects.nonNull(accessToken.getRefreshToken())) {
+				visited.setRefreshToken(accessToken.getRefreshToken().getValue());
+			}
+			sessionManager.visited(principal.getSessionId(), visited);
+		}
+	}
+
 	@Transactional
 	public OAuth2AccessToken createAccessToken(OAuth2Authentication authentication) throws AuthenticationException {
 
@@ -110,6 +127,7 @@ public class DefaultTokenServices implements AuthorizationServerTokenServices, R
 			else {
 				// Re-store the access token in case the authentication has changed
 				tokenStore.storeAccessToken(existingAccessToken, authentication);
+                saveVisited(authentication, existingAccessToken);
 				return enhancerToken(existingAccessToken, authentication);
 			}
 		}
@@ -138,21 +156,7 @@ public class DefaultTokenServices implements AuthorizationServerTokenServices, R
 		if (refreshToken != null) {
 			tokenStore.storeRefreshToken(refreshToken, authentication);
 		}
-		//存储oauth、oidc等的token,用户退出时清除
-		if(authentication.getUserAuthentication().getPrincipal() instanceof SignPrincipal principal) {
-			_logger.debug("{}({}) , session {} access for logout clear ",
-					principal.getUsername(),principal.getUserId(),principal.getSessionId());
-			String clientId = authentication.getOAuth2Request().getRequestParameters().get(OAuth2Constants.PARAMETER.CLIENT_ID);
-			_logger.debug("client_id {} token {}",clientId,accessToken);
-			Apps app = appsService.get(clientId, true);
-			VisitedDto visited = new VisitedDto(app,principal.getSessionId());
-			visited.setToken(accessToken.getValue());
-			//TODO: RefreshToken null 
-			if (refreshToken != null) {
-				visited.setRefreshToken(accessToken.getRefreshToken().getValue());
-			}
-			sessionManager.visited(principal.getSessionId(), visited);
-		}
+		saveVisited(authentication, accessToken);
 		return accessToken;
 
 	}