From 9a24553acddda336037ba729def47b4296deb947 Mon Sep 17 00:00:00 2001
From: "yadong.zhang" <yadong.zhang0415@gmail.com>
Date: Wed, 11 Aug 2021 11:03:08 +0800
Subject: [PATCH] =?UTF-8?q?:bug:=20=E9=A2=84=E9=98=B2=20NPE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/me/zhyd/oauth/AuthRequestBuilder.java   | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/src/main/java/me/zhyd/oauth/AuthRequestBuilder.java b/src/main/java/me/zhyd/oauth/AuthRequestBuilder.java
index 0f5e8cf..91253e9 100644
--- a/src/main/java/me/zhyd/oauth/AuthRequestBuilder.java
+++ b/src/main/java/me/zhyd/oauth/AuthRequestBuilder.java
@@ -4,6 +4,7 @@ import me.zhyd.oauth.cache.AuthStateCache;
 import me.zhyd.oauth.config.AuthConfig;
 import me.zhyd.oauth.config.AuthDefaultSource;
 import me.zhyd.oauth.config.AuthSource;
+import me.zhyd.oauth.enums.AuthResponseStatus;
 import me.zhyd.oauth.exception.AuthException;
 import me.zhyd.oauth.request.AuthDefaultRequest;
 import me.zhyd.oauth.request.AuthRequest;
@@ -60,11 +61,8 @@ public class AuthRequestBuilder {
     }
 
     public AuthRequest build() {
-        if (StringUtils.isEmpty(this.source)) {
-            throw new AuthException("未配置 source");
-        }
-        if (null == this.authConfig) {
-            throw new AuthException("未配置 AuthConfig");
+        if (StringUtils.isEmpty(this.source) || null == this.authConfig) {
+            throw new AuthException(AuthResponseStatus.NOT_IMPLEMENTED);
         }
         // 合并 JustAuth 默认的 AuthDefaultSource 和 开发者自定义的 AuthSource
         AuthSource[] sources = this.concat(AuthDefaultSource.values(), extendSource);
@@ -72,8 +70,12 @@ public class AuthRequestBuilder {
         AuthSource source = Arrays.stream(sources).distinct()
             .filter(authSource -> authSource.getName().equalsIgnoreCase(this.source))
             .findAny()
-            .orElseThrow(() -> new AuthException("未获取到有效的 AuthSource 配置"));
+            .orElseThrow(() -> new AuthException(AuthResponseStatus.NOT_IMPLEMENTED));
+
         Class<? extends AuthDefaultRequest> targetClass = source.getTargetClass();
+        if (null == targetClass) {
+            throw new AuthException(AuthResponseStatus.NOT_IMPLEMENTED);
+        }
         try {
             if (this.authStateCache == null) {
                 return targetClass.getDeclaredConstructor(AuthConfig.class).newInstance(this.authConfig);
@@ -82,7 +84,7 @@ public class AuthRequestBuilder {
             }
         } catch (Exception e) {
             e.printStackTrace();
-            throw new AuthException("未获取到有效的 Auth 配置");
+            throw new AuthException(AuthResponseStatus.NOT_IMPLEMENTED);
         }
     }
 
-- 
GitLab