From 421cabb176677c516a25ec81167c782240803ea5 Mon Sep 17 00:00:00 2001
From: "yadong.zhang" <yadong.zhang0415@gmail.com>
Date: Tue, 30 Jul 2019 21:19:55 +0800
Subject: [PATCH] =?UTF-8?q?:ambulance:=20=E4=BC=98=E5=8C=96=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/me/zhyd/oauth/request/AuthDefaultRequest.java |  5 +----
 src/main/java/me/zhyd/oauth/utils/AuthChecker.java     | 10 ++++------
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java b/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java
index bd30cfa..401c8b4 100644
--- a/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java
+++ b/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java
@@ -68,11 +68,8 @@ public abstract class AuthDefaultRequest implements AuthRequest {
     @Override
     public AuthResponse login(AuthCallback authCallback) {
         try {
-            if (!AuthStateCache.containsKey(authCallback.getState())) {
-                throw new AuthException(AuthResponseStatus.ILLEGAL_REQUEST);
-            }
             AuthChecker.checkCode(source == AuthSource.ALIPAY ? authCallback.getAuth_code() : authCallback.getCode());
-            AuthChecker.checkState(authCallback);
+            AuthChecker.checkState(authCallback.getState());
 
             AuthToken authToken = this.getAccessToken(authCallback);
             AuthUser user = this.getUserInfo(authToken);
diff --git a/src/main/java/me/zhyd/oauth/utils/AuthChecker.java b/src/main/java/me/zhyd/oauth/utils/AuthChecker.java
index 2d1c8c3..d5e22f4 100644
--- a/src/main/java/me/zhyd/oauth/utils/AuthChecker.java
+++ b/src/main/java/me/zhyd/oauth/utils/AuthChecker.java
@@ -1,10 +1,10 @@
 package me.zhyd.oauth.utils;
 
+import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthSource;
+import me.zhyd.oauth.enums.AuthResponseStatus;
 import me.zhyd.oauth.exception.AuthException;
-import me.zhyd.oauth.model.AuthCallback;
-import me.zhyd.oauth.model.AuthResponseStatus;
 
 /**
  * 授权配置类的校验器
@@ -69,11 +69,9 @@ public class AuthChecker {
 
     /**
      * 校验回调传回的state
-     *
-     * @param authCallback 回调
      */
-    public static void checkState(AuthCallback authCallback) {
-        if (!authCallback.checkState()) {
+    public static void checkState(String state) {
+        if (!AuthStateCache.containsKey(state)) {
             throw new AuthException(AuthResponseStatus.ILLEGAL_REQUEST);
         }
     }
-- 
GitLab