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(() -> {