From b1e2e8a526244498568e2306bfe45b7f9218e3e0 Mon Sep 17 00:00:00 2001
From: click33 <2393584716@qq.com>
Date: Mon, 12 Aug 2024 07:56:29 +0800
Subject: [PATCH] =?UTF-8?q?sa-token-oauth2=20=E9=80=82=E9=85=8D=E5=A4=9A?=
 =?UTF-8?q?=E8=B4=A6=E5=8F=B7=E6=A8=A1=E5=BC=8F=EF=BC=8C=E5=85=81=E8=AE=B8?=
 =?UTF-8?q?=E9=87=8D=E5=86=99=E4=BD=BF=E7=94=A8=E7=9A=84=E4=BC=9A=E8=AF=9D?=
 =?UTF-8?q?=20StpLogic?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../processor/SaOAuth2ServerProcessor.java    | 25 +++++++++++++------
 1 file changed, 17 insertions(+), 8 deletions(-)

diff --git a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/processor/SaOAuth2ServerProcessor.java b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/processor/SaOAuth2ServerProcessor.java
index f0268130..17abf829 100644
--- a/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/processor/SaOAuth2ServerProcessor.java
+++ b/sa-token-plugin/sa-token-oauth2/src/main/java/cn/dev33/satoken/oauth2/processor/SaOAuth2ServerProcessor.java
@@ -30,6 +30,7 @@ import cn.dev33.satoken.oauth2.error.SaOAuth2ErrorCode;
 import cn.dev33.satoken.oauth2.exception.SaOAuth2Exception;
 import cn.dev33.satoken.oauth2.model.*;
 import cn.dev33.satoken.oauth2.template.SaOAuth2Template;
+import cn.dev33.satoken.stp.StpLogic;
 import cn.dev33.satoken.stp.StpUtil;
 import cn.dev33.satoken.util.SaFoxUtil;
 import cn.dev33.satoken.util.SaResult;
@@ -141,12 +142,12 @@ public class SaOAuth2ServerProcessor {
 		SaOAuth2Config cfg = SaOAuth2Manager.getConfig();
 
 		// 1、如果尚未登录, 则先去登录
-		if( ! StpUtil.isLogin()) {
+		if( ! getStpLogic().isLogin()) {
 			return cfg.getNotLoginView().get();
 		}
 
 		// 2、构建请求Model
-		RequestAuthModel ra = oauth2Template.generateRequestAuth(req, StpUtil.getLoginId());
+		RequestAuthModel ra = oauth2Template.generateRequestAuth(req, getStpLogic().getLoginId());
 
 		// 3、校验：重定向域名是否合法
 		oauth2Template.checkRightUrl(ra.clientId, ra.redirectUri);
@@ -286,7 +287,7 @@ public class SaOAuth2ServerProcessor {
 
 		String clientId = req.getParamNotNull(Param.client_id);
 		String scope = req.getParamNotNull(Param.scope);
-		Object loginId = StpUtil.getLoginId();
+		Object loginId = getStpLogic().getLoginId();
 		oauth2Template.saveGrantScope(clientId, loginId, scope);
 		return SaResult.ok();
 	}
@@ -298,7 +299,6 @@ public class SaOAuth2ServerProcessor {
 	public Object password() {
 		// 获取变量
 		SaRequest req = SaHolder.getRequest();
-		SaResponse res = SaHolder.getResponse();
 		SaOAuth2Config cfg = SaOAuth2Manager.getConfig();
 
 		// 1、获取请求参数
@@ -312,18 +312,18 @@ public class SaOAuth2ServerProcessor {
 		oauth2Template.checkClientSecretAndScope(clientId, clientSecret, scope);
 
 		// 3、防止因前端误传token造成逻辑干扰
-		// SaHolder.getStorage().set(StpUtil.stpLogic.splicingKeyJustCreatedSave(), "no-token");
+		// SaHolder.getStorage().set(getStpLogic().stpLogic.splicingKeyJustCreatedSave(), "no-token");
 
 		// 3、调用API 开始登录，如果没能成功登录，则直接退出
 		Object retObj = cfg.getDoLoginHandle().apply(username, password);
-		if( ! StpUtil.isLogin()) {
+		if( ! getStpLogic().isLogin()) {
 			return retObj;
 		}
 
 		// 4、构建 ra对象
 		RequestAuthModel ra = new RequestAuthModel();
 		ra.clientId = clientId;
-		ra.loginId = StpUtil.getLoginId();
+		ra.loginId = getStpLogic().getLoginId();
 		ra.scope = scope;
 
 		// 5、生成 Access-Token
@@ -369,5 +369,14 @@ public class SaOAuth2ServerProcessor {
 		String clientId = SaHolder.getRequest().getParam(Param.client_id);
 		return oauth2Template.checkClientModel(clientId);
 	}
-	
+
+	/**
+	 * 获取底层使用的会话对象
+	 *
+	 * @return /
+	 */
+	public StpLogic getStpLogic() {
+		return StpUtil.stpLogic;
+	}
+
 }