From 1b84f3f1eaf1aefb6d0e9967f818610c1575bacb Mon Sep 17 00:00:00 2001 From: YunaiV Date: Tue, 26 Jul 2022 23:49:43 +0800 Subject: [PATCH] =?UTF-8?q?bugfix=EF=BC=9A=E8=A7=A3=E5=86=B3=E7=94=A8?= =?UTF-8?q?=E6=88=B7=20Token=20=E8=BF=87=E6=9C=9F=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E5=9B=A0=E4=B8=BA=20Mono.empty()=20=E5=AF=BC=E8=87=B4=E8=BF=94?= =?UTF-8?q?=E5=9B=9E=E7=A9=BA=E7=9A=84=20Response=20=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../security/TokenAuthenticationFilter.java | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/security/TokenAuthenticationFilter.java b/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/security/TokenAuthenticationFilter.java index 954ad55a..7d366bec 100644 --- a/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/security/TokenAuthenticationFilter.java +++ b/yudao-gateway/src/main/java/cn/iocoder/yudao/gateway/filter/security/TokenAuthenticationFilter.java @@ -34,9 +34,19 @@ import java.util.function.Function; @Component public class TokenAuthenticationFilter implements GlobalFilter, Ordered { + /** + * CommonResult 对应的 TypeReference 结果，用于解析 checkToken 的结果 + */ private static final TypeReference> CHECK_RESULT_TYPE_REFERENCE = new TypeReference>() {}; + /** + * 空的 LoginUser 的结果 + * + * TODO 芋艿：用于解决 getLoginUser 返回 Mono.empty() 的时候，会导致后续的 flatMap 无法进行处理的问题。先暂时这么解决，寻找更优解 ing + */ + private static final LoginUser LOGIN_USER_EMPTY = new LoginUser(); + private final WebClient webClient; /** @@ -76,14 +86,18 @@ public class TokenAuthenticationFilter implements GlobalFilter, Ordered { } // 情况二，如果有 Token 令牌，则解析对应 userId、userType、tenantId 等字段，并通过 通过 Header 转发给服务 - return getLoginUser(exchange, token).flatMap(user -> { - if (user == null) { + // 重要说明：defaultIfEmpty 作用，保证 Mono.empty() 情况，可以继续执行 `flatMap 的 chain.filter(exchange)` 逻辑，避免返回给前端空的 Response！！ + return getLoginUser(exchange, token).defaultIfEmpty(LOGIN_USER_EMPTY).flatMap(user -> { + // 1. 无用户，直接 filter 继续请求 + if (user == LOGIN_USER_EMPTY) { return chain.filter(exchange); } - // 设置登录用户 + + // 2.1 有用户，则设置登录用户 SecurityFrameworkUtils.setLoginUser(exchange, user); - // 将 user 并设置到 login-user 的请求头，使用 json 存储值 - ServerWebExchange newExchange = exchange.mutate().request(builder -> SecurityFrameworkUtils.setLoginUserHeader(builder, user)).build(); + // 2.2 将 user 并设置到 login-user 的请求头，使用 json 存储值 + ServerWebExchange newExchange = exchange.mutate() + .request(builder -> SecurityFrameworkUtils.setLoginUserHeader(builder, user)).build(); return chain.filter(newExchange); }); }