From 197ca341f4539eb3322b50a87a4073d5b138a12a Mon Sep 17 00:00:00 2001
From: zhaoxiaohao <279049017@qq.com>
Date: Thu, 11 Mar 2021 11:02:19 +0800
Subject: [PATCH] 恢复退出的流程
---
kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/handler/OauthLogoutHandler.java | 16 +---------------
1 files changed, 1 insertions(+), 15 deletions(-)
diff --git a/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/handler/OauthLogoutHandler.java b/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/handler/OauthLogoutHandler.java
index 7f31915..b35da2d 100644
--- a/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/handler/OauthLogoutHandler.java
+++ b/kidgrow-uaa/kidgrow-uaa-server/src/main/java/com/kidgrow/oauth2/handler/OauthLogoutHandler.java
@@ -2,15 +2,12 @@
import cn.hutool.core.util.StrUtil;
import com.kidgrow.authclient.util.AuthUtils;
-import com.kidgrow.common.constant.SecurityConstants;
import com.kidgrow.redis.util.RedisUtils;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.core.Authentication;
import org.springframework.security.oauth2.common.OAuth2AccessToken;
import org.springframework.security.oauth2.common.OAuth2RefreshToken;
-import org.springframework.security.oauth2.provider.OAuth2Authentication;
-import org.springframework.security.oauth2.provider.OAuth2Request;
import org.springframework.security.oauth2.provider.token.TokenStore;
import org.springframework.security.web.authentication.logout.LogoutHandler;
import org.springframework.util.Assert;
@@ -35,6 +32,7 @@
@Override
public void logout(HttpServletRequest request, HttpServletResponse response, Authentication authentication) {
+
Assert.notNull(tokenStore, "tokenStore must be set");
String token = request.getParameter("token");
if (StrUtil.isEmpty(token)) {
@@ -43,26 +41,14 @@
if(StrUtil.isNotEmpty(token)){
OAuth2AccessToken existingAccessToken = tokenStore.readAccessToken(token);
OAuth2RefreshToken refreshToken;
- String clientId="";//属于哪个服务
- String userName="";//用户的名称
if (existingAccessToken != null) {
if (existingAccessToken.getRefreshToken() != null) {
- //获取用户信息
- Object o = redisUtils.get(SecurityConstants.REDIS_TOKEN_AUTH + existingAccessToken.getValue());
- if(o!=null){
- OAuth2Authentication accessToken = (OAuth2Authentication)o;
- OAuth2Request requestOuth = accessToken.getOAuth2Request();
- userName=accessToken.getName();
- clientId=requestOuth.getClientId();
- }
log.info("remove refreshToken!", existingAccessToken.getRefreshToken());
refreshToken = existingAccessToken.getRefreshToken();
tokenStore.removeRefreshToken(refreshToken);
}
log.info("remove existingAccessToken!", existingAccessToken);
tokenStore.removeAccessToken(existingAccessToken);
- //将 token与 用户的关联 清除；
- redisUtils.removeAll(SecurityConstants.REDIS_UNAME_TO_ACCESS+clientId+":"+userName);
}
}
}
--
Gitblit v1.8.0