[release-2.19] Prevent null role while getting permissions (#6613)

This is an automated cherry-pick of #6612 /assign JohnNiang ```release-note 修复取消用户角色后无法正常渲染用户列表的问题 ```
halo-dev · Sep 6, 2024 · 7f68de3 · 7f68de3
1 parent dfa10c0
commit 7f68de3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 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
@@ -771,7 +771,11 @@ private Mono<ListResult<ListedUser>> toListedUser(ListResult<User> listResult) {
                             .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
@@ -133,6 +133,7 @@ public Mono<User> grantRoles(String username, Set<String> roles) {
                         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(() -> {