diff --git a/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java b/src/main/java/me/zhyd/oauth/request/AuthDefaultRequest.java index bd30cfafd2d2d7347dde1e3f1903f4fe4e045367..401c8b470e945e64fa5577a7832cbeecc172d218 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 2d1c8c3643b48c097fab8a9879f120c2345776b8..d5e22f45c1ac480d7b020497a7867ca198869e53 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); } }