From 7f68de392aff21b84cda5663ef7de524f1de0585 Mon Sep 17 00:00:00 2001 From: Halo Dev Bot <87291978+halo-dev-bot@users.noreply.github.com> Date: Fri, 6 Sep 2024 22:15:52 +0800 Subject: [PATCH] [release-2.19] Prevent null role while getting permissions (#6613) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is an automated cherry-pick of #6612 /assign JohnNiang ```release-note 修复取消用户角色后无法正常渲染用户列表的问题 ``` --- .../run/halo/app/core/extension/endpoint/UserEndpoint.java | 6 +++++- .../halo/app/core/extension/service/UserServiceImpl.java | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/application/src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java b/application/src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java index 74d2bb0b5..d8bc8bd98 100644 --- a/application/src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java +++ b/application/src/main/java/run/halo/app/core/extension/endpoint/UserEndpoint.java @@ -771,7 +771,11 @@ public class UserEndpoint implements CustomEndpoint { .map(user -> { var username = user.getMetadata().getName(); var roles = Optional.ofNullable(usernameRolesMap.get(username)) - .map(roleNames -> roleNames.stream().map(roleMap::get).toList()) + .map(roleNames -> roleNames.stream() + .map(roleMap::get) + .filter(Objects::nonNull) + .toList() + ) .orElseGet(List::of); return new ListedUser(user, roles); }) diff --git a/application/src/main/java/run/halo/app/core/extension/service/UserServiceImpl.java b/application/src/main/java/run/halo/app/core/extension/service/UserServiceImpl.java index eb5594637..5d9f85fcd 100644 --- a/application/src/main/java/run/halo/app/core/extension/service/UserServiceImpl.java +++ b/application/src/main/java/run/halo/app/core/extension/service/UserServiceImpl.java @@ -133,6 +133,7 @@ public class UserServiceImpl implements UserService { var mutableRoles = new HashSet<>(roles); mutableRoles.removeAll(existingRoles); return mutableRoles.stream() + .filter(StringUtils::hasText) .map(roleName -> RoleBinding.create(username, roleName)); }).flatMap(client::create)) .then(Mono.defer(() -> {